ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'shadow-man' of https://github.com/andhe/util-linux 

* 'shadow-man' of https://github.com/andhe/util-linux:
  chsh: use -h as shorthand for --help instead of -u
  man: chsh(1): add login.defs to SEE ALSO
  man: chfn(1): add chsh and login.defs to SEE ALSO
This commit is contained in:
Karel Zak 2017-01-20 13:12:57 +01:00
parent 9ea8ded37b 631a195412
commit 344d861d83
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
login-utils/chfn.1
View File

@ -97,7 +97,9 @@ This is the default.
.SH "EXIT STATUS"
Returns 0 if operation was successful, 1 if operation failed or command syntax was not valid.
.SH "SEE ALSO"
.BR chsh(1),
.BR finger (1),
.BR login.defs(5),
.BR passwd (5)
.SH AUTHOR
Salvatore Valente <svalente@mit.edu>

5
login-utils/chsh.1
View File

@ -14,7 +14,7 @@ chsh \- change your login shell
.RB [ \-s
.IR shell ]
.RB [ \-l ]
.RB [ \-u ]
.RB [ \-h ]
.RB [ \-v ]
.RI [ username ]
.SH DESCRIPTION
@ -38,7 +38,7 @@ Print the list of shells listed in
.I /etc/shells
and exit.
.TP
.BR \-u , " \-\-help"
.BR \-h , " \-\-help"
Display help text and exit.
.TP
.BR \-v , " \-\-version"
@ -55,6 +55,7 @@ only accept shells listed in this file, unless you are root.
Returns 0 if operation was successful, 1 if operation failed or command syntax was not valid.
.SH "SEE ALSO"
.BR login (1),
.BR login.defs(5),
.BR passwd (5),
.BR shells (5)
.SH AUTHOR

7
login-utils/chsh.c
View File

@ -131,18 +131,19 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
static const struct option long_options[] = {
{"shell", required_argument, 0, 's'},
{"list-shells", no_argument, 0, 'l'},
{"help", no_argument, 0, 'u'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{NULL, no_argument, 0, '0'},
};
int c;
while ((c = getopt_long(argc, argv, "s:luv", long_options, NULL)) != -1) {
while ((c = getopt_long(argc, argv, "s:lhuv", long_options, NULL)) != -1) {
switch (c) {
case 'v':
printf(UTIL_LINUX_VERSION);
exit(EXIT_SUCCESS);
case 'u':
case 'u': /* deprecated */
case 'h':
usage(stdout);
case 'l':
get_shell_list(NULL);