Also, somewhat sneakily, move the internal names for these options out
of the way of my future plans.
The affected options are `-N' (`--no-per-user-config'), `-u' (`--user')
and `-p' (`--password'). As far as I can make out, `--user' and
`--password' are only intended to be used during testing, and only the
long forms are given; and `--no-per-user-config' isn't actually used at
all.
{ "local", no_argument, 0, 'l' },
{ "no-per-user-config", no_argument, 0, 'N' },
{ "help-commands", no_argument, 0, 'H' },
{ "local", no_argument, 0, 'l' },
{ "no-per-user-config", no_argument, 0, 'N' },
{ "help-commands", no_argument, 0, 'H' },
- { "user", required_argument, 0, 'u' },
- { "password", required_argument, 0, 'p' },
+ { "user", required_argument, 0, 'U' },
+ { "password", required_argument, 0, 'P' },
regexp_setup();
if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
regexp_setup();
if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "+hVc:dHl", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'H': help_commands();
switch(n) {
case 'h': help();
case 'H': help_commands();
case 'd': debugging = 1; break;
case 'l': local = 1; break;
case 'N': config_per_user = 0; break;
case 'd': debugging = 1; break;
case 'l': local = 1; break;
case 'N': config_per_user = 0; break;
- case 'u': user = optarg; break;
- case 'p': password = optarg; break;
+ case 'U': user = optarg; break;
+ case 'P': password = optarg; break;
default: disorder_fatal(0, "invalid option");
}
}
default: disorder_fatal(0, "invalid option");
}
}