Move components into dedicated subdirectory
authorLaslo Hunhold <dev@frign.de>
Sun, 24 Sep 2017 13:33:01 +0000 (15:33 +0200)
committerAaron Marcher <me@drkhsh.at>
Sun, 24 Sep 2017 15:20:27 +0000 (17:20 +0200)
This brings us a lot more tidiness.

39 files changed:
Makefile
battery.c [deleted file]
components/battery.c [new file with mode: 0644]
components/cpu.c [new file with mode: 0644]
components/datetime.c [new file with mode: 0644]
components/disk.c [new file with mode: 0644]
components/entropy.c [new file with mode: 0644]
components/hostname.c [new file with mode: 0644]
components/ip.c [new file with mode: 0644]
components/kernel_release.c [new file with mode: 0644]
components/keyboard_indicators.c [new file with mode: 0644]
components/load_avg.c [new file with mode: 0644]
components/num_files.c [new file with mode: 0644]
components/ram.c [new file with mode: 0644]
components/run_command.c [new file with mode: 0644]
components/swap.c [new file with mode: 0644]
components/temperature.c [new file with mode: 0644]
components/uptime.c [new file with mode: 0644]
components/user.c [new file with mode: 0644]
components/volume.c [new file with mode: 0644]
components/wifi.c [new file with mode: 0644]
cpu.c [deleted file]
datetime.c [deleted file]
disk.c [deleted file]
entropy.c [deleted file]
hostname.c [deleted file]
ip.c [deleted file]
kernel_release.c [deleted file]
keyboard_indicators.c [deleted file]
load_avg.c [deleted file]
num_files.c [deleted file]
ram.c [deleted file]
run_command.c [deleted file]
swap.c [deleted file]
temperature.c [deleted file]
uptime.c [deleted file]
user.c [deleted file]
volume.c [deleted file]
wifi.c [deleted file]

index 1a90431001ab7e2cb33d7292eca749ebd13e7b97..00c35c4d61bb1ebcfa591d81b2aac1c2ce8868e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,25 +6,25 @@ include config.mk
 
 REQ = util
 COM =\
-       battery\
-       cpu\
-       datetime\
-       disk\
-       entropy\
-       hostname\
-       ip\
-       kernel_release\
-       keyboard_indicators\
-       load_avg\
-       num_files\
-       ram\
-       run_command\
-       swap\
-       temperature\
-       uptime\
-       user\
-       volume\
-       wifi
+       components/battery\
+       components/cpu\
+       components/datetime\
+       components/disk\
+       components/entropy\
+       components/hostname\
+       components/ip\
+       components/kernel_release\
+       components/keyboard_indicators\
+       components/load_avg\
+       components/num_files\
+       components/ram\
+       components/run_command\
+       components/swap\
+       components/temperature\
+       components/uptime\
+       components/user\
+       components/volume\
+       components/wifi
 
 all: slstatus
 
@@ -39,14 +39,14 @@ config.h:
        $(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
 
 .c.o:
-       $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+       $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
 dist:
        rm -rf "slstatus-$(VERSION)"
-       mkdir -p "slstatus-$(VERSION)"
+       mkdir -p "slstatus-$(VERSION)/components"
        cp -R LICENSE Makefile README config.mk config.def.h \
              arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
              slstatus.1 "slstatus-$(VERSION)"
diff --git a/battery.c b/battery.c
deleted file mode 100644 (file)
index 0cea55c..0000000
--- a/battery.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-battery_perc(const char *bat)
-{
-       int perc;
-       char path[PATH_MAX];
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
-       return (pscanf(path, "%i", &perc) == 1) ?
-              bprintf("%d", perc) : NULL;
-}
-
-const char *
-battery_power(const char *bat)
-{
-       int watts;
-       char path[PATH_MAX];
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
-       return (pscanf(path, "%i", &watts) == 1) ?
-              bprintf("%d", (watts + 500000) / 1000000) : NULL;
-}
-
-const char *
-battery_state(const char *bat)
-{
-       struct {
-               char *state;
-               char *symbol;
-       } map[] = {
-               { "Charging",    "+" },
-               { "Discharging", "-" },
-               { "Full",        "=" },
-               { "Unknown",     "/" },
-       };
-       size_t i;
-       char path[PATH_MAX], state[12];
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
-       if (pscanf(path, "%12s", state) != 1) {
-               return NULL;
-       }
-
-       for (i = 0; i < LEN(map); i++) {
-               if (!strcmp(map[i].state, state)) {
-                       break;
-               }
-       }
-       return (i == LEN(map)) ? "?" : map[i].symbol;
-}
diff --git a/components/battery.c b/components/battery.c
new file mode 100644 (file)
index 0000000..f384aab
--- /dev/null
@@ -0,0 +1,56 @@
+/* See LICENSE file for copyright and license details. */
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+battery_perc(const char *bat)
+{
+       int perc;
+       char path[PATH_MAX];
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
+       return (pscanf(path, "%i", &perc) == 1) ?
+              bprintf("%d", perc) : NULL;
+}
+
+const char *
+battery_power(const char *bat)
+{
+       int watts;
+       char path[PATH_MAX];
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
+       return (pscanf(path, "%i", &watts) == 1) ?
+              bprintf("%d", (watts + 500000) / 1000000) : NULL;
+}
+
+const char *
+battery_state(const char *bat)
+{
+       struct {
+               char *state;
+               char *symbol;
+       } map[] = {
+               { "Charging",    "+" },
+               { "Discharging", "-" },
+               { "Full",        "=" },
+               { "Unknown",     "/" },
+       };
+       size_t i;
+       char path[PATH_MAX], state[12];
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
+       if (pscanf(path, "%12s", state) != 1) {
+               return NULL;
+       }
+
+       for (i = 0; i < LEN(map); i++) {
+               if (!strcmp(map[i].state, state)) {
+                       break;
+               }
+       }
+       return (i == LEN(map)) ? "?" : map[i].symbol;
+}
diff --git a/components/cpu.c b/components/cpu.c
new file mode 100644 (file)
index 0000000..4a4a80b
--- /dev/null
@@ -0,0 +1,63 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+cpu_freq(void)
+{
+       int freq;
+
+       return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
+                      "%i", &freq) == 1) ?
+              bprintf("%d", (freq + 500) / 1000) : NULL;
+}
+
+const char *
+cpu_perc(void)
+{
+       int perc;
+       static long double a[7];
+       static int valid;
+       long double b[7];
+
+       memcpy(b, a, sizeof(b));
+       if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
+                  &a[3], &a[4], &a[5], &a[6]) != 7) {
+               return NULL;
+       }
+       if (!valid) {
+               valid = 1;
+               return NULL;
+       }
+
+       perc = 100 * ((b[0]+b[1]+b[2]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[5]+a[6])) /
+              ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
+
+       return bprintf("%d", perc);
+}
+
+const char *
+cpu_iowait(void)
+{
+       int perc;
+       static int valid;
+       static long double a[7];
+       long double b[7];
+
+       memcpy(b, a, sizeof(b));
+       if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
+                  &a[3], &a[4], &a[5], &a[6]) != 7) {
+               return NULL;
+       }
+       if (!valid) {
+               valid = 1;
+               return NULL;
+       }
+
+       perc = 100 * ((b[4]) - (a[4])) /
+              ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
+
+       return bprintf("%d", perc);
+}
diff --git a/components/datetime.c b/components/datetime.c
new file mode 100644 (file)
index 0000000..0816923
--- /dev/null
@@ -0,0 +1,16 @@
+/* See LICENSE file for copyright and license details. */
+#include <time.h>
+
+#include "../util.h"
+
+const char *
+datetime(const char *fmt)
+{
+       time_t t;
+
+       t = time(NULL);
+       if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0)
+               return NULL;
+
+       return buf;
+}
diff --git a/components/disk.c b/components/disk.c
new file mode 100644 (file)
index 0000000..90a8e0b
--- /dev/null
@@ -0,0 +1,61 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <stdio.h>
+#include <sys/statvfs.h>
+
+#include "../util.h"
+
+const char *
+disk_free(const char *mnt)
+{
+       struct statvfs fs;
+
+       if (statvfs(mnt, &fs) < 0) {
+               warn("Failed to get filesystem info");
+               return NULL;
+       }
+
+       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+}
+
+const char *
+disk_perc(const char *mnt)
+{
+       int perc;
+       struct statvfs fs;
+
+       if (statvfs(mnt, &fs) < 0) {
+               warn("Failed to get filesystem info");
+               return NULL;
+       }
+
+       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
+
+       return bprintf("%d", perc);
+}
+
+const char *
+disk_total(const char *mnt)
+{
+       struct statvfs fs;
+
+       if (statvfs(mnt, &fs) < 0) {
+               warn("Failed to get filesystem info");
+               return NULL;
+       }
+
+       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+}
+
+const char *
+disk_used(const char *mnt)
+{
+       struct statvfs fs;
+
+       if (statvfs(mnt, &fs) < 0) {
+               warn("Failed to get filesystem info");
+               return NULL;
+       }
+
+       return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+}
diff --git a/components/entropy.c b/components/entropy.c
new file mode 100644 (file)
index 0000000..0d3564e
--- /dev/null
@@ -0,0 +1,13 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+
+#include "../util.h"
+
+const char *
+entropy(void)
+{
+       int num;
+
+       return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
+                      bprintf("%d", num) : NULL;
+}
diff --git a/components/hostname.c b/components/hostname.c
new file mode 100644 (file)
index 0000000..aed77a6
--- /dev/null
@@ -0,0 +1,16 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <unistd.h>
+
+#include "../util.h"
+
+const char *
+hostname(void)
+{
+       if (gethostname(buf, sizeof(buf)) == -1) {
+               warn("hostname");
+               return NULL;
+       }
+
+       return buf;
+}
diff --git a/components/ip.c b/components/ip.c
new file mode 100644 (file)
index 0000000..f98b2ed
--- /dev/null
@@ -0,0 +1,70 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <ifaddrs.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+ipv4(const char *iface)
+{
+       struct ifaddrs *ifaddr, *ifa;
+       int s;
+       char host[NI_MAXHOST];
+
+       if (getifaddrs(&ifaddr) == -1) {
+               warn("Failed to get IPv4 address for interface %s", iface);
+               return NULL;
+       }
+
+       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);
+               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
+                       if (s != 0) {
+                               warnx("Failed to get IPv4 address for interface %s", iface);
+                               return NULL;
+                       }
+                       return bprintf("%s", host);
+               }
+       }
+
+       freeifaddrs(ifaddr);
+
+       return NULL;
+}
+
+const char *
+ipv6(const char *iface)
+{
+       struct ifaddrs *ifaddr, *ifa;
+       int s;
+       char host[NI_MAXHOST];
+
+       if (getifaddrs(&ifaddr) == -1) {
+               warn("Failed to get IPv6 address for interface %s", iface);
+               return NULL;
+       }
+
+       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+               if (ifa->ifa_addr == NULL) {
+                       continue;
+               }
+               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) {
+                       if (s != 0) {
+                               warnx("Failed to get IPv6 address for interface %s", iface);
+                               return NULL;
+                       }
+                       return bprintf("%s", host);
+               }
+       }
+
+       freeifaddrs(ifaddr);
+
+       return NULL;
+}
diff --git a/components/kernel_release.c b/components/kernel_release.c
new file mode 100644 (file)
index 0000000..f539b6a
--- /dev/null
@@ -0,0 +1,17 @@
+/* See LICENSE file for copyright and license details. */
+#include <sys/utsname.h>
+#include <stdio.h>
+
+#include "../util.h"
+
+const char *
+kernel_release(void)
+{
+       struct utsname udata;
+
+       if (uname(&udata) < 0) {
+               return NULL;
+       }
+
+       return bprintf("%s", udata.release);
+}
diff --git a/components/keyboard_indicators.c b/components/keyboard_indicators.c
new file mode 100644 (file)
index 0000000..b7713b6
--- /dev/null
@@ -0,0 +1,30 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <X11/Xlib.h>
+
+#include "../util.h"
+
+const char *
+keyboard_indicators(void)
+{
+       Display *dpy = XOpenDisplay(NULL);
+       XKeyboardState state;
+
+       if (dpy == NULL) {
+               warnx("XOpenDisplay failed");
+               return NULL;
+       }
+       XGetKeyboardControl(dpy, &state);
+       XCloseDisplay(dpy);
+
+       switch (state.led_mask) {
+               case 1:
+                       return "c";
+               case 2:
+                       return "n";
+               case 3:
+                       return "cn";
+               default:
+                       return "";
+       }
+}
diff --git a/components/load_avg.c b/components/load_avg.c
new file mode 100644 (file)
index 0000000..d6f6bd4
--- /dev/null
@@ -0,0 +1,18 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <stdlib.h>
+
+#include "../util.h"
+
+const char *
+load_avg(const char *fmt)
+{
+       double avgs[3];
+
+       if (getloadavg(avgs, 3) < 0) {
+               warnx("Failed to get the load avg");
+               return NULL;
+       }
+
+       return bprintf(fmt, avgs[0], avgs[1], avgs[2]);
+}
diff --git a/components/num_files.c b/components/num_files.c
new file mode 100644 (file)
index 0000000..a8a3894
--- /dev/null
@@ -0,0 +1,30 @@
+/* See LICENSE file for copyright and license details. */
+#include <dirent.h>
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+num_files(const char *dir)
+{
+       struct dirent *dp;
+       DIR *fd;
+       int num = 0;
+
+       if ((fd = opendir(dir)) == NULL) {
+               warn("Failed to get number of files in directory %s", dir);
+               return NULL;
+       }
+
+       while ((dp = readdir(fd)) != NULL) {
+               if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+                       continue; /* skip self and parent */
+               num++;
+       }
+
+       closedir(fd);
+
+       return bprintf("%d", num);
+}
diff --git a/components/ram.c b/components/ram.c
new file mode 100644 (file)
index 0000000..f696039
--- /dev/null
@@ -0,0 +1,52 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+
+#include "../util.h"
+
+const char *
+ram_free(void)
+{
+       long free;
+
+       return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
+              bprintf("%f", (float)free / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_perc(void)
+{
+       long total, free, buffers, cached;
+
+       return (pscanf("/proc/meminfo",
+                      "MemTotal: %ld kB\n"
+                      "MemFree: %ld kB\n"
+                      "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+                      "Cached: %ld kB\n",
+                      &total, &free, &buffers, &buffers, &cached) == 5) ?
+              bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
+              NULL;
+}
+
+const char *
+ram_total(void)
+{
+       long total;
+
+       return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
+              bprintf("%f", (float)total / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_used(void)
+{
+       long total, free, buffers, cached;
+
+       return (pscanf("/proc/meminfo",
+                      "MemTotal: %ld kB\n"
+                      "MemFree: %ld kB\n"
+                      "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+                      "Cached: %ld kB\n",
+                      &total, &free, &buffers, &buffers, &cached) == 5) ?
+              bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
+              NULL;
+}
diff --git a/components/run_command.c b/components/run_command.c
new file mode 100644 (file)
index 0000000..99f54ea
--- /dev/null
@@ -0,0 +1,27 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+run_command(const char *cmd)
+{
+       char *p;
+       FILE *fp;
+
+       fp = popen(cmd, "r");
+       if (fp == NULL) {
+               warn("Failed to get command output for %s", cmd);
+               return NULL;
+       }
+       p = fgets(buf, sizeof(buf) - 1, fp);
+       pclose(fp);
+       if (!p)
+               return NULL;
+       if ((p = strrchr(buf, '\n')) != NULL)
+               p[0] = '\0';
+
+       return buf[0] ? buf : NULL;
+}
diff --git a/components/swap.c b/components/swap.c
new file mode 100644 (file)
index 0000000..e4eec64
--- /dev/null
@@ -0,0 +1,136 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+swap_free(void)
+{
+       long total, free;
+       FILE *fp;
+       size_t bytes_read;
+       char *match;
+
+       fp = fopen("/proc/meminfo", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /proc/meminfo");
+               return NULL;
+       }
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_free: read error");
+               fclose(fp);
+               return NULL;
+       }
+       fclose(fp);
+
+       if ((match = strstr(buf, "SwapTotal")) == NULL)
+               return NULL;
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+       if ((match = strstr(buf, "SwapFree")) == NULL)
+               return NULL;
+       sscanf(match, "SwapFree: %ld kB\n", &free);
+
+       return bprintf("%f", (float)free / 1024 / 1024);
+}
+
+const char *
+swap_perc(void)
+{
+       long total, free, cached;
+       FILE *fp;
+       size_t bytes_read;
+       char *match;
+
+       fp = fopen("/proc/meminfo", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /proc/meminfo");
+               return NULL;
+       }
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_perc: read error");
+               fclose(fp);
+               return NULL;
+       }
+       fclose(fp);
+
+       if ((match = strstr(buf, "SwapTotal")) == NULL)
+               return NULL;
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+       if ((match = strstr(buf, "SwapCached")) == NULL)
+               return NULL;
+       sscanf(match, "SwapCached: %ld kB\n", &cached);
+
+       if ((match = strstr(buf, "SwapFree")) == NULL)
+               return NULL;
+       sscanf(match, "SwapFree: %ld kB\n", &free);
+
+       return bprintf("%d", 100 * (total - free - cached) / total);
+}
+
+const char *
+swap_total(void)
+{
+       long total;
+       FILE *fp;
+       size_t bytes_read;
+       char *match;
+
+       fp = fopen("/proc/meminfo", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /proc/meminfo");
+               return NULL;
+       }
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_total: read error");
+               fclose(fp);
+               return NULL;
+       }
+       fclose(fp);
+
+       if ((match = strstr(buf, "SwapTotal")) == NULL)
+               return NULL;
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+       return bprintf("%f", (float)total / 1024 / 1024);
+}
+
+const char *
+swap_used(void)
+{
+       long total, free, cached;
+       FILE *fp;
+       size_t bytes_read;
+       char *match;
+
+       fp = fopen("/proc/meminfo", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /proc/meminfo");
+               return NULL;
+       }
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_used: read error");
+               fclose(fp);
+               return NULL;
+       }
+       fclose(fp);
+
+       if ((match = strstr(buf, "SwapTotal")) == NULL)
+               return NULL;
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+       if ((match = strstr(buf, "SwapCached")) == NULL)
+               return NULL;
+       sscanf(match, "SwapCached: %ld kB\n", &cached);
+
+       if ((match = strstr(buf, "SwapFree")) == NULL)
+               return NULL;
+       sscanf(match, "SwapFree: %ld kB\n", &free);
+
+       return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
+}
diff --git a/components/temperature.c b/components/temperature.c
new file mode 100644 (file)
index 0000000..bbd4daf
--- /dev/null
@@ -0,0 +1,13 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+
+#include "../util.h"
+
+const char *
+temp(const char *file)
+{
+       int temp;
+
+       return (pscanf(file, "%d", &temp) == 1) ?
+              bprintf("%d", temp / 1000) : NULL;
+}
diff --git a/components/uptime.c b/components/uptime.c
new file mode 100644 (file)
index 0000000..b455182
--- /dev/null
@@ -0,0 +1,18 @@
+/* See LICENSE file for copyright and license details. */
+#include <sys/sysinfo.h>
+
+#include "../util.h"
+
+const char *
+uptime(void)
+{
+       struct sysinfo info;
+       int h = 0;
+       int m = 0;
+
+       sysinfo(&info);
+       h = info.uptime / 3600;
+       m = (info.uptime - h * 3600 ) / 60;
+
+       return bprintf("%dh %dm", h, m);
+}
diff --git a/components/user.c b/components/user.c
new file mode 100644 (file)
index 0000000..8dcb86a
--- /dev/null
@@ -0,0 +1,32 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "../util.h"
+
+const char *
+gid(void)
+{
+       return bprintf("%d", getgid());
+}
+
+const char *
+username(void)
+{
+       struct passwd *pw = getpwuid(geteuid());
+
+       if (pw == NULL) {
+               warn("Failed to get username");
+               return NULL;
+       }
+
+       return bprintf("%s", pw->pw_name);
+}
+
+const char *
+uid(void)
+{
+       return bprintf("%d", geteuid());
+}
diff --git a/components/volume.c b/components/volume.c
new file mode 100644 (file)
index 0000000..f5aa18d
--- /dev/null
@@ -0,0 +1,43 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <fcntl.h>
+#include <sys/soundcard.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../util.h"
+
+const char *
+vol_perc(const char *card)
+{
+       unsigned int i;
+       int v, afd, devmask;
+       char *vnames[] = SOUND_DEVICE_NAMES;
+
+       afd = open(card, O_RDONLY | O_NONBLOCK);
+       if (afd == -1) {
+               warn("Cannot open %s", card);
+               return NULL;
+       }
+
+       if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
+               warn("Cannot get volume for %s", card);
+               close(afd);
+               return NULL;
+       }
+       for (i = 0; i < LEN(vnames); i++) {
+               if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
+                       if (ioctl(afd, MIXER_READ(i), &v) == -1) {
+                               warn("vol_perc: ioctl");
+                               close(afd);
+                               return NULL;
+                       }
+               }
+       }
+
+       close(afd);
+
+       return bprintf("%d", v & 0xff);
+}
diff --git a/components/wifi.c b/components/wifi.c
new file mode 100644 (file)
index 0000000..30b57ab
--- /dev/null
@@ -0,0 +1,85 @@
+/* See LICENSE file for copyright and license details. */
+#include <err.h>
+#include <ifaddrs.h>
+#include <linux/wireless.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "../util.h"
+
+const char *
+wifi_perc(const char *iface)
+{
+       int i, perc;
+       char *p, *datastart;
+       char path[PATH_MAX];
+       char status[5];
+       FILE *fp;
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
+       fp = fopen(path, "r");
+       if (fp == NULL) {
+               warn("Failed to open file %s", path);
+               return NULL;
+       }
+       p = fgets(status, 5, fp);
+       fclose(fp);
+       if(!p || strcmp(status, "up\n") != 0) {
+               return NULL;
+       }
+
+       fp = fopen("/proc/net/wireless", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /proc/net/wireless");
+               return NULL;
+       }
+
+       for (i = 0; i < 3; i++) {
+               if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
+                       break;
+       }
+       fclose(fp);
+       if (i < 2 || !p)
+               return NULL;
+
+       if ((datastart = strstr(buf, iface)) == NULL)
+               return NULL;
+
+       datastart = (datastart+(strlen(iface)+1));
+       sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
+
+       return bprintf("%d", perc);
+}
+
+const char *
+wifi_essid(const char *iface)
+{
+       static char id[IW_ESSID_MAX_SIZE+1];
+       int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+       struct iwreq wreq;
+
+       memset(&wreq, 0, sizeof(struct iwreq));
+       wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
+       snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+
+       if (sockfd == -1) {
+               warn("Failed to get ESSID for interface %s", iface);
+               return NULL;
+       }
+       wreq.u.essid.pointer = id;
+       if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
+               warn("Failed to get ESSID for interface %s", iface);
+               return NULL;
+       }
+
+       close(sockfd);
+
+       if (strcmp(id, "") == 0)
+               return NULL;
+       else
+               return id;
+}
diff --git a/cpu.c b/cpu.c
deleted file mode 100644 (file)
index b4b7ef1..0000000
--- a/cpu.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-cpu_freq(void)
-{
-       int freq;
-
-       return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-                      "%i", &freq) == 1) ?
-              bprintf("%d", (freq + 500) / 1000) : NULL;
-}
-
-const char *
-cpu_perc(void)
-{
-       int perc;
-       static long double a[7];
-       static int valid;
-       long double b[7];
-
-       memcpy(b, a, sizeof(b));
-       if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
-                  &a[3], &a[4], &a[5], &a[6]) != 7) {
-               return NULL;
-       }
-       if (!valid) {
-               valid = 1;
-               return NULL;
-       }
-
-       perc = 100 * ((b[0]+b[1]+b[2]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[5]+a[6])) /
-              ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
-
-       return bprintf("%d", perc);
-}
-
-const char *
-cpu_iowait(void)
-{
-       int perc;
-       static int valid;
-       static long double a[7];
-       long double b[7];
-
-       memcpy(b, a, sizeof(b));
-       if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
-                  &a[3], &a[4], &a[5], &a[6]) != 7) {
-               return NULL;
-       }
-       if (!valid) {
-               valid = 1;
-               return NULL;
-       }
-
-       perc = 100 * ((b[4]) - (a[4])) /
-              ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
-
-       return bprintf("%d", perc);
-}
diff --git a/datetime.c b/datetime.c
deleted file mode 100644 (file)
index 98510e3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <time.h>
-
-#include "util.h"
-
-const char *
-datetime(const char *fmt)
-{
-       time_t t;
-
-       t = time(NULL);
-       if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0)
-               return NULL;
-
-       return buf;
-}
diff --git a/disk.c b/disk.c
deleted file mode 100644 (file)
index 51cdaaa..0000000
--- a/disk.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <stdio.h>
-#include <sys/statvfs.h>
-
-#include "util.h"
-
-const char *
-disk_free(const char *mnt)
-{
-       struct statvfs fs;
-
-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
-               return NULL;
-       }
-
-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
-}
-
-const char *
-disk_perc(const char *mnt)
-{
-       int perc;
-       struct statvfs fs;
-
-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
-               return NULL;
-       }
-
-       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
-
-       return bprintf("%d", perc);
-}
-
-const char *
-disk_total(const char *mnt)
-{
-       struct statvfs fs;
-
-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
-               return NULL;
-       }
-
-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
-}
-
-const char *
-disk_used(const char *mnt)
-{
-       struct statvfs fs;
-
-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
-               return NULL;
-       }
-
-       return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
-}
diff --git a/entropy.c b/entropy.c
deleted file mode 100644 (file)
index 211022a..0000000
--- a/entropy.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "util.h"
-
-const char *
-entropy(void)
-{
-       int num;
-
-       return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
-                      bprintf("%d", num) : NULL;
-}
diff --git a/hostname.c b/hostname.c
deleted file mode 100644 (file)
index 0ad1f3b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <unistd.h>
-
-#include "util.h"
-
-const char *
-hostname(void)
-{
-       if (gethostname(buf, sizeof(buf)) == -1) {
-               warn("hostname");
-               return NULL;
-       }
-
-       return buf;
-}
diff --git a/ip.c b/ip.c
deleted file mode 100644 (file)
index a042c79..0000000
--- a/ip.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-ipv4(const char *iface)
-{
-       struct ifaddrs *ifaddr, *ifa;
-       int s;
-       char host[NI_MAXHOST];
-
-       if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv4 address for interface %s", iface);
-               return NULL;
-       }
-
-       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);
-               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
-                       if (s != 0) {
-                               warnx("Failed to get IPv4 address for interface %s", iface);
-                               return NULL;
-                       }
-                       return bprintf("%s", host);
-               }
-       }
-
-       freeifaddrs(ifaddr);
-
-       return NULL;
-}
-
-const char *
-ipv6(const char *iface)
-{
-       struct ifaddrs *ifaddr, *ifa;
-       int s;
-       char host[NI_MAXHOST];
-
-       if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv6 address for interface %s", iface);
-               return NULL;
-       }
-
-       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-               if (ifa->ifa_addr == NULL) {
-                       continue;
-               }
-               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) {
-                       if (s != 0) {
-                               warnx("Failed to get IPv6 address for interface %s", iface);
-                               return NULL;
-                       }
-                       return bprintf("%s", host);
-               }
-       }
-
-       freeifaddrs(ifaddr);
-
-       return NULL;
-}
diff --git a/kernel_release.c b/kernel_release.c
deleted file mode 100644 (file)
index abe0acd..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <sys/utsname.h>
-#include <stdio.h>
-
-#include "util.h"
-
-const char *
-kernel_release(void)
-{
-       struct utsname udata;
-
-       if (uname(&udata) < 0) {
-               return NULL;
-       }
-
-       return bprintf("%s", udata.release);
-}
diff --git a/keyboard_indicators.c b/keyboard_indicators.c
deleted file mode 100644 (file)
index 13e8648..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <X11/Xlib.h>
-
-#include "util.h"
-
-const char *
-keyboard_indicators(void)
-{
-       Display *dpy = XOpenDisplay(NULL);
-       XKeyboardState state;
-
-       if (dpy == NULL) {
-               warnx("XOpenDisplay failed");
-               return NULL;
-       }
-       XGetKeyboardControl(dpy, &state);
-       XCloseDisplay(dpy);
-
-       switch (state.led_mask) {
-               case 1:
-                       return "c";
-               case 2:
-                       return "n";
-               case 3:
-                       return "cn";
-               default:
-                       return "";
-       }
-}
diff --git a/load_avg.c b/load_avg.c
deleted file mode 100644 (file)
index ad22ae4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <stdlib.h>
-
-#include "util.h"
-
-const char *
-load_avg(const char *fmt)
-{
-       double avgs[3];
-
-       if (getloadavg(avgs, 3) < 0) {
-               warnx("Failed to get the load avg");
-               return NULL;
-       }
-
-       return bprintf(fmt, avgs[0], avgs[1], avgs[2]);
-}
diff --git a/num_files.c b/num_files.c
deleted file mode 100644 (file)
index 778b8b9..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <dirent.h>
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-num_files(const char *dir)
-{
-       struct dirent *dp;
-       DIR *fd;
-       int num = 0;
-
-       if ((fd = opendir(dir)) == NULL) {
-               warn("Failed to get number of files in directory %s", dir);
-               return NULL;
-       }
-
-       while ((dp = readdir(fd)) != NULL) {
-               if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
-                       continue; /* skip self and parent */
-               num++;
-       }
-
-       closedir(fd);
-
-       return bprintf("%d", num);
-}
diff --git a/ram.c b/ram.c
deleted file mode 100644 (file)
index def27aa..0000000
--- a/ram.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "util.h"
-
-const char *
-ram_free(void)
-{
-       long free;
-
-       return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-              bprintf("%f", (float)free / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_perc(void)
-{
-       long total, free, buffers, cached;
-
-       return (pscanf("/proc/meminfo",
-                      "MemTotal: %ld kB\n"
-                      "MemFree: %ld kB\n"
-                      "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                      "Cached: %ld kB\n",
-                      &total, &free, &buffers, &buffers, &cached) == 5) ?
-              bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
-              NULL;
-}
-
-const char *
-ram_total(void)
-{
-       long total;
-
-       return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-              bprintf("%f", (float)total / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_used(void)
-{
-       long total, free, buffers, cached;
-
-       return (pscanf("/proc/meminfo",
-                      "MemTotal: %ld kB\n"
-                      "MemFree: %ld kB\n"
-                      "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                      "Cached: %ld kB\n",
-                      &total, &free, &buffers, &buffers, &cached) == 5) ?
-              bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
-              NULL;
-}
diff --git a/run_command.c b/run_command.c
deleted file mode 100644 (file)
index 7aa6c4f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-run_command(const char *cmd)
-{
-       char *p;
-       FILE *fp;
-
-       fp = popen(cmd, "r");
-       if (fp == NULL) {
-               warn("Failed to get command output for %s", cmd);
-               return NULL;
-       }
-       p = fgets(buf, sizeof(buf) - 1, fp);
-       pclose(fp);
-       if (!p)
-               return NULL;
-       if ((p = strrchr(buf, '\n')) != NULL)
-               p[0] = '\0';
-
-       return buf[0] ? buf : NULL;
-}
diff --git a/swap.c b/swap.c
deleted file mode 100644 (file)
index 93111c5..0000000
--- a/swap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "util.h"
-
-const char *
-swap_free(void)
-{
-       long total, free;
-       FILE *fp;
-       size_t bytes_read;
-       char *match;
-
-       fp = fopen("/proc/meminfo", "r");
-       if (fp == NULL) {
-               warn("Failed to open file /proc/meminfo");
-               return NULL;
-       }
-
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-               warn("swap_free: read error");
-               fclose(fp);
-               return NULL;
-       }
-       fclose(fp);
-
-       if ((match = strstr(buf, "SwapTotal")) == NULL)
-               return NULL;
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-       if ((match = strstr(buf, "SwapFree")) == NULL)
-               return NULL;
-       sscanf(match, "SwapFree: %ld kB\n", &free);
-
-       return bprintf("%f", (float)free / 1024 / 1024);
-}
-
-const char *
-swap_perc(void)
-{
-       long total, free, cached;
-       FILE *fp;
-       size_t bytes_read;
-       char *match;
-
-       fp = fopen("/proc/meminfo", "r");
-       if (fp == NULL) {
-               warn("Failed to open file /proc/meminfo");
-               return NULL;
-       }
-
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-               warn("swap_perc: read error");
-               fclose(fp);
-               return NULL;
-       }
-       fclose(fp);
-
-       if ((match = strstr(buf, "SwapTotal")) == NULL)
-               return NULL;
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-       if ((match = strstr(buf, "SwapCached")) == NULL)
-               return NULL;
-       sscanf(match, "SwapCached: %ld kB\n", &cached);
-
-       if ((match = strstr(buf, "SwapFree")) == NULL)
-               return NULL;
-       sscanf(match, "SwapFree: %ld kB\n", &free);
-
-       return bprintf("%d", 100 * (total - free - cached) / total);
-}
-
-const char *
-swap_total(void)
-{
-       long total;
-       FILE *fp;
-       size_t bytes_read;
-       char *match;
-
-       fp = fopen("/proc/meminfo", "r");
-       if (fp == NULL) {
-               warn("Failed to open file /proc/meminfo");
-               return NULL;
-       }
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-               warn("swap_total: read error");
-               fclose(fp);
-               return NULL;
-       }
-       fclose(fp);
-
-       if ((match = strstr(buf, "SwapTotal")) == NULL)
-               return NULL;
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-       return bprintf("%f", (float)total / 1024 / 1024);
-}
-
-const char *
-swap_used(void)
-{
-       long total, free, cached;
-       FILE *fp;
-       size_t bytes_read;
-       char *match;
-
-       fp = fopen("/proc/meminfo", "r");
-       if (fp == NULL) {
-               warn("Failed to open file /proc/meminfo");
-               return NULL;
-       }
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-               warn("swap_used: read error");
-               fclose(fp);
-               return NULL;
-       }
-       fclose(fp);
-
-       if ((match = strstr(buf, "SwapTotal")) == NULL)
-               return NULL;
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-       if ((match = strstr(buf, "SwapCached")) == NULL)
-               return NULL;
-       sscanf(match, "SwapCached: %ld kB\n", &cached);
-
-       if ((match = strstr(buf, "SwapFree")) == NULL)
-               return NULL;
-       sscanf(match, "SwapFree: %ld kB\n", &free);
-
-       return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
-}
diff --git a/temperature.c b/temperature.c
deleted file mode 100644 (file)
index 2c78ced..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "util.h"
-
-const char *
-temp(const char *file)
-{
-       int temp;
-
-       return (pscanf(file, "%d", &temp) == 1) ?
-              bprintf("%d", temp / 1000) : NULL;
-}
diff --git a/uptime.c b/uptime.c
deleted file mode 100644 (file)
index 827381b..0000000
--- a/uptime.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <sys/sysinfo.h>
-
-#include "util.h"
-
-const char *
-uptime(void)
-{
-       struct sysinfo info;
-       int h = 0;
-       int m = 0;
-
-       sysinfo(&info);
-       h = info.uptime / 3600;
-       m = (info.uptime - h * 3600 ) / 60;
-
-       return bprintf("%dh %dm", h, m);
-}
diff --git a/user.c b/user.c
deleted file mode 100644 (file)
index 851acb4..0000000
--- a/user.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "util.h"
-
-const char *
-gid(void)
-{
-       return bprintf("%d", getgid());
-}
-
-const char *
-username(void)
-{
-       struct passwd *pw = getpwuid(geteuid());
-
-       if (pw == NULL) {
-               warn("Failed to get username");
-               return NULL;
-       }
-
-       return bprintf("%s", pw->pw_name);
-}
-
-const char *
-uid(void)
-{
-       return bprintf("%d", geteuid());
-}
diff --git a/volume.c b/volume.c
deleted file mode 100644 (file)
index 0074754..0000000
--- a/volume.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <fcntl.h>
-#include <sys/soundcard.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "util.h"
-
-const char *
-vol_perc(const char *card)
-{
-       unsigned int i;
-       int v, afd, devmask;
-       char *vnames[] = SOUND_DEVICE_NAMES;
-
-       afd = open(card, O_RDONLY | O_NONBLOCK);
-       if (afd == -1) {
-               warn("Cannot open %s", card);
-               return NULL;
-       }
-
-       if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
-               warn("Cannot get volume for %s", card);
-               close(afd);
-               return NULL;
-       }
-       for (i = 0; i < LEN(vnames); i++) {
-               if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
-                       if (ioctl(afd, MIXER_READ(i), &v) == -1) {
-                               warn("vol_perc: ioctl");
-                               close(afd);
-                               return NULL;
-                       }
-               }
-       }
-
-       close(afd);
-
-       return bprintf("%d", v & 0xff);
-}
diff --git a/wifi.c b/wifi.c
deleted file mode 100644 (file)
index 41ae4c6..0000000
--- a/wifi.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <ifaddrs.h>
-#include <linux/wireless.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "util.h"
-
-const char *
-wifi_perc(const char *iface)
-{
-       int i, perc;
-       char *p, *datastart;
-       char path[PATH_MAX];
-       char status[5];
-       FILE *fp;
-
-       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
-       fp = fopen(path, "r");
-       if (fp == NULL) {
-               warn("Failed to open file %s", path);
-               return NULL;
-       }
-       p = fgets(status, 5, fp);
-       fclose(fp);
-       if(!p || strcmp(status, "up\n") != 0) {
-               return NULL;
-       }
-
-       fp = fopen("/proc/net/wireless", "r");
-       if (fp == NULL) {
-               warn("Failed to open file /proc/net/wireless");
-               return NULL;
-       }
-
-       for (i = 0; i < 3; i++) {
-               if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
-                       break;
-       }
-       fclose(fp);
-       if (i < 2 || !p)
-               return NULL;
-
-       if ((datastart = strstr(buf, iface)) == NULL)
-               return NULL;
-
-       datastart = (datastart+(strlen(iface)+1));
-       sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
-
-       return bprintf("%d", perc);
-}
-
-const char *
-wifi_essid(const char *iface)
-{
-       static char id[IW_ESSID_MAX_SIZE+1];
-       int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-       struct iwreq wreq;
-
-       memset(&wreq, 0, sizeof(struct iwreq));
-       wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
-       snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
-
-       if (sockfd == -1) {
-               warn("Failed to get ESSID for interface %s", iface);
-               return NULL;
-       }
-       wreq.u.essid.pointer = id;
-       if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-               warn("Failed to get ESSID for interface %s", iface);
-               return NULL;
-       }
-
-       close(sockfd);
-
-       if (strcmp(id, "") == 0)
-               return NULL;
-       else
-               return id;
-}