revised readme

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index b20f824..6d56000 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -8,6 +8,7 @@
 #include <limits.h>
 #include <locale.h>
 #include <netdb.h>
 #include <limits.h>
 #include <locale.h>
 #include <netdb.h>

+#include <pwd.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -166,6 +167,22 @@ datetime(const char *timeformat)
     return ret;
 }
 
     return ret;
 }
 

+/* disk free */
+char *
+disk_free(const char *mountpoint)
+{
+    struct statvfs fs;
+
+    /* try to open mountpoint */
+    if (statvfs(mountpoint, &fs) < 0) {
+        fprintf(stderr, "Could not get filesystem info.\n");
+        return smprintf("n/a");
+    }
+
+    /* return free */
+    return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+}
+

 /* disk usage percentage */
 char *
 disk_perc(const char *mountpoint)
 /* disk usage percentage */
 char *
 disk_perc(const char *mountpoint)


@@ -180,12 +197,44 @@ disk_perc(const char *mountpoint)
     }
 
     /* calculate percent */
     }
 
     /* calculate percent */

-    perc = 100 * (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks));
+    perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));

 
     /* return perc */
     return smprintf("%d%%", perc);
 }
 
 
     /* return perc */
     return smprintf("%d%%", perc);
 }
 

+/* disk total */
+char *
+disk_total(const char *mountpoint)
+{
+    struct statvfs fs;
+
+    /* try to open mountpoint */
+    if (statvfs(mountpoint, &fs) < 0) {
+        fprintf(stderr, "Could not get filesystem info.\n");
+        return smprintf("n/a");
+    }
+
+    /* return total */
+    return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+}
+
+/* disk used */
+char *
+disk_used(const char *mountpoint)
+{
+    struct statvfs fs;
+
+    /* try to open mountpoint */
+    if (statvfs(mountpoint, &fs) < 0) {
+        fprintf(stderr, "Could not get filesystem info.\n");
+        return smprintf("n/a");
+    }
+
+    /* return used */
+    return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+}
+

 /* entropy available */
 char *
 entropy(const char *null)
 /* entropy available */
 char *
 entropy(const char *null)


@@ -209,6 +258,22 @@ entropy(const char *null)
     return smprintf("%d", entropy);
 }
 
     return smprintf("%d", entropy);
 }
 

+/* gid */
+char *
+gid(const char *null)
+{
+    gid_t gid;
+
+    if ((gid = getgid()) < 0) {
+        fprintf(stderr, "Could no get gid.");
+        return smprintf("n/a");
+    } else {
+        return smprintf("%d", gid);
+    }
+
+    return smprintf("n/a");
+}
+

 /* hostname */
 char *
 hostname(const char *null)
 /* hostname */
 char *
 hostname(const char *null)


@@ -402,6 +467,51 @@ temp(const char *file)
     return smprintf("%d°C", temperature / 1000);
 }
 
     return smprintf("%d°C", temperature / 1000);
 }
 

+/* username */
+char *
+username(const char *null)
+{
+    register struct passwd *pw;
+    register uid_t uid;
+
+    /* get the values */
+    uid = geteuid ();
+    pw = getpwuid (uid);
+
+    /* if it worked, return */
+    if (pw) {
+        return smprintf("%s", pw->pw_name);
+    }
+    else {
+        fprintf(stderr, "Could not get username.\n");
+        return smprintf("n/a");
+    }
+
+    return smprintf("n/a");
+}
+
+/* uid */
+char *
+uid(const char *null)
+{
+    register uid_t uid;
+
+    /* get the values */
+    uid = geteuid ();
+
+    /* if it worked, return */
+    if (uid) {
+        return smprintf("%d", uid);
+    }
+    else {
+        fprintf(stderr, "Could not get uid.\n");
+        return smprintf("n/a");
+    }
+
+    return smprintf("n/a");
+}
+
+

 /* alsa volume percentage */
 char *
 vol_perc(const char *soundcard)
 /* alsa volume percentage */
 char *
 vol_perc(const char *soundcard)