entropy: Improve types

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 92cff2e..e6aa90b 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,629 +1,136 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-
-#include <alsa/asoundlib.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <limits.h>
-#include <linux/wireless.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <stdarg.h>
+#include <errno.h>
+#include <signal.h>

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

-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/socket.h>
-#include <sys/sysinfo.h>
-#include <sys/types.h>

 #include <time.h>
 #include <time.h>

-#include <unistd.h>

 #include <X11/Xlib.h>
 
 #include <X11/Xlib.h>
 

-#undef strlcat
-#undef strlcpy
-
-#include "strlcat.h"
-#include "strlcpy.h"
+#include "arg.h"
+#include "slstatus.h"
+#include "util.h"

 
 struct arg {
 
 struct arg {

-       char *(*func)();
-       const char *format;
+       const char *(*func)();
+       const char *fmt;

        const char *args;
 };
 
        const char *args;
 };
 

-static char *smprintf(const char *, ...);
-static char *battery_perc(const char *);
-static char *cpu_perc(void);
-static char *datetime(const char *);
-static char *disk_free(const char *);
-static char *disk_perc(const char *);
-static char *disk_total(const char *);
-static char *disk_used(const char *);
-static char *entropy(void);
-static char *gid(void);
-static char *hostname(void);
-static char *ip(const char *);
-static char *load_avg(void);
-static char *ram_free(void);
-static char *ram_perc(void);
-static char *ram_used(void);
-static char *ram_total(void);
-static char *run_command(const char *);
-static char *temp(const char *);
-static char *uid(void);
-static char *uptime(void);
-static char *username(void);
-static char *vol_perc(const char *);
-static char *wifi_perc(const char *);
-static char *wifi_essid(const char *);
-
+char buf[1024];
+static int done;

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

