fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

got rid of concat.h

This commit is contained in:
Aaron Marcher 2017-01-07 22:01:49 +01:00
parent d1915f0d4d
commit 32bb92453a
No known key found for this signature in database
GPG Key ID: 74B048E5C2474F9A
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
extern/concat.h vendored
View File

@ -1,22 +0,0 @@
/*
* Thanks to lloyd for contribution
*/
extern char concat[8192];
extern void
ccat(const unsigned short int count, ...)
{
va_list ap;
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));
va_end(ap);
return;
}

27
slstatus.c
View File

@ -29,7 +29,6 @@
#include "extern/arg.h" #include "extern/arg.h"
#include "extern/strlcat.h" #include "extern/strlcat.h"
#include "extern/concat.h"
struct arg { struct arg {
char *(*func)(); char *(*func)();
@ -72,7 +71,6 @@ static void sighandler(const int signo);
static void usage(const int eval); static void usage(const int eval);
char *argv0; char *argv0;
char concat[];
static unsigned short int delay = 0; static unsigned short int delay = 0;
static unsigned short int done; static unsigned short int done;
static unsigned short int dflag, oflag; static unsigned short int dflag, oflag;
@ -107,12 +105,13 @@ static char *
battery_perc(const char *bat) battery_perc(const char *bat)
{ {
int perc; int perc;
char path[PATH_MAX];
FILE *fp; FILE *fp;
ccat(3, "/sys/class/power_supply/", bat, "/capacity"); snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
fp = fopen(concat, "r"); fp = fopen(path, "r");
if (fp == NULL) { if (fp == NULL) {
warn("Failed to open file %s", concat); warn("Failed to open file %s", path);
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
} }
fscanf(fp, "%i", &perc); fscanf(fp, "%i", &perc);
@ -124,13 +123,14 @@ battery_perc(const char *bat)
static char * static char *
battery_state(const char *bat) battery_state(const char *bat)
{ {
char path[PATH_MAX];
char state[12]; char state[12];
FILE *fp; FILE *fp;
ccat(3, "/sys/class/power_supply/", bat, "/status"); snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
fp = fopen(concat, "r"); fp = fopen(path, "r");
if (fp == NULL) { if (fp == NULL) {
warn("Failed to open file %s", concat); warn("Failed to open file %s", path);
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
} }
fscanf(fp, "%12s", state); fscanf(fp, "%12s", state);
@ -673,13 +673,14 @@ wifi_perc(const char *iface)
int perc; int perc;
char buf[255]; char buf[255];
char *datastart; char *datastart;
char path[PATH_MAX];
char status[5]; char status[5];
FILE *fp; FILE *fp;
ccat(3, "/sys/class/net/", iface, "/operstate"); snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
fp = fopen(concat, "r"); fp = fopen(path, "r");
if (fp == NULL) { if (fp == NULL) {
warn("Failed to open file %s", concat); warn("Failed to open file %s", path);
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
} }
fgets(status, 5, fp); fgets(status, 5, fp);
@ -693,13 +694,13 @@ wifi_perc(const char *iface)
warn("Failed to open file /proc/net/wireless"); warn("Failed to open file /proc/net/wireless");
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
} }
ccat(2, iface, ":");
fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp);
fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp);
fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp);
fclose(fp); fclose(fp);
if ((datastart = strstr(buf, concat)) == NULL) { if ((datastart = strstr(buf, iface)) == NULL) {
return smprintf("%s", UNKNOWN_STR); return smprintf("%s", UNKNOWN_STR);
} }
datastart = (datastart+(strlen(iface)+1)); datastart = (datastart+(strlen(iface)+1));