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

chfn: clean up exit status 

The old version in some cases (but not always) returns -1 (255) on
error. It seems better to cleanup the code and don't return internal
return codes by exit().

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-12-12 10:36:32 +01:00
parent 72c9217951
commit 97da60c64e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
login-utils/chfn.1
View File

@ -72,6 +72,8 @@ Print a usage message and exit.
.TP
.B "-v, \-\-version"
Print version information and exit.
.SH "EXIT STATUS"
Returns 0 if operation was successful, 1 if operation failed or command syntax was not valid.
.SH "SEE ALSO"
.BR finger (1),
.BR passwd (5)

11
login-utils/chfn.c
View File

@ -91,7 +91,6 @@ int main(int argc, char **argv)
uid_t uid;
struct finfo oldf, newf;
int interactive;
int status;
sanitize_env();
setlocale(LC_ALL, ""); /* both for messages and for iscntrl() below */
@ -196,8 +195,8 @@ int main(int argc, char **argv)
printf(_("Finger information not changed.\n"));
return EXIT_SUCCESS;
}
status = save_new_data(&oldf);
return status;
return save_new_data(&oldf) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
/*
@ -262,8 +261,8 @@ static int parse_argv(int argc, char *argv[], struct finfo *pinfo)
default:
usage(stderr);
}
if (status < 0)
exit(status);
if (status != 0)
exit(EXIT_FAILURE);
}
/* done parsing arguments. check for a username. */
if (optind < argc) {
@ -271,7 +270,7 @@ static int parse_argv(int argc, char *argv[], struct finfo *pinfo)
usage(stderr);
pinfo->username = argv[optind];
}
return (!info_given);
return !info_given;
}
/*