X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/fa8b939990ed0648f99b0cbeba4efed807160db3..c59b64e643386f42f4329d77d25070be264245da:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index b3abafb..e6aa90b 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -36,13 +36,13 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
 {
 	res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
 	res->tv_nsec = a->tv_nsec - b->tv_nsec +
-	               (a->tv_nsec < b->tv_nsec) * 1000000000;
+	               (a->tv_nsec < b->tv_nsec) * 1E9;
 }
 
 static void
 usage(void)
 {
-	die("usage: %s [-so]", argv0);
+	die("usage: %s [-s]", argv0);
 }
 
 int
@@ -51,18 +51,15 @@ main(int argc, char *argv[])
 	struct sigaction act;
 	struct timespec start, current, diff, intspec, wait;
 	size_t i, len;
-	int sflag, oflag, ret;
+	int sflag, ret;
 	char status[MAXLEN];
 	const char *res;
 
-	sflag = oflag = 0;
+	sflag = 0;
 	ARGBEGIN {
 		case 's':
 			sflag = 1;
 			break;
-		case 'o':
-			oflag = 1;
-			break;
 		default:
 			usage();
 	} ARGEND
@@ -76,10 +73,6 @@ main(int argc, char *argv[])
 	sigaction(SIGINT,  &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	if (sflag) {
-		setbuf(stdout, NULL);
-	}
-
 	if (!sflag && !(dpy = XOpenDisplay(NULL))) {
 		die("XOpenDisplay: Failed to open display");
 	}
@@ -102,7 +95,10 @@ main(int argc, char *argv[])
 		}
 
 		if (sflag) {
-			printf("%s\n", status);
+			puts(status);
+			fflush(stdout);
+			if (ferror(stdout))
+				die("puts:");
 		} else {
 			if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0) {
 				die("XStoreName: Allocation failed");
@@ -110,10 +106,6 @@ main(int argc, char *argv[])
 			XFlush(dpy);
 		}
 
-		if (oflag) {
-			done = 1;
-		}
-
 		if (!done) {
 			if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
 				die("clock_gettime:");
@@ -121,7 +113,7 @@ main(int argc, char *argv[])
 			difftimespec(&diff, &current, &start);
 
 			intspec.tv_sec = interval / 1000;
-			intspec.tv_nsec = (interval % 1000) * 1000000;
+			intspec.tv_nsec = (interval % 1000) * 1E6;
 			difftimespec(&wait, &intspec, &diff);
 
 			if (wait.tv_sec >= 0) {