From 65b8d5278882310eed758e6fbfd6ab9676db883c Mon Sep 17 00:00:00 2001 From: Markus Teich Date: Mon, 15 Feb 2016 14:15:45 +0100 Subject: Revert "No need for usage()" This reverts most of commit a6dc051e3744ce5b14c54d2d246d3e8258207e76 and fixes some related stuff: - keep spelling fixes from original commit - make -h and -v also work when followed by more arguments - any unknown flag prints usage - fix output of -v to display "slock: version 1.3" instead of "slock: slock-1.3" --- slock.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'slock.c') diff --git a/slock.c b/slock.c index 2aa395e..c9cdee2 100644 --- a/slock.c +++ b/slock.c @@ -273,15 +273,28 @@ lockscreen(Display *dpy, int screen) return NULL; } -int -main(int argc, char **argv) +static void +usage(void) { + fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n"); + exit(1); +} + +int +main(int argc, char **argv) { #ifndef HAVE_BSD_AUTH const char *pws; #endif Display *dpy; int screen; + if ((argc >= 2) && !strcmp("-v", argv[1])) + die("version %s, © 2006-2016 slock engineers\n", VERSION); + + /* treat first argument starting with a '-' as option */ + if ((argc >= 2) && argv[1][0] == '-') + usage(); + #ifdef __linux__ dontkillme(); #endif -- cgit v1.2.1