added memory values ram functions

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 5bbf58a..b20f824 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -5,6 +5,7 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <ifaddrs.h>

+#include <limits.h>

 #include <locale.h>
 #include <netdb.h>
 #include <stdarg.h>
 #include <locale.h>
 #include <netdb.h>
 #include <stdarg.h>


@@ -212,7 +213,7 @@ entropy(const char *null)
 char *
 hostname(const char *null)
 {
 char *
 hostname(const char *null)
 {

-    char *hostname = "";
+    char hostname[HOST_NAME_MAX];

     FILE *fp;
 
     /* open hostname file */
     FILE *fp;
 
     /* open hostname file */


@@ -222,7 +223,7 @@ hostname(const char *null)
     }
 
     /* extract hostname */
     }
 
     /* extract hostname */

-    fscanf(fp, "%s", hostname);
+    fscanf(fp, "%s\n", hostname);

 
     /* close hostname file */
     fclose(fp);
 
     /* close hostname file */
     fclose(fp);


@@ -272,6 +273,30 @@ ip(const char *interface)
     return smprintf("n/a");
 }
 
     return smprintf("n/a");
 }
 

+/* ram free */
+char *
+ram_free(const char *null)
+{
+    long free;
+    FILE *fp;
+
+    /* open meminfo file */
+    if (!(fp = fopen("/proc/meminfo", "r"))) {
+        fprintf(stderr, "Error opening meminfo file.");
+        return smprintf("n/a");
+    }
+
+    /* read the values */
+    fscanf(fp, "MemTotal: %*d kB\n");
+    fscanf(fp, "MemFree: %ld kB\n", &free);
+
+    /* close meminfo file */
+    fclose(fp);
+
+    /* return free ram as string */
+    return smprintf("%f", (float)free / 1024 / 1024);
+}
+

 /* ram percentage */
 char *
 ram_perc(const char *null)
 /* ram percentage */
 char *
 ram_perc(const char *null)


@@ -302,6 +327,58 @@ ram_perc(const char *null)
     return smprintf("%d%%", perc);
 }
 
     return smprintf("%d%%", perc);
 }
 

+/* ram total */
+char *
+ram_total(const char *null)
+{
+    long total;
+    FILE *fp;
+
+    /* open meminfo file */
+    if (!(fp = fopen("/proc/meminfo", "r"))) {
+        fprintf(stderr, "Error opening meminfo file.");
+        return smprintf("n/a");
+    }
+
+    /* read the values */
+    fscanf(fp, "MemTotal: %ld kB\n", &total);
+
+    /* close meminfo file */
+    fclose(fp);
+
+    /* return total ram as string */
+    return smprintf("%f", (float)total / 1024 / 1024);
+}
+
+/* ram used */
+char *
+ram_used(const char *null)
+{
+    long free, total, buffers, cached, used;
+    FILE *fp;
+
+    /* open meminfo file */
+    if (!(fp = fopen("/proc/meminfo", "r"))) {
+        fprintf(stderr, "Error opening meminfo file.");
+        return smprintf("n/a");
+    }
+
+    /* read the values */
+    fscanf(fp, "MemTotal: %ld kB\n", &total);
+    fscanf(fp, "MemFree: %ld kB\n", &free);
+    fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
+    fscanf(fp, "Cached: %ld kB\n", &cached);
+
+    /* close meminfo file */
+    fclose(fp);
+
+    /* calculate used */
+    used = total - free - buffers - cached;
+
+    /* return used ram as string */
+    return smprintf("%f", (float)used / 1024 / 1024);
+}
+

 /* temperature */
 char *
 temp(const char *file)
 /* temperature */
 char *
 temp(const char *file)