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

Catch --help, reported by David Love.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21731 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-07-30 20:01:26 +00:00
parent 4ace3ff42a
commit 15ea035aef
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
appl/telnet/telnet/main.c
View File

@@ -59,8 +59,8 @@ tninit(void)
init_sys(); init_sys();
} }
void static void
usage(void) usage(int exit_code)
{ {
fprintf(stderr, "Usage: %s %s%s%s%s\n", prompt, fprintf(stderr, "Usage: %s %s%s%s%s\n", prompt,
#ifdef AUTHENTICATION #ifdef AUTHENTICATION
@@ -77,7 +77,7 @@ usage(void)
"[host-name [port]]" "[host-name [port]]"
#endif #endif
); );
exit(1); exit(exit_code);
} }
/* /*
@@ -194,6 +194,9 @@ main(int argc, char **argv)
print_version(NULL); print_version(NULL);
exit(0); exit(0);
} }
if (argc == 2 && strcmp(argv[1], "--help") == 0)
usage(0);
while((ch = getopt(argc, argv, while((ch = getopt(argc, argv,
"78DEKLS:X:abcde:fFk:l:n:rxG")) != -1) { "78DEKLS:X:abcde:fFk:l:n:rxG")) != -1) {
@@ -267,7 +270,7 @@ main(int argc, char **argv)
fprintf(stderr, fprintf(stderr,
"%s: Only one of -f, -F and -G allowed.\n", "%s: Only one of -f, -F and -G allowed.\n",
prompt); prompt);
usage(); usage(1);
} }
forward_option = ch; forward_option = ch;
#else #else
@@ -316,7 +319,7 @@ main(int argc, char **argv)
case '?': case '?':
default: default:
usage(); usage(1);
/* NOTREACHED */ /* NOTREACHED */
} }
} }
@@ -342,7 +345,7 @@ main(int argc, char **argv)
char *args[7], **argp = args; char *args[7], **argp = args;
if (argc > 2) if (argc > 2)
usage(); usage(1);
*argp++ = prompt; *argp++ = prompt;
if (user) { if (user) {
*argp++ = "-l"; *argp++ = "-l";