Remove d- and v-flags
d-flag: There's no need for that, use the &-operator or fork+exec in a
non-shell-context. In the latter case you get the PID for free.
v-flag: If you want to find out which version of a package is installed,
consult your package manager. That's his job.
Laslo Hunhold dev@frign.de
Thu, 10 Aug 2017 21:56:06 +0200
3 files changed,
4 insertions(+),
24 deletions(-)
M
config.mk
→
config.mk
@@ -11,7 +11,7 @@ X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib # flags -CPPFLAGS = -I$(X11INC) -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE +CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused -Os LDFLAGS = -L$(X11LIB) -s LDLIBS = -lX11
M
slstatus.1
→
slstatus.1
@@ -6,14 +6,7 @@ .Nm slstatus
.Nd suckless status monitor .Sh SYNOPSIS .Nm -.Oo -.Op Fl v -| -.Oo -.Op Fl d .Op Fl o | n -.Oc -.Oc .Sh DESCRIPTION .Nm is a suckless status monitor for window managers that use WM_NAME (e.g. dwm) or@@ -23,14 +16,10 @@ .Nm
outputs to WM_NAME. .Sh OPTIONS .Bl -tag -width Ds -.It Fl d -Daemonize. .It Fl n Write to stdout once and exit. .It Fl o Write to stdout continuously. -.It Fl v -Write version information to stdout and exit. .El .Sh CUSTOMIZATION .Nm
M
slstatus.c
→
slstatus.c
@@ -75,7 +75,7 @@
char *argv0; static unsigned short int delay = 0; static unsigned short int done; -static unsigned short int dflag, oflag, nflag; +static unsigned short int oflag, nflag; static Display *dpy; #include "config.h"@@ -840,7 +840,7 @@
static void usage(void) { - fprintf(stderr, "usage: %s [-d] [-o] [-n] [-v] [-h]\n", argv0); + fprintf(stderr, "usage: %s [-o | -n]\n", argv0); exit(1); }@@ -855,27 +855,18 @@ struct sigaction act;
size_t len; ARGBEGIN { - case 'd': - dflag = 1; - break; case 'o': oflag = 1; break; case 'n': nflag = 1; break; - case 'v': - printf("slstatus-"VERSION"\n"); - return 0; default: usage(); } ARGEND - if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) { + if (oflag && nflag) { usage(); - } - if (dflag && daemon(1, 1) < 0) { - err(1, "daemon"); } memset(&act, 0, sizeof(act));