X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/f13104156f20c0e394297c56550ff8a948ff1c1a..87eae6db0398ec1ddb98d67fea36339ff58eb2a5:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index 1d46674..be124f3 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -26,6 +26,7 @@
 #undef strlcat
 #undef strlcpy
 
+#include "arg.h"
 #include "strlcat.h"
 #include "strlcpy.h"
 #include "concat.h"
@@ -64,11 +65,13 @@ static char *username(void);
 static char *vol_perc(const char *);
 static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
+static void set_status(const char *);
 static void sighandler(const int);
+static void usage(void);
 
-static unsigned short int delay;
+char *argv0;
+static unsigned short int delay, done, dflag, oflag;
 static Display *dpy;
-static int done = 0;
 
 #include "config.h"
 
@@ -117,22 +120,16 @@ battery_perc(const char *battery)
 static char *
 battery_state(const char *battery)
 {
-	char *state = malloc(sizeof(char)*12);
+	char state[12]; 
 	FILE *fp;
 
-	if (!state) {
-		warn("Failed to get battery state.");
-		return smprintf(UNKNOWN_STR);
-	}
-
-
 	ccat(3, "/sys/class/power_supply/", battery, "/status");
 	fp = fopen(concat, "r");
 	if (fp == NULL) {
 		warn("Error opening battery file: %s", concat);
 		return smprintf(UNKNOWN_STR);
 	}
-	fscanf(fp, "%s", state);
+	fscanf(fp, "%12s", state);
 	fclose(fp);
 
 	if (strcmp(state, "Charging") == 0)
@@ -279,9 +276,7 @@ hostname(void)
 	}
 
 	fgets(hostname, sizeof(hostname), fp);
-	/* FIXME: needs improvement */
-	memset(&hostname[strlen(hostname)-1], '\0',
-		sizeof(hostname) - strlen(hostname));
+	hostname[strlen(hostname)-1] = '\0';
 	fclose(fp);
 
 	return smprintf("%s", hostname);
@@ -415,26 +410,18 @@ ram_used(void)
 static char *
 run_command(const char* command)
 {
-	int good;
 	FILE *fp = popen(command, "r");
-	char buffer[64] = "";
+	char buffer[64] = "\0";
 
 	if (fp == NULL) {
 		warn("Could not get command output for: %s", command);
 		return smprintf(UNKNOWN_STR);
 	}
 
-	fgets(buffer, sizeof(buffer)-1, fp);
-	pclose(fp);
-	for (int i = 0 ; i != sizeof(buffer); i++) {
-		if (buffer[i] == '\0') {
-			good = 1;
-			break;
-		}
-	}
-	if (good)
-		buffer[strlen(buffer)-1] = '\0';
+	fgets(buffer, sizeof(buffer), fp);
+	buffer[sizeof(buffer)-1] = '\0';
 
+	pclose(fp);
 	return smprintf("%s", buffer);
 }
 
@@ -509,7 +496,7 @@ vol_perc(const char *soundcard)
 	if (elem == NULL) {
 		snd_mixer_selem_id_free(s_elem);
 		snd_mixer_close(handle);
-		warn("Failed to get volume percentage for: %s.", soundcard);
+		warn("Failed to get volume percentage for: %s", soundcard);
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -596,23 +583,57 @@ wifi_essid(const char *wificard)
 		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)
 {
-	if (signo == SIGTERM || signo == SIGINT) {
+	if (signo == SIGTERM || signo == SIGINT)
 		done = 1;
-	}
 }
 
+static void
+usage(void)
+{
+	fprintf(stderr,
+		"slstatus (c) 2016, drkhsh\n"
+		"usage: %s [-dho]\n",
+		argv0);
+	exit(1);
+}
+
+
+
 int
-main(void)
+main(int argc, char *argv[])
 {
-	size_t i;
+	unsigned short int i;
 	char status_string[4096];
-	char *res, *element, *status_old;
+	char *res, *element;
 	struct arg argument;
 	struct sigaction act;
 
+	ARGBEGIN {
+		case 'd':
+			dflag = 1;
+			break;
+		case 'o':
+			oflag = 1;
+			break;
+		default:
+			usage();
+	} ARGEND
+
+	if (dflag && oflag)
+		usage();
+	if (dflag)
+		(void)daemon(1, 1);
+
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = sighandler;
 	sigaction(SIGINT,  &act, 0);
@@ -620,10 +641,9 @@ main(void)
 
 	dpy = XOpenDisplay(NULL);
 
-	XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
-
 	while (!done) {
 		status_string[0] = '\0';
+
 		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
 			argument = args[i];
 			if (argument.args == NULL)
@@ -639,8 +659,12 @@ main(void)
 			free(res);
 			free(element);
 		}
-		XStoreName(dpy, DefaultRootWindow(dpy), status_string);
-		XSync(dpy, False);
+
+		if (!oflag)
+			set_status(status_string);
+		else
+			printf("%s\n", status_string);
+
 		/*
 		 * subtract delay time spend in function
 		 * calls from the actual global delay time
@@ -649,8 +673,8 @@ main(void)
 		delay = 0;
 	}
 
-	XStoreName(dpy, DefaultRootWindow(dpy), status_old);
-	XSync(dpy, False);
+	if (!oflag)
+		set_status(NULL);
 
 	XCloseDisplay(dpy);