`-s' is now default.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1029 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-11-17 16:18:47 +00:00
parent 3b62a43ec6
commit 7f970e5a27

View File

@@ -46,7 +46,7 @@ static void
usage (void) usage (void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: %s [-r] [-s] [-f alg] num seed\n", "Usage: %s [-r] [-f alg] num seed\n",
prog); prog);
exit (1); exit (1);
} }
@@ -169,7 +169,6 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int c; int c;
int setp = 0;
int renewp = 0; int renewp = 0;
OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT); OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT);
@@ -180,9 +179,6 @@ main (int argc, char **argv)
case 'r' : case 'r' :
renewp = 1; renewp = 1;
break; break;
case 's' :
setp = 1;
break;
case 'f' : case 'f' :
alg = otp_find_alg (optarg); alg = otp_find_alg (optarg);
if (alg == NULL) { if (alg == NULL) {
@@ -194,20 +190,11 @@ main (int argc, char **argv)
usage (); usage ();
break; break;
} }
if (setp && renewp) {
fprintf (stderr, "%s: `-r' and `-s' incompatible\n", prog);
return 1;
}
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (setp) if (renewp)
return set (argc, argv, alg);
else if (renewp)
return renew (argc, argv, alg); return renew (argc, argv, alg);
else { else
fprintf (stderr, "%s: Nothing to do\n", prog); return set (argc, argv, alg);
return 1;
}
} }