remove format characters from stat functions

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 64f7eab..cb4798b 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
 #include <unistd.h>
 #include <X11/Xlib.h>
 

-#include "extern/arg.h"
+#include "arg.h"

 
 struct arg {
        char *(*func)();
 
 struct arg {
        char *(*func)();


@@ -35,7 +35,9 @@ struct arg {
 
 static char *smprintf(const char *fmt, ...);
 static char *battery_perc(const char *bat);
 
 static char *smprintf(const char *fmt, ...);
 static char *battery_perc(const char *bat);

+static char *battery_power(const char *bat);

 static char *battery_state(const char *bat);
 static char *battery_state(const char *bat);

+static char *cpu_freq(void);

 static char *cpu_perc(void);
 static char *datetime(const char *fmt);
 static char *disk_free(const char *mnt);
 static char *cpu_perc(void);
 static char *datetime(const char *fmt);
 static char *disk_free(const char *mnt);


@@ -47,6 +49,7 @@ static char *gid(void);
 static char *hostname(void);
 static char *ip(const char *iface);
 static char *kernel_release(void);
 static char *hostname(void);
 static char *ip(const char *iface);
 static char *kernel_release(void);

+static char *keyboard_indicators(void);

 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);
 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);


@@ -70,7 +73,7 @@ static void usage(const int eval);
 char *argv0;
 static unsigned short int delay = 0;
 static unsigned short int done;
 char *argv0;
 static unsigned short int delay = 0;
 static unsigned short int done;

-static unsigned short int dflag, oflag;
+static unsigned short int dflag, oflag, nflag;

 static Display *dpy;
 
 #include "config.h"
 static Display *dpy;
 
 #include "config.h"


@@ -114,7 +117,26 @@ battery_perc(const char *bat)
        fscanf(fp, "%i", &perc);
        fclose(fp);
 
        fscanf(fp, "%i", &perc);
        fclose(fp);
 

-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);
+}
+
+static char *
+battery_power(const char *bat)
+{
+       char path[PATH_MAX];
+       FILE *fp;
+       int watts;
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
+       fp = fopen(path, "r");
+       if (fp == NULL) {
+               warn("Failed to open file %s", path);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+       fscanf(fp, "%i", &watts);
+       fclose(fp);
+
+       return smprintf("%d", (watts + 500000) / 1000000);

 }
 
 static char *
 }
 
 static char *


@@ -139,11 +161,30 @@ battery_state(const char *bat)
                return smprintf("-");
        } else if (strcmp(state, "Full") == 0) {
                return smprintf("=");
                return smprintf("-");
        } else if (strcmp(state, "Full") == 0) {
                return smprintf("=");

+       } else if (strcmp(state, "Unknown") == 0) {
+               return smprintf("/");

        } else {
                return smprintf("?");
        }
 }
 
        } else {
                return smprintf("?");
        }
 }
 

+static char *
+cpu_freq(void)
+{
+       int freq;
+       FILE *fp;
+
+       fp = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq");
+               return smprintf("%s", UNKNOWN_STR);
+       }
+       fscanf(fp, "%i", &freq);
+       fclose(fp);
+
+       return smprintf("%d", (freq + 500) / 1000);
+}
+

 static char *
 cpu_perc(void)
 {
 static char *
 cpu_perc(void)
 {


@@ -171,7 +212,7 @@ cpu_perc(void)
        fclose(fp);
 
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
        fclose(fp);
 
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));

-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);

 }
 
 static char *
 }
 
 static char *


@@ -214,7 +255,7 @@ disk_perc(const char *mnt)
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 

-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);

 }
 
 static char *
 }
 
 static char *


@@ -322,6 +363,29 @@ kernel_release(void)
        return smprintf("%s", udata.release);
 }
 
        return smprintf("%s", udata.release);
 }
 

+static char *
+keyboard_indicators(void)
+{
+       Display *dpy = XOpenDisplay(NULL);
+       XKeyboardState state;
+       XGetKeyboardControl(dpy, &state);
+       XCloseDisplay(dpy);
+
+       switch (state.led_mask) {
+               case 1:
+                       return smprintf("c");
+                       break;
+               case 2:
+                       return smprintf("n");
+                       break;
+               case 3:
+                       return smprintf("cn");
+                       break;
+               default:
+                       return smprintf("");
+       }
+}
+

 static char *
 load_avg(void)
 {
 static char *
 load_avg(void)
 {


@@ -369,7 +433,7 @@ ram_perc(void)
        fscanf(fp, "Cached: %ld kB\n", &cached);
        fclose(fp);
 
        fscanf(fp, "Cached: %ld kB\n", &cached);
        fclose(fp);
 

-       return smprintf("%d%%", 100 * ((total - free) - (buffers + cached)) / total);
+       return smprintf("%d", 100 * ((total - free) - (buffers + cached)) / total);

 }
 
 static char *
 }
 
 static char *


@@ -423,9 +487,9 @@ run_command(const char *cmd)
        }
        fgets(buf, sizeof(buf), fp);
        pclose(fp);
        }
        fgets(buf, sizeof(buf), fp);
        pclose(fp);

-       buf[sizeof(buf)] = '\0';
+       buf[sizeof(buf) - 1] = '\0';

 
 

-       if ((nlptr = strstr(buf, "\n")) != NULL) {
+       if ((nlptr = strrchr(buf, '\n')) != NULL) {

                nlptr[0] = '\0';
        }
 
                nlptr[0] = '\0';
        }
 


