[hackers] [slock] No need for usage() || FRIGN

From: <git_AT_suckless.org>
Date: Sun, 14 Feb 2016 02:00:28 +0100 (CET)

commit a6dc051e3744ce5b14c54d2d246d3e8258207e76
Author: FRIGN <dev_AT_frign.de>
AuthorDate: Sun Feb 14 01:48:48 2016 +0100
Commit: FRIGN <dev_AT_frign.de>
CommitDate: Sun Feb 14 02:00:14 2016 +0100

    No need for usage()
    There are 2 arguments why -v and -h are broken:
            1) if you are running off git, -v will show the last stable
               release, effectively making this option useless.
               people running stable versions leave open an attack surface
               this way in case there are vulnerabilities found.
               99% of the people are also using package managers to keep
               their software up to date, instead of running $TOOL -v to
               check how old it is.
            2) -h is a sad excuse for not just looking at the manual page
               (man 1 slock). Given we accept a post_lock_command, we can't
               be as liberal and just intercept certain flags.
    I changed the manpage to reflect this change.

diff --git a/slock.1 b/slock.1
index 1f946d9..467194d 100644
--- a/slock.1
+++ b/slock.1
_AT_@ -1,29 +1,19 @@
-slock \- simple X display locker
+slock \- simple X screen locker
 .B slock
-.RB [ \-v
-.IR post_lock_command ]
+.RB [
+.IR cmd
 .B slock
-is a screen locker for X. If provided, the
-.IR post_lock_command
-will be executed when the screen is locked.
-.B \-v
-prints version information to stdout, then exits.
+is an X screen locker. If provided,
+.IR cmd
+is executed after the screen has been locked.
 $ slock /usr/sbin/s2ram
 .B slock
 can be customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
-See the LICENSE file for the authors.
-See the LICENSE file for the terms of redistribution.
-Please report them.
diff --git a/slock.c b/slock.c
index 3188ff7..4531f95 100644
--- a/slock.c
+++ b/slock.c
_AT_@ -272,27 +272,15 @@ lockscreen(Display *dpy, int screen)
         return NULL;
-static void
- fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
- exit(1);
-main(int argc, char **argv) {
+main(int argc, char **argv)
 #ifndef HAVE_BSD_AUTH
         const char *pws;
         Display *dpy;
         int screen;
- if ((argc == 2) && !strcmp("-v", argv[1]))
- die("slock-%s, © 2006-2016 slock engineers\n", VERSION);
- if ((argc == 2) && !strcmp("-h", argv[1]))
- usage();
 #ifdef __linux__
Received on Sun Feb 14 2016 - 02:00:28 CET

This archive was generated by hypermail 2.3.0 : Sun Feb 14 2016 - 02:12:14 CET