Revert "No need for usage()"

This reverts most of commit a6dc051e37 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"
This commit is contained in:
Markus Teich 2016-02-15 14:15:45 +01:00
parent ec46680fe1
commit 65b8d52788
2 changed files with 28 additions and 5 deletions

16
slock.1
View file

@ -3,17 +3,27 @@
slock \- simple X screen locker slock \- simple X screen locker
.SH SYNOPSIS .SH SYNOPSIS
.B slock .B slock
.RB [ .RB [ \-v
.IR cmd |
] .IR cmd ]
.SH DESCRIPTION .SH DESCRIPTION
.B slock .B slock
is an X screen locker. If provided, is an X screen locker. If provided,
.IR cmd .IR cmd
is executed after the screen has been locked. is executed after the screen has been locked.
.SH OPTIONS
.TP
.B \-v
prints version information to stdout, then exits.
.SH EXAMPLES .SH EXAMPLES
$ slock /usr/sbin/s2ram $ slock /usr/sbin/s2ram
.SH CUSTOMIZATION .SH CUSTOMIZATION
.B slock .B slock
can be customized by creating a custom config.h and (re)compiling the source can be customized by creating a custom config.h and (re)compiling the source
code. This keeps it fast, secure and simple. code. This keeps it fast, secure and simple.
.SH AUTHORS
See the LICENSE file for the authors.
.SH LICENSE
See the LICENSE file for the terms of redistribution.
.SH BUGS
Please report them.

17
slock.c
View file

@ -273,15 +273,28 @@ lockscreen(Display *dpy, int screen)
return NULL; return NULL;
} }
int static void
main(int argc, char **argv) usage(void)
{ {
fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
exit(1);
}
int
main(int argc, char **argv) {
#ifndef HAVE_BSD_AUTH #ifndef HAVE_BSD_AUTH
const char *pws; const char *pws;
#endif #endif
Display *dpy; Display *dpy;
int screen; 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__ #ifdef __linux__
dontkillme(); dontkillme();
#endif #endif