@@ -447,7 +511,7 @@ swap_free(void)
                return smprintf("%s", UNKNOWN_STR);
        }
 
                return smprintf("%s", UNKNOWN_STR);
        }
 

-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {

                warn("swap_free: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
                warn("swap_free: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);


@@ -484,7 +548,7 @@ swap_perc(void)
                return smprintf("%s", UNKNOWN_STR);
        }
 
                return smprintf("%s", UNKNOWN_STR);
        }
 

-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {

                warn("swap_perc: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
                warn("swap_perc: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);


@@ -508,7 +572,7 @@ swap_perc(void)
        }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 

-       return smprintf("%d%%", 100 * (total - free - cached) / total);
+       return smprintf("%d", 100 * (total - free - cached) / total);

 }
 
 static char *
 }
 
 static char *


@@ -525,7 +589,7 @@ swap_total(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }

-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {

                warn("swap_total: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
                warn("swap_total: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);


@@ -556,7 +620,7 @@ swap_used(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }

-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {

                warn("swap_used: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
                warn("swap_used: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);


@@ -597,7 +661,7 @@ temp(const char *file)
        fscanf(fp, "%d", &temp);
        fclose(fp);
 
        fscanf(fp, "%d", &temp);
        fclose(fp);
 

-       return smprintf("%d°C", temp / 1000);
+       return smprintf("%d", temp / 1000);

 }
 
 static char *
 }
 
 static char *


@@ -617,8 +681,7 @@ uptime(void)
 static char *
 username(void)
 {
 static char *
 username(void)
 {

-       uid_t uid = geteuid();
-       struct passwd *pw = getpwuid(uid);
+       struct passwd *pw = getpwuid(geteuid());

 
        if (pw == NULL) {
                warn("Failed to get username");
 
        if (pw == NULL) {
                warn("Failed to get username");


@@ -642,26 +705,30 @@ vol_perc(const char *card)
        int v, afd, devmask;
        char *vnames[] = SOUND_DEVICE_NAMES;
 
        int v, afd, devmask;
        char *vnames[] = SOUND_DEVICE_NAMES;
 

-       afd = open(card, O_RDONLY);
-       if (afd < 0) {
+       afd = open(card, O_RDONLY | O_NONBLOCK);
+       if (afd == -1) {

                warn("Cannot open %s", card);
                return smprintf(UNKNOWN_STR);
        }
 
                warn("Cannot open %s", card);
                return smprintf(UNKNOWN_STR);
        }
 

-       ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask);
+       if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
+               warn("Cannot get volume for %s", card);
+               close(afd);
+               return smprintf("%s", UNKNOWN_STR);
+       }

        for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {
        for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {

-               if (devmask & (1 << i)) {
-                       if (!strcmp("vol", vnames[i])) {
-                               ioctl(afd, MIXER_READ(i), &v);
+               if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
+                       if (ioctl(afd, MIXER_READ(i), &v) == -1) {
+                               warn("vol_perc: ioctl");
+                               close(afd);
+                               return smprintf("%s", UNKNOWN_STR);

                        }
                }
        }
 
        close(afd);
                        }
                }
        }
 
        close(afd);

-       if (v == 0) {
-               return smprintf("mute");
-       }
-       return smprintf("%d%%", v & 0xff);
+
+       return smprintf("%d", v & 0xff);

 }
 
 static char *
 }
 
 static char *


@@ -703,7 +770,7 @@ wifi_perc(const char *iface)
        datastart = (datastart+(strlen(iface)+1));
        sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
 
        datastart = (datastart+(strlen(iface)+1));
        sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
 

-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);

 }
 
 static char *
 }
 
 static char *


@@ -746,7 +813,7 @@ sighandler(const int signo)
 static void
 usage(const int eval)
 {
 static void
 usage(const int eval)
 {

-       fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0);
+       fprintf(stderr, "usage: %s [-d] [-o] [-n] [-v] [-h]\n", argv0);

        exit(eval);
 }
 
        exit(eval);
 }
 


@@ -766,6 +833,9 @@ main(int argc, char *argv[])
                case 'o':
                        oflag = 1;
                        break;
                case 'o':
                        oflag = 1;
                        break;

+               case 'n':
+                       nflag = 1;
+                       break;

                case 'v':
                        printf("slstatus (C) 2016-2017 slstatus engineers\n");
                        return 0;
                case 'v':
                        printf("slstatus (C) 2016-2017 slstatus engineers\n");
                        return 0;


@@ -775,7 +845,7 @@ main(int argc, char *argv[])
                        usage(1);
        } ARGEND
 
                        usage(1);
        } ARGEND
 

-       if (dflag && oflag) {
+       if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) {

                usage(1);
        }
        if (dflag && daemon(1, 1) < 0) {
                usage(1);
        }
        if (dflag && daemon(1, 1) < 0) {


@@ -813,11 +883,14 @@ main(int argc, char *argv[])
                        free(element);
                }
 
                        free(element);
                }
 

-               if (!oflag) {
+               if (oflag) {
+                       printf("%s\n", status_string);
+               } else if (nflag) {
+                       printf("%s\n", status_string);
+                       done = 1;
+               } else {

                        XStoreName(dpy, DefaultRootWindow(dpy), status_string);
                        XSync(dpy, False);
                        XStoreName(dpy, DefaultRootWindow(dpy), status_string);
                        XSync(dpy, False);

-               } else {
-                       printf("%s\n", status_string);

                }
 
                if ((UPDATE_INTERVAL - delay) <= 0) {
                }
 
                if ((UPDATE_INTERVAL - delay) <= 0) {