-static char *
-smprintf(const char *fmt, ...)
-{
-       va_list ap;
-       char *ret;
-       int len;
-
-       va_start(ap, fmt);
-       len = vsnprintf(NULL, 0, fmt, ap);
-       va_end(ap);
-
-       ret = malloc(++len);
-       if (ret == NULL) {
-               perror("malloc");
-               exit(1);
-       }
-
-       va_start(ap, fmt);
-       vsnprintf(ret, len, fmt, ap);
-       va_end(ap);
-
-       return ret;
-}
-
-static char *
-battery_perc(const char *battery)
-{
-       int now, full, perc;
-       char batterynowfile[64];
-       char batteryfullfile[64];
-       FILE *fp;
-
-       strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
-       strlcat(batterynowfile, battery, sizeof(batterynowfile));
-       strlcat(batterynowfile, "/", sizeof(batterynowfile));
-       strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));
-
-       strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-       strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
-
-       fp = fopen(batterynowfile, "r");
-       if (fp == NULL ) {
-               fprintf(stderr, "Error opening battery file: %s: %s\n",
-                                               batterynowfile,
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%i", &now);
-       fclose(fp);
-
-       fp = fopen(batteryfullfile, "r");
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening battery file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%i", &full);
-       fclose(fp);
-
-       perc = now / (full / 100);
-
-       return smprintf("%d%%", perc);
-}
-
-static char *
-cpu_perc(void)
-{
-       int perc;
-       long double a[4], b[4];
-       FILE *fp = fopen("/proc/stat","r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
-       fclose(fp);
-
-       sleep(1);
-
-       fp = fopen("/proc/stat","r");
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[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);
-}
-
-static char *
-datetime(const char *timeformat)
-{
-       time_t t;
-       char timestr[80];
-
-       t = time(NULL);
-       if (strftime(timestr, sizeof(timestr), timeformat, localtime(&t)) == 0)
-               return smprintf(UNKNOWN_STR);
-
-       return smprintf("%s", timestr);
-}
-
-static char *
-disk_free(const char *mountpoint)
-{
-       struct statvfs fs;
-
-       if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-       return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
-}
-
-static char *
-disk_perc(const char *mountpoint)
+static void
+terminate(const int signo)

 {
 {

-       int perc = 0;
-       struct statvfs fs;
-
-       if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
+       (void)signo;

 
 

-       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
-       return smprintf("%d%%", perc);
+       done = 1;

 }
 
 }
 

-static char *
-disk_total(const char *mountpoint)
+static void
+difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)

 {
 {

-       struct statvfs fs;
-
-       if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+       res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
+       res->tv_nsec = a->tv_nsec - b->tv_nsec +
+                      (a->tv_nsec < b->tv_nsec) * 1E9;

 }
 
 }
 

-static char *
-disk_used(const char *mountpoint)
+static void
+usage(void)

 {
 {

-       struct statvfs fs;
-
-       if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+       die("usage: %s [-s]", argv0);

 }
 
 }
 

-static char *
-entropy(void)
-{
-       int entropy = 0;
-       FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Could not open entropy file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%d", &entropy);
-       fclose(fp);
-       return smprintf("%d", entropy);
-}
-
-static char *
-gid(void)
-{
-       return smprintf("%d", getgid());
-}
-
-static char *
-hostname(void)
-{
-       char hostname[HOST_NAME_MAX];
-       FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
+int
+main(int argc, char *argv[])
+{
+       struct sigaction act;
+       struct timespec start, current, diff, intspec, wait;
+       size_t i, len;
+       int sflag, ret;
+       char status[MAXLEN];
+       const char *res;
+
+       sflag = 0;
+       ARGBEGIN {
+               case 's':
+                       sflag = 1;
+                       break;
+               default:
+                       usage();
+       } ARGEND

 
 

-       if (fp == NULL) {
-               fprintf(stderr, "Could not open hostname file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
+       if (argc) {
+               usage();

        }
 
        }
 

-       fgets(hostname, sizeof(hostname), fp);
-       /* FIXME: needs improvement */
-       memset(&hostname[strlen(hostname)-1], '\0',
-               sizeof(hostname) - strlen(hostname));
-       fclose(fp);
-       return smprintf("%s", hostname);
-}
-
-static char *
-ip(const char *interface)
-{
-       struct ifaddrs *ifaddr, *ifa;
-       int s;
-       char host[NI_MAXHOST];
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = terminate;
+       sigaction(SIGINT,  &act, NULL);
+       sigaction(SIGTERM, &act, NULL);

 
 

-       if (getifaddrs(&ifaddr) == -1) {
-               fprintf(stderr, "Error getting IP address: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
+       if (!sflag && !(dpy = XOpenDisplay(NULL))) {
+               die("XOpenDisplay: Failed to open display");

        }
 
        }
 

-       /* get the ip address */
-       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-               if (ifa->ifa_addr == NULL)
-                       continue;
-
-               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST,
-                                                               NULL, 0, NI_NUMERICHOST);
+       while (!done) {
+               if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
+                       die("clock_gettime:");
+               }

 
 

-               if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
-                       if (s != 0) {
-                               fprintf(stderr, "Error getting IP address.\n");
-                               return smprintf(UNKNOWN_STR);
+               status[0] = '\0';
+               for (i = len = 0; i < LEN(args); i++) {
+                       if (!(res = args[i].func(args[i].args))) {
+                               res = unknown_str;

                        }
                        }

-                       return smprintf("%s", host);
+                       if ((ret = esnprintf(status + len, sizeof(status) - len,
+                                           args[i].fmt, res)) < 0) {
+                               break;
+                       }
+                       len += ret;

                }
                }

-       }
-
-       /* free the address */
-       freeifaddrs(ifaddr);
-
-       return smprintf(UNKNOWN_STR);
-}
-
-static char *
-load_avg(void)
-{
-       double avgs[3];
-
-       if (getloadavg(avgs, 3) < 0) {
-               fprintf(stderr, "Error getting load avg.\n");
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
-}
-
-static char *
-ram_free(void)
-{
-       long free;
-       FILE *fp = fopen("/proc/meminfo", "r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }

 
 

-       fscanf(fp, "MemFree: %ld kB\n", &free);
-       fclose(fp);
-       return smprintf("%f", (float)free / 1024 / 1024);
-}
-
-static char *
-ram_perc(void)
-{
-       int perc;
-       long total, free, buffers, cached;
-       FILE *fp = fopen("/proc/meminfo", "r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       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);
-
-       fclose(fp);
-       perc = 100 * ((total - free) - (buffers + cached)) / total;
-       return smprintf("%d%%", perc);
-}
-
-static char *
-ram_total(void)
-{
-       long total;
-       FILE *fp = fopen("/proc/meminfo", "r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "MemTotal: %ld kB\n", &total);
-       fclose(fp);
-       return smprintf("%f", (float)total / 1024 / 1024);
-}
-
-static char *
-ram_used(void)
-{
-       long free, total, buffers, cached, used;
-       FILE *fp = fopen("/proc/meminfo", "r");
-
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       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);
-
-       fclose(fp);
-       used = total - free - buffers - cached;
-       return smprintf("%f", (float)used / 1024 / 1024);
-}
-
-static char *
-run_command(const char* command)
-{
-       int good;
-       FILE *fp = popen(command, "r");
-       char buffer[64];
-
-       if (fp == NULL) {
-               fprintf(stderr, "Could not get command output for: %s: %s\n",
-                                               command, strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fgets(buffer, sizeof(buffer)-1, fp);
-       pclose(fp);
-       for (int i = 0 ; i != sizeof(buffer); i++) {
-               if (buffer[i] == '\0') {
-                       good = 1;
-                       break;
+               if (sflag) {
+                       puts(status);
+                       fflush(stdout);
+                       if (ferror(stdout))
+                               die("puts:");
+               } else {
+                       if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0) {
+                               die("XStoreName: Allocation failed");
+                       }
+                       XFlush(dpy);

                }
                }

-       }
-       if (good)
-               buffer[strlen(buffer)-1] = '\0';
-       return smprintf("%s", buffer);
-}
-
-static char *
-temp(const char *file)
-{
-       int temperature;
-       FILE *fp = fopen(file, "r");

 
 

-       if (fp == NULL) {
-               fprintf(stderr, "Could not open temperature file: %s\n",
-                                                       strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%d", &temperature);
-       fclose(fp);
-       return smprintf("%d°C", temperature / 1000);
-}
-
-static char *
-uptime(void)
-{
-       struct sysinfo info;
-       int hours = 0;
-       int minutes = 0;
-
-       sysinfo(&info);
-       hours = info.uptime / 3600;
-       minutes = (info.uptime - hours * 3600 ) / 60;
-
-       return smprintf("%dh %dm", hours, minutes);
-}
-
-static char *
-username(void)
-{
-       uid_t uid = geteuid();
-       struct passwd *pw = getpwuid(uid);
-
-       if (pw == NULL)
-               return smprintf("%s", pw->pw_name);
-
-       fprintf(stderr, "Could not get username: %s\n",
-                                       strerror(errno));
-       return smprintf(UNKNOWN_STR);
-}
-
-static char *
-uid(void)
-{
-       return smprintf("%d", geteuid());
-}
-
-
-static char * 
-vol_perc(const char *snd_card)
-{ /* thanks to botika for this function */
-       long int vol, max, min;
-       snd_mixer_t *handle;
-       snd_mixer_elem_t *elem;
-       snd_mixer_selem_id_t *s_elem;
-
-       snd_mixer_open(&handle, 0);
-       snd_mixer_attach(handle, snd_card);
-       snd_mixer_selem_register(handle, NULL, NULL);
-       snd_mixer_load(handle);
-       snd_mixer_selem_id_malloc(&s_elem);
-       snd_mixer_selem_id_set_name(s_elem, "Master");
-       elem = snd_mixer_find_selem(handle, s_elem);
-
-       if (elem == NULL) {
-               snd_mixer_selem_id_free(s_elem);
-               snd_mixer_close(handle);
-               perror("alsa error: ");
-               return smprintf(UNKNOWN_STR);
-       }
-
-       snd_mixer_handle_events(handle);
-       snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-       snd_mixer_selem_get_playback_volume(elem, 0, &vol);
-
-       snd_mixer_selem_id_free(s_elem);
-       snd_mixer_close(handle);
-
-       return smprintf("%d", (vol * 100) / max);
-}
-
-static char *
-wifi_perc(const char *wificard)
-{
-       int strength;
-       char buf[255];
-       char *datastart;
-       char path[64];
-       char status[5];
-       char needle[strlen(wificard)+2];
-       FILE *fp;
-
-       strlcpy(path, "/sys/class/net/", sizeof(path));
-       strlcat(path, wificard, sizeof(path));
-       strlcat(path, "/operstate", sizeof(path));
-
-       fp = fopen(path, "r");
-
-       if(fp == NULL) {
-               fprintf(stderr, "Error opening wifi operstate file: %s\n",
-                                                       strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fgets(status, 5, fp);
-       fclose(fp);
-       if(strcmp(status, "up\n") != 0)
-               return smprintf(UNKNOWN_STR);
-
-       fp = fopen("/proc/net/wireless", "r");
-       if (fp == NULL) {
-               fprintf(stderr, "Error opening wireless file: %s\n",
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       strlcpy(needle, wificard, sizeof(needle));
-       strlcat(needle, ":", sizeof(needle));
-       fgets(buf, sizeof(buf), fp);
-       fgets(buf, sizeof(buf), fp);
-       fgets(buf, sizeof(buf), fp);
-
-       datastart = strstr(buf, needle);
-       if (datastart != NULL) {
-               datastart = strstr(buf, ":");
-               sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &strength);
-       }
-
-       fclose(fp);
-       return smprintf("%d%%", strength);
-}
+               if (!done) {
+                       if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
+                               die("clock_gettime:");
+                       }
+                       difftimespec(&diff, &current, &start);

 
 

-static char *
-wifi_essid(const char *wificard)
-{
-       char id[IW_ESSID_MAX_SIZE+1];
-       int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-       struct iwreq wreq;
+                       intspec.tv_sec = interval / 1000;
+                       intspec.tv_nsec = (interval % 1000) * 1E6;
+                       difftimespec(&wait, &intspec, &diff);

 
 

-       memset(&wreq, 0, sizeof(struct iwreq));
-       wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
-       sprintf(wreq.ifr_name, wificard);
-       if(sockfd == -1) {
-               fprintf(stderr, "Cannot open socket for interface: %s: %s\n",
-                                               wificard, strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-       wreq.u.essid.pointer = id;
-       if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-               fprintf(stderr, "Get ESSID ioctl failed for interface %s: %s\n",
-                                               wificard, strerror(errno));
-               return smprintf(UNKNOWN_STR);
+                       if (wait.tv_sec >= 0) {
+                               if (nanosleep(&wait, NULL) < 0 &&
+                                   errno != EINTR) {
+                                       die("nanosleep:");
+                               }
+                       }
+               }

        }
 
        }
 

-       if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
-               return smprintf(UNKNOWN_STR);
-       else
-               return smprintf("%s", (char *)wreq.u.essid.pointer);
-}
-
-int
-main(void)
-{
-       size_t i;
-       char status_string[4096];
-       char *res, *element;
-       struct arg argument;
-
-       stderr = stderr;
-       dpy = XOpenDisplay(NULL);
-
-       memset(status_string, 0, sizeof(status_string));
-       for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
-               argument = args[i];
-               if (argument.args == NULL)
-                       res = argument.func();
-               else
-                       res = argument.func(argument.args);
-               element = smprintf(argument.format, res);
-               if (element == NULL) {
-                       element = smprintf(UNKNOWN_STR);
-                       fprintf(stderr, "Failed to format output.\n");
+       if (!sflag) {
+               XStoreName(dpy, DefaultRootWindow(dpy), NULL);
+               if (XCloseDisplay(dpy) < 0) {
+                       die("XCloseDisplay: Failed to close display");

                }
                }

-               strlcat(status_string, element, sizeof(status_string));
-               free(res);
-               free(element);

        }
 
        }
 

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

        return 0;
 }
        return 0;
 }