Merge pull request #32 from R41z/master
several bugfixes and general improvements, see commits below.
This commit is contained in:
Aaron Marcher
GitHub
commit
e3c9a6f923
|
|
@ -6,6 +6,6 @@ Thanks you very much for your great help!
|
|||
- [Vlaix](https://github.com/Vlaix)
|
||||
- [pfannkuckengesicht](https://github.com/pfannkuchengesicht)
|
||||
- [sahne](https://github.com/sahne)
|
||||
- [Ali H. Fardan](http://raiz.duckdns.org)
|
||||
- [Ali H. Fardan](http://hexeract.info)
|
||||
- [Quentin Rameau](https://fifth.space)
|
||||
- [Mike Coddington](https://coddington.us)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
* [ ] fix build on OpenBSD
|
||||
* [ ] fix build on NetBSD
|
||||
* [ ] fix build on FreeBSD
|
||||
* [ ] test wifi functions after the last few commits
|
||||
* [ ] allow calling routines from command line arguments like: slstatus --datetime "%F %T"
|
||||
* [X] see if drkhsh approves it
|
||||
|
|
@ -11,6 +11,9 @@ ccat(const unsigned short int count, ...)
|
|||
unsigned short int i;
|
||||
concat[0] = '\0';
|
||||
|
||||
if (count == 0)
|
||||
return;
|
||||
|
||||
va_start(ap, count);
|
||||
for(i = 0; i < count; i++)
|
||||
strlcat(concat, va_arg(ap, char *), sizeof(concat));
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
/* $OpenBSD: strlcpy.c,v 1.13 2015/08/31 02:53:57 guenther Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
* Copy string src to buffer dst of size dsize. At most dsize-1
|
||||
* chars will be copied. Always NUL terminates (unless dsize == 0).
|
||||
* Returns strlen(src); if retval >= dsize, truncation occurred.
|
||||
*/
|
||||
size_t
|
||||
strlcpy(char *dst, const char *src, size_t dsize)
|
||||
{
|
||||
const char *osrc = src;
|
||||
size_t nleft = dsize;
|
||||
|
||||
/* Copy as many bytes as will fit. */
|
||||
if (nleft != 0) {
|
||||
while (--nleft != 0) {
|
||||
if ((*dst++ = *src++) == '\0')
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Not enough room in dst, add NUL and traverse rest of src. */
|
||||
if (nleft == 0) {
|
||||
if (dsize != 0)
|
||||
*dst = '\0'; /* NUL-terminate dst */
|
||||
while (*src++)
|
||||
;
|
||||
}
|
||||
|
||||
return(src - osrc - 1); /* count does not include NUL */
|
||||
}
|
||||
237
slstatus.c
237
slstatus.c
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#include "extern/arg.h"
|
||||
#include "extern/strlcat.h"
|
||||
#include "extern/strlcpy.h"
|
||||
#include "extern/concat.h"
|
||||
|
||||
struct arg {
|
||||
|
|
@ -70,13 +69,12 @@ 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 void set_status(const char *str);
|
||||
static void sighandler(const int signo);
|
||||
static void usage(void);
|
||||
static void usage(int);
|
||||
|
||||
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;
|
||||
|
|
@ -116,7 +114,7 @@ battery_perc(const char *bat)
|
|||
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);
|
||||
|
|
@ -134,7 +132,7 @@ battery_state(const char *bat)
|
|||
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);
|
||||
|
|
@ -160,18 +158,18 @@ cpu_perc(void)
|
|||
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);
|
||||
|
||||
delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
|
||||
delay++;
|
||||
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);
|
||||
|
|
@ -188,7 +186,7 @@ datetime(const char *fmt)
|
|||
|
||||
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);
|
||||
|
|
@ -201,7 +199,7 @@ disk_free(const char *mnt)
|
|||
|
||||
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);
|
||||
|
|
@ -215,7 +213,7 @@ disk_perc(const char *mnt)
|
|||
|
||||
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));
|
||||
|
|
@ -230,7 +228,7 @@ disk_total(const char *mnt)
|
|||
|
||||
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);
|
||||
|
|
@ -243,7 +241,7 @@ disk_used(const char *mnt)
|
|||
|
||||
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);
|
||||
|
|
@ -258,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");
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
fscanf(fp, "%d", &num);
|
||||
fclose(fp);
|
||||
|
|
@ -279,7 +277,7 @@ hostname(void)
|
|||
|
||||
if (gethostname(buf, sizeof(buf)) == -1) {
|
||||
warn("hostname");
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
return smprintf("%s", buf);
|
||||
|
|
@ -294,7 +292,7 @@ ip(const char *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) {
|
||||
|
|
@ -305,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);
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
return smprintf("%s", host);
|
||||
}
|
||||
|
|
@ -313,7 +311,7 @@ ip(const char *iface)
|
|||
|
||||
freeifaddrs(ifaddr);
|
||||
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
static char *
|
||||
|
|
@ -335,7 +333,7 @@ load_avg(void)
|
|||
|
||||
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]);
|
||||
|
|
@ -350,7 +348,7 @@ ram_free(void)
|
|||
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);
|
||||
|
|
@ -367,7 +365,7 @@ ram_perc(void)
|
|||
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);
|
||||
|
|
@ -387,7 +385,7 @@ ram_total(void)
|
|||
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);
|
||||
|
|
@ -404,7 +402,7 @@ ram_used(void)
|
|||
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);
|
||||
|
|
@ -418,19 +416,22 @@ ram_used(void)
|
|||
static char *
|
||||
run_command(const char *cmd)
|
||||
{
|
||||
char *nlptr;
|
||||
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);
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
fgets(buf, sizeof(buf)-1, fp);
|
||||
fgets(buf, sizeof(buf), fp);
|
||||
pclose(fp);
|
||||
|
||||
buf[strlen(buf)] = '\0';
|
||||
strtok(buf, "\n");
|
||||
|
||||
if ((nlptr = strstr(buf, "\n")) != NULL) {
|
||||
nlptr[0] = '\0';
|
||||
}
|
||||
|
||||
return smprintf("%s", buf);
|
||||
}
|
||||
|
|
@ -447,23 +448,26 @@ swap_free(void)
|
|||
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_free: read error");
|
||||
fclose(fp);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
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");
|
||||
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||
if (total == 0) {
|
||||
return smprintf(UNKNOWN_STR);
|
||||
}
|
||||
|
||||
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);
|
||||
|
|
@ -481,26 +485,31 @@ swap_perc(void)
|
|||
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_perc: read error");
|
||||
fclose(fp);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
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");
|
||||
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||
if (total == 0) {
|
||||
return smprintf(UNKNOWN_STR);
|
||||
}
|
||||
|
||||
match = strstr(buf, "SwapCached");
|
||||
if ((match = strstr(buf, "SwapCached")) == NULL) {
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
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);
|
||||
|
|
@ -518,21 +527,21 @@ swap_total(void)
|
|||
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);
|
||||
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);
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
|
||||
warn("swap_total: read error");
|
||||
fclose(fp);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
match = strstr(buf, "SwapTotal");
|
||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||
if (total == 0) {
|
||||
return smprintf(UNKNOWN_STR);
|
||||
buf[bytes_read] = '\0';
|
||||
fclose(fp);
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
@ -549,26 +558,30 @@ swap_used(void)
|
|||
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);
|
||||
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
|
||||
warn("Failed to read /proc/meminfo\n");
|
||||
return smprintf(UNKNOWN_STR);
|
||||
}
|
||||
|
||||
match = strstr(buf, "SwapTotal");
|
||||
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||
if (total == 0) {
|
||||
return smprintf(UNKNOWN_STR);
|
||||
}
|
||||
|
||||
match = strstr(buf, "SwapCached");
|
||||
if ((match = strstr(buf, "SwapCached")) == NULL) {
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
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);
|
||||
|
|
@ -583,7 +596,7 @@ temp(const char *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);
|
||||
|
|
@ -613,7 +626,7 @@ username(void)
|
|||
|
||||
if (pw == NULL) {
|
||||
warn("Failed to get username");
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
return smprintf("%s", pw->pw_name);
|
||||
|
|
@ -647,7 +660,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);
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
snd_mixer_handle_events(handle);
|
||||
|
|
@ -679,18 +692,18 @@ wifi_perc(const char *iface)
|
|||
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) {
|
||||
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");
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
ccat(2, iface, ":");
|
||||
fgets(buf, sizeof(buf), fp);
|
||||
|
|
@ -698,11 +711,11 @@ wifi_perc(const char *iface)
|
|||
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);
|
||||
}
|
||||
|
|
@ -716,32 +729,26 @@ wifi_essid(const char *iface)
|
|||
|
||||
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);
|
||||
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);
|
||||
return smprintf(UNKNOWN_STR);
|
||||
return smprintf("%s", UNKNOWN_STR);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
static void
|
||||
set_status(const char *str)
|
||||
{
|
||||
XStoreName(dpy, DefaultRootWindow(dpy), str);
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
static void
|
||||
sighandler(const int signo)
|
||||
{
|
||||
|
|
@ -751,17 +758,17 @@ sighandler(const int signo)
|
|||
}
|
||||
|
||||
static void
|
||||
usage(void)
|
||||
usage(int eval)
|
||||
{
|
||||
fprintf(stderr, "usage: %s [-dhov]\n", argv0);
|
||||
exit(1);
|
||||
fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0);
|
||||
exit(eval);
|
||||
}
|
||||
|
||||
int
|
||||
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;
|
||||
|
|
@ -776,12 +783,14 @@ main(int argc, char *argv[])
|
|||
case 'v':
|
||||
printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
|
||||
return 0;
|
||||
case 'h':
|
||||
usage(0);
|
||||
default:
|
||||
usage();
|
||||
usage(1);
|
||||
} ARGEND
|
||||
|
||||
if (dflag && oflag) {
|
||||
usage();
|
||||
usage(1);
|
||||
}
|
||||
if (dflag && daemon(1, 1) < 0) {
|
||||
err(1, "daemon");
|
||||
|
|
@ -810,30 +819,34 @@ main(int argc, char *argv[])
|
|||
}
|
||||
element = smprintf(argument.fmt, res);
|
||||
if (element == NULL) {
|
||||
element = smprintf(UNKNOWN_STR);
|
||||
element = smprintf("%s", UNKNOWN_STR);
|
||||
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) {
|
||||
set_status(status_string);
|
||||
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
|
||||
XSync(dpy, False);
|
||||
} 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) {
|
||||
set_status(NULL);
|
||||
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
|
||||
XCloseDisplay(dpy);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue