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:
parent
ec46680fe1
commit
65b8d52788
2 changed files with 28 additions and 5 deletions
16
slock.1
16
slock.1
|
@ -3,17 +3,27 @@
|
|||
slock \- simple X screen locker
|
||||
.SH SYNOPSIS
|
||||
.B slock
|
||||
.RB [
|
||||
.IR cmd
|
||||
]
|
||||
.RB [ \-v
|
||||
|
|
||||
.IR cmd ]
|
||||
.SH DESCRIPTION
|
||||
.B slock
|
||||
is an X screen locker. If provided,
|
||||
.IR cmd
|
||||
is executed after the screen has been locked.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-v
|
||||
prints version information to stdout, then exits.
|
||||
.SH EXAMPLES
|
||||
$ slock /usr/sbin/s2ram
|
||||
.SH CUSTOMIZATION
|
||||
.B slock
|
||||
can be customized by creating a custom config.h and (re)compiling the source
|
||||
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
17
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
|
||||
|
|
Loading…
Reference in a new issue