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

actually use getarg

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11224 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2002-08-23 17:54:20 +00:00
parent c250b65131
commit 1759177e35
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
appl/afsutil/pagsh.c
View File

@@ -66,18 +66,20 @@ RCSID("$Id$");
static int help_flag;
static int version_flag;
static int c_flag;
struct getargs args[] = {
struct getargs getargs[] = {
{ NULL, 'c', arg_flag, &c_flag },
{ "version", 0, arg_flag, &version_flag },
{ "help", 'h', arg_flag, &help_flag },
};
static int num_args = sizeof(args) / sizeof(args[0]);
static int num_args = sizeof(getargs) / sizeof(getargs[0]);
static void
usage(int ecode)
{
arg_printusage(args, num_args, NULL, "[cell]... [path]...");
arg_printusage(getargs, num_args, NULL, "command [args...]");
exit(ecode);
}
@@ -95,6 +97,20 @@ main(int argc, char **argv)
char *path;
char **args;
int i;
int optind = 0;
set_progname(argv[0]);
if(getarg(getargs, num_args, argc, argv, &optind))
usage(1);
if(help_flag)
usage(0);
if(version_flag) {
print_version(NULL);
exit(0);
}
argc -= optind;
argv += optind;
#ifdef KRB5
snprintf (tf, sizeof(tf), "%sXXXXXX", KRB5_DEFAULT_CCROOT);
@@ -119,8 +135,6 @@ main(int argc, char **argv)
errx (1, "Out of memory allocating %lu bytes",
(unsigned long)((argc + 10)*sizeof(char *)));
argv++;
if(*argv == NULL) {
path = getenv("SHELL");
if(path == NULL){
@@ -128,7 +142,6 @@ main(int argc, char **argv)
path = strdup(pw->pw_shell);
}
} else {
if(strcmp(*argv, "-c") == 0) argv++;
path = strdup(*argv++);
}
if (path == NULL)