oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

better help on unknown command

Browse Source
This commit is contained in:
Love Hornquist Astrand
2011-11-22 08:54:30 -08:00
parent 121ab46bb6
commit f2319c2458
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/gssapi/gsstool.c
View File

@@ -229,9 +229,10 @@ help(void *opt, int argc, char **argv)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int optidx = 0; int exit_status = 0, ret, optidx = 0;
setprogname(argv[0]); setprogname(argv[0]);
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx)) if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
usage(1); usage(1);
@@ -246,10 +247,18 @@ main(int argc, char **argv)
argc -= optidx; argc -= optidx;
argv += optidx; argv += optidx;
if (argc == 0) { if (argc != 0) {
help(NULL, argc, argv); ret = sl_command(commands, argc, argv);
return 1; if(ret == -1)
warnx("unrecognized command: %s", argv[0]);
else if (ret == -2)
ret = 0;
if(ret != 0)
exit_status = 1;
} else {
sl_slc_help(commands, argc, argv);
exit_status = 1;
} }
return sl_command (commands, argc, argv); return exit_status;
} }