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.

diff --git a/config.mk b/config.mk
index dad0684..f27a0a9 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -11,7 +11,7 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # flags
 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
 CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Wno-unused -Os
 LDFLAGS  = -L$(X11LIB) -s
 LDLIBS   = -lX11

diff --git a/slstatus.1 b/slstatus.1
index bc27271..d29f197 100644 (file)
--- a/slstatus.1
+++ b/slstatus.1
@@ -6,14 +6,7 @@
 .Nd suckless status monitor
 .Sh SYNOPSIS
 .Nm
 .Nd suckless status monitor
 .Sh SYNOPSIS
 .Nm

-.Oo
-.Op Fl v
-|
-.Oo
-.Op Fl d

 .Op Fl o | n
 .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
 .Sh DESCRIPTION
 .Nm
 is a suckless status monitor for window managers that use WM_NAME (e.g. dwm) or


@@ -23,14 +16,10 @@ By default,
 outputs to WM_NAME.
 .Sh OPTIONS
 .Bl -tag -width Ds
 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 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
 .El
 .Sh CUSTOMIZATION
 .Nm

diff --git a/slstatus.c b/slstatus.c
index 9a4831d..b31f21d 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -75,7 +75,7 @@ static void usage(void);
 char *argv0;
 static unsigned short int delay = 0;
 static unsigned short int done;
 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"
 static Display *dpy;
 
 #include "config.h"


@@ -840,7 +840,7 @@ sighandler(const int signo)
 static void
 usage(void)
 {
 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);
 }
 
        exit(1);
 }
 


@@ -855,28 +855,19 @@ main(int argc, char *argv[])
        size_t len;
 
        ARGBEGIN {
        size_t len;
 
        ARGBEGIN {

-               case 'd':
-                       dflag = 1;
-                       break;

                case 'o':
                        oflag = 1;
                        break;
                case 'n':
                        nflag = 1;
                        break;
                case 'o':
                        oflag = 1;
                        break;
                case 'n':
                        nflag = 1;
                        break;

-               case 'v':
-                       printf("slstatus-"VERSION"\n");
-                       return 0;

                default:
                        usage();
        } ARGEND
 
                default:
                        usage();
        } ARGEND
 

-       if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) {
+       if (oflag && nflag) {

                usage();
        }
                usage();
        }

-       if (dflag && daemon(1, 1) < 0) {
-               err(1, "daemon");
-       }

 
        memset(&act, 0, sizeof(act));
        act.sa_handler = sighandler;
 
        memset(&act, 0, sizeof(act));
        act.sa_handler = sighandler;