convert to use slc; also add stash subcommand
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13970 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997-2002 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997-2004 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -483,58 +483,25 @@ doit(const char *filename, int merge)
|
||||
}
|
||||
|
||||
|
||||
static struct getargs args[] = {
|
||||
{ "help", 'h', arg_flag, NULL }
|
||||
};
|
||||
|
||||
static int num_args = sizeof(args) / sizeof(args[0]);
|
||||
|
||||
static void
|
||||
usage(const char *name)
|
||||
static int
|
||||
loadit(int merge, int argc, char **argv)
|
||||
{
|
||||
arg_printusage (args, num_args, name, "file");
|
||||
}
|
||||
|
||||
|
||||
|
||||
int
|
||||
load(int argc, char **argv)
|
||||
{
|
||||
int optind = 0;
|
||||
int help_flag = 0;
|
||||
|
||||
args[0].value = &help_flag;
|
||||
|
||||
if(getarg(args, num_args, argc, argv, &optind)) {
|
||||
usage ("load");
|
||||
return 0;
|
||||
if(argc != 1) {
|
||||
printf("%s file", merge ? "merge" : "load");
|
||||
return 0;
|
||||
}
|
||||
if(argc - optind != 1 || help_flag) {
|
||||
usage ("load");
|
||||
return 0;
|
||||
}
|
||||
|
||||
doit(argv[optind], 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
merge(int argc, char **argv)
|
||||
load(void *opt, int argc, char **argv)
|
||||
{
|
||||
int optind = 0;
|
||||
int help_flag = 0;
|
||||
|
||||
args[0].value = &help_flag;
|
||||
|
||||
if(getarg(args, num_args, argc, argv, &optind)) {
|
||||
usage ("merge");
|
||||
return 0;
|
||||
}
|
||||
if(argc - optind != 1 || help_flag) {
|
||||
usage ("merge");
|
||||
return 0;
|
||||
}
|
||||
|
||||
doit(argv[optind], 1);
|
||||
return 0;
|
||||
return loadit(0, argc, argv);
|
||||
}
|
||||
|
||||
int
|
||||
merge(void *opt, int argc, char **argv)
|
||||
{
|
||||
return loadit(1, argc, argv);
|
||||
}
|
||||
|
Reference in New Issue
Block a user