Xinqi Bao's Git
projects
/
slstatus.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
TODO update
[slstatus.git]
/
slstatus.c
diff --git
a/slstatus.c
b/slstatus.c
index
9559226
..
6a338f9
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-20,6
+20,7
@@
#include <sys/socket.h>
#include <sys/sysinfo.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/sysinfo.h>
#include <sys/types.h>
+#include <sys/utsname.h>
#include <time.h>
#include <unistd.h>
#include <X11/Xlib.h>
#include <time.h>
#include <unistd.h>
#include <X11/Xlib.h>
@@
-29,7
+30,6
@@
#include "extern/arg.h"
#include "extern/strlcat.h"
#include "extern/arg.h"
#include "extern/strlcat.h"
-#include "extern/strlcpy.h"
#include "extern/concat.h"
struct arg {
#include "extern/concat.h"
struct arg {
@@
-68,13
+68,13
@@
static char *username(void);
static char *vol_perc(const char *card);
static char *wifi_perc(const char *iface);
static char *wifi_essid(const char *iface);
static char *vol_perc(const char *card);
static char *wifi_perc(const char *iface);
static char *wifi_essid(const char *iface);
-static
void set_status(const char *str
);
+static
char *kernel_release(void
);
static void sighandler(const int signo);
static void usage(void);
char *argv0;
char concat[];
static void sighandler(const int signo);
static void usage(void);
char *argv0;
char concat[];
-static unsigned short int delay;
+static unsigned short int delay
= 0
;
static unsigned short int done;
static unsigned short int dflag, oflag;
static Display *dpy;
static unsigned short int done;
static unsigned short int dflag, oflag;
static Display *dpy;
@@
-114,7
+114,7
@@
battery_perc(const char *bat)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%i", &perc);
fclose(fp);
}
fscanf(fp, "%i", &perc);
fclose(fp);
@@
-132,7
+132,7
@@
battery_state(const char *bat)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%12s", state);
fclose(fp);
}
fscanf(fp, "%12s", state);
fclose(fp);
@@
-158,18
+158,18
@@
cpu_perc(void)
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
fclose(fp);
}
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
fclose(fp);
- delay
= (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1))
;
+ delay
++
;
sleep(delay);
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
sleep(delay);
fp = fopen("/proc/stat", "r");
if (fp == NULL) {
warn("Failed to open file /proc/stat");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
fclose(fp);
}
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
fclose(fp);
@@
-186,7
+186,7
@@
datetime(const char *fmt)
t = time(NULL);
if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
t = time(NULL);
if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%s", str);
}
return smprintf("%s", str);
@@
-199,7
+199,7
@@
disk_free(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
@@
-213,7
+213,7
@@
disk_perc(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
}
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
@@
-228,7
+228,7
@@
disk_total(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
}
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
@@
-241,7
+241,7
@@
disk_used(const char *mnt)
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
if (statvfs(mnt, &fs) < 0) {
warn("Failed to get filesystem info");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
}
return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
@@
-256,7
+256,7
@@
entropy(void)
fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
if (fp == NULL) {
warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
if (fp == NULL) {
warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%d", &num);
fclose(fp);
}
fscanf(fp, "%d", &num);
fclose(fp);
@@
-277,7
+277,7
@@
hostname(void)
if (gethostname(buf, sizeof(buf)) == -1) {
warn("hostname");
if (gethostname(buf, sizeof(buf)) == -1) {
warn("hostname");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%s", buf);
}
return smprintf("%s", buf);
@@
-292,7
+292,7
@@
ip(const char *iface)
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IP address for interface %s", iface);
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IP address for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
@@
-303,7
+303,7
@@
ip(const char *iface)
if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
if (s != 0) {
warnx("Failed to get IP address for interface %s", iface);
if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
if (s != 0) {
warnx("Failed to get IP address for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%s", host);
}
}
return smprintf("%s", host);
}
@@
-311,7
+311,7
@@
ip(const char *iface)
freeifaddrs(ifaddr);
freeifaddrs(ifaddr);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
static char *
}
static char *
@@
-321,7
+321,7
@@
load_avg(void)
if (getloadavg(avgs, 3) < 0) {
warnx("Failed to get the load avg");
if (getloadavg(avgs, 3) < 0) {
warnx("Failed to get the load avg");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
}
return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
@@
-336,7
+336,7
@@
ram_free(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "MemFree: %ld kB\n", &free);
fclose(fp);
}
fscanf(fp, "MemFree: %ld kB\n", &free);
fclose(fp);
@@
-353,7
+353,7
@@
ram_perc(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
@@
-373,7
+373,7
@@
ram_total(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fclose(fp);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fclose(fp);
@@
-390,7
+390,7
@@
ram_used(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
}
fscanf(fp, "MemTotal: %ld kB\n", &total);
fscanf(fp, "MemFree: %ld kB\n", &free);
@@
-404,19
+404,22
@@
ram_used(void)
static char *
run_command(const char *cmd)
{
static char *
run_command(const char *cmd)
{
+ char *nlptr;
FILE *fp;
FILE *fp;
- char buf[1024] =
"n/a"
;
+ char buf[1024] =
UNKNOWN_STR
;
fp = popen(cmd, "r");
if (fp == NULL) {
warn("Failed to get command output for %s", cmd);
fp = popen(cmd, "r");
if (fp == NULL) {
warn("Failed to get command output for %s", cmd);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
}
- fgets(buf, sizeof(buf)
-1
, fp);
+ fgets(buf, sizeof(buf), fp);
pclose(fp);
pclose(fp);
-
buf[strlen(buf)] = '\0';
buf[strlen(buf)] = '\0';
- strtok(buf, "\n");
+
+ if ((nlptr = strstr(buf, "\n")) != NULL) {
+ nlptr[0] = '\0';
+ }
return smprintf("%s", buf);
}
return smprintf("%s", buf);
}
@@
-433,23
+436,26
@@
swap_free(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
+ }
+
+ if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+ warn("swap_free: read error");
+ fclose(fp);
+ return smprintf("%s", UNKNOWN_STR);
}
}
- bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+
buf[bytes_read] = '\0';
fclose(fp);
buf[bytes_read] = '\0';
fclose(fp);
- if (bytes_read == 0 || bytes_read == sizeof(buf)) {
- warn("Failed to read /proc/meminfo\n");
- return smprintf(UNKNOWN_STR);
- }
- match = strstr(buf, "SwapTotal");
- sscanf(match, "SwapTotal: %ld kB\n", &total);
- if (total == 0) {
- return smprintf(UNKNOWN_STR);
+ if ((match = strstr(buf, "SwapTotal")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
}
}
+ sscanf(match, "SwapTotal: %ld kB\n", &total);
- match = strstr(buf, "SwapFree");
+ if ((match = strstr(buf, "SwapFree")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
+ }
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%f", (float)free / 1024 / 1024);
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%f", (float)free / 1024 / 1024);
@@
-467,26
+473,31
@@
swap_perc(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf("%s", UNKNOWN_STR);
+ }
+
+ if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+ warn("swap_perc: read error");
+ fclose(fp);
+ return smprintf("%s", UNKNOWN_STR);
}
}
- bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+
buf[bytes_read] = '\0';
fclose(fp);
buf[bytes_read] = '\0';
fclose(fp);
- if (bytes_read == 0 || bytes_read == sizeof(buf)) {
- warn("Failed to read /proc/meminfo\n");
- return smprintf(UNKNOWN_STR);
- }
- match = strstr(buf, "SwapTotal");
- sscanf(match, "SwapTotal: %ld kB\n", &total);
- if (total == 0) {
- return smprintf(UNKNOWN_STR);
+ if ((match = strstr(buf, "SwapTotal")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
}
}
+ sscanf(match, "SwapTotal: %ld kB\n", &total);
- match = strstr(buf, "SwapCached");
+ if ((match = strstr(buf, "SwapCached")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
+ }
sscanf(match, "SwapCached: %ld kB\n", &cached);
sscanf(match, "SwapCached: %ld kB\n", &cached);
- match = strstr(buf, "SwapFree");
+ if ((match = strstr(buf, "SwapFree")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
+ }
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%d%%", 100 * (total - free - cached) / total);
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%d%%", 100 * (total - free - cached) / total);
@@
-504,21
+515,21
@@
swap_total(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
}
- bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+ if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+ warn("swap_total: read error");
+ fclose(fp);
+ return smprintf("%s", UNKNOWN_STR);
+ }
+
buf[bytes_read] = '\0';
fclose(fp);
buf[bytes_read] = '\0';
fclose(fp);
- if (bytes_read == 0 || bytes_read == sizeof(buf)) {
- warn("Failed to read /proc/meminfo\n");
- return smprintf(UNKNOWN_STR);
- }
- match = strstr(buf, "SwapTotal");
- sscanf(match, "SwapTotal: %ld kB\n", &total);
- if (total == 0) {
- return smprintf(UNKNOWN_STR);
+ if ((match = strstr(buf, "SwapTotal")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
}
}
+ sscanf(match, "SwapTotal: %ld kB\n", &total);
return smprintf("%f", (float)total / 1024 / 1024);
}
return smprintf("%f", (float)total / 1024 / 1024);
}
@@
-535,26
+546,30
@@
swap_used(void)
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
fp = fopen("/proc/meminfo", "r");
if (fp == NULL) {
warn("Failed to open file /proc/meminfo");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
}
- bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+ if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+ warn("swap_used: read error");
+ fclose(fp);
+ return smprintf("%s", UNKNOWN_STR);
+ }
+
buf[bytes_read] = '\0';
fclose(fp);
buf[bytes_read] = '\0';
fclose(fp);
- if (bytes_read == 0 || bytes_read == sizeof(buf)) {
- warn("Failed to read /proc/meminfo\n");
- return smprintf(UNKNOWN_STR);
- }
- match = strstr(buf, "SwapTotal");
- sscanf(match, "SwapTotal: %ld kB\n", &total);
- if (total == 0) {
- return smprintf(UNKNOWN_STR);
+ if ((match = strstr(buf, "SwapTotal")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
}
}
+ sscanf(match, "SwapTotal: %ld kB\n", &total);
- match = strstr(buf, "SwapCached");
+ if ((match = strstr(buf, "SwapCached")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
+ }
sscanf(match, "SwapCached: %ld kB\n", &cached);
sscanf(match, "SwapCached: %ld kB\n", &cached);
- match = strstr(buf, "SwapFree");
+ if ((match = strstr(buf, "SwapFree")) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
+ }
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
sscanf(match, "SwapFree: %ld kB\n", &free);
return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
@@
-569,7
+584,7
@@
temp(const char *file)
fp = fopen(file, "r");
if (fp == NULL) {
warn("Failed to open file %s", file);
fp = fopen(file, "r");
if (fp == NULL) {
warn("Failed to open file %s", file);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fscanf(fp, "%d", &temp);
fclose(fp);
}
fscanf(fp, "%d", &temp);
fclose(fp);
@@
-599,7
+614,7
@@
username(void)
if (pw == NULL) {
warn("Failed to get username");
if (pw == NULL) {
warn("Failed to get username");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
return smprintf("%s", pw->pw_name);
}
return smprintf("%s", pw->pw_name);
@@
-633,7
+648,7
@@
vol_perc(const char *card)
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
warn("Failed to get volume percentage for %s", card);
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
warn("Failed to get volume percentage for %s", card);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
snd_mixer_handle_events(handle);
}
snd_mixer_handle_events(handle);
@@
-665,18
+680,18
@@
wifi_perc(const char *iface)
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Failed to open file %s", concat);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fgets(status, 5, fp);
fclose(fp);
if(strcmp(status, "up\n") != 0) {
}
fgets(status, 5, fp);
fclose(fp);
if(strcmp(status, "up\n") != 0) {
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
fp = fopen("/proc/net/wireless", "r");
if (fp == NULL) {
warn("Failed to open file /proc/net/wireless");
}
fp = fopen("/proc/net/wireless", "r");
if (fp == NULL) {
warn("Failed to open file /proc/net/wireless");
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
ccat(2, iface, ":");
fgets(buf, sizeof(buf), fp);
}
ccat(2, iface, ":");
fgets(buf, sizeof(buf), fp);
@@
-684,11
+699,11
@@
wifi_perc(const char *iface)
fgets(buf, sizeof(buf), fp);
fclose(fp);
fgets(buf, sizeof(buf), fp);
fclose(fp);
- datastart = strstr(buf, concat);
- if (datastart != NULL) {
- datastart = strstr(buf, ":");
- sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc);
+ if ((datastart = strstr(buf, concat)) == NULL) {
+ return smprintf("%s", UNKNOWN_STR);
}
}
+ 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);
}
@@
-702,30
+717,34
@@
wifi_essid(const char *iface)
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
- sprintf(wreq.ifr_name, iface);
+ snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+
if (sockfd == -1) {
warn("Failed to get ESSID for interface %s", iface);
if (sockfd == -1) {
warn("Failed to get ESSID for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
wreq.u.essid.pointer = id;
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
warn("Failed to get ESSID for interface %s", iface);
}
wreq.u.essid.pointer = id;
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
warn("Failed to get ESSID for interface %s", iface);
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
}
close(sockfd);
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
}
close(sockfd);
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
- return smprintf(UNKNOWN_STR);
+ return smprintf(
"%s",
UNKNOWN_STR);
else
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
else
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
-static
void
-
set_status(const char *str
)
+static
char *
+
kernel_release(void
)
{
{
- XStoreName(dpy, DefaultRootWindow(dpy), str);
- XSync(dpy, False);
+ struct utsname udata;
+ if (uname(&udata) < 0)
+ return smprintf("%s", UNKNOWN_STR);
+
+ return smprintf("%s", udata.release);
}
static void
}
static void
@@
-747,7
+766,7
@@
int
main(int argc, char *argv[])
{
unsigned short int i;
main(int argc, char *argv[])
{
unsigned short int i;
- char status_string[
4096
];
+ char status_string[
2048
];
char *res, *element;
struct arg argument;
struct sigaction act;
char *res, *element;
struct arg argument;
struct sigaction act;
@@
-796,30
+815,33
@@
main(int argc, char *argv[])
}
element = smprintf(argument.fmt, res);
if (element == NULL) {
}
element = smprintf(argument.fmt, res);
if (element == NULL) {
- element = smprintf(UNKNOWN_STR);
+ element = smprintf(
"%s",
UNKNOWN_STR);
warnx("Failed to format output");
}
warnx("Failed to format output");
}
- strlcat(status_string, element, sizeof(status_string));
+ if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string))
+ warnx("Output too long");
free(res);
free(element);
}
if (!oflag) {
free(res);
free(element);
}
if (!oflag) {
- set_status(status_string);
+ XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+ XSync(dpy, False);
} else {
printf("%s\n", status_string);
}
} else {
printf("%s\n", status_string);
}
- /*
- * subtract delay time spend in function
- * calls from the actual global delay time
- */
- sleep(UPDATE_INTERVAL - delay);
- delay = 0;
+ if ((UPDATE_INTERVAL - delay) <= 0) {
+ delay = 0;
+ continue;
+ } else {
+ sleep(UPDATE_INTERVAL - delay);
+ delay = 0;
+ }
}
if (!oflag) {
}
if (!oflag) {
-
set_status(
NULL);
+
XStoreName(dpy, DefaultRootWindow(dpy),
NULL);
XCloseDisplay(dpy);
}
XCloseDisplay(dpy);
}