From a6dc051e3744ce5b14c54d2d246d3e8258207e76 Mon Sep 17 00:00:00 2001 From: FRIGN Date: Sun, 14 Feb 2016 01:48:48 +0100 Subject: 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. --- slock.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'slock.c') diff --git a/slock.c b/slock.c index 3188ff7..4531f95 100644 --- a/slock.c +++ b/slock.c @@ -272,27 +272,15 @@ lockscreen(Display *dpy, int screen) return NULL; } -static void -usage(void) -{ - fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n"); - exit(1); -} - int -main(int argc, char **argv) { +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("slock-%s, © 2006-2016 slock engineers\n", VERSION); - - if ((argc == 2) && !strcmp("-h", argv[1])) - usage(); - #ifdef __linux__ dontkillme(); #endif -- cgit v1.2.3-70-g09d2