Use busybox's show_usage function for help

This commit is contained in:
Glenn L McGrath 2002-09-15 17:20:45 +00:00
parent 7a32aaacd0
commit 6714862bdd
2 changed files with 4 additions and 16 deletions

View File

@ -1916,6 +1916,7 @@
#define udhcpc_trivial_usage \ #define udhcpc_trivial_usage \
"[-fqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p file] [-r IP] [-s script]" "[-fqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p file] [-r IP] [-s script]"
#define udhcpc_full_usage \ #define udhcpc_full_usage \
"\tUsage: udhcpcd [OPTIONS]\n" \
"\t-c,\t--clientid=CLIENTID\tClient identifier\n" \ "\t-c,\t--clientid=CLIENTID\tClient identifier\n" \
"\t-H,\t--hostname=HOSTNAME\tClient hostname\n" \ "\t-H,\t--hostname=HOSTNAME\tClient hostname\n" \
"\t-f,\t--foreground\tDo not fork after getting lease\n" \ "\t-f,\t--foreground\tDo not fork after getting lease\n" \

View File

@ -1254,7 +1254,7 @@ int udhcpc_main(int argc, char *argv[])
while (1) { while (1) {
int option_index = 0; int option_index = 0;
c = getopt_long(argc, argv, "c:fH:hi:np:qr:s:v", l_options, c = getopt_long(argc, argv, "c:fH:i:np:qr:s:v", l_options,
&option_index); &option_index);
if (c == -1) { if (c == -1) {
break; break;
@ -1291,21 +1291,6 @@ int udhcpc_main(int argc, char *argv[])
client_config.hostname[OPT_LEN] = len; client_config.hostname[OPT_LEN] = len;
strncpy(client_config.hostname + 2, optarg, len); strncpy(client_config.hostname + 2, optarg, len);
break; break;
case 'h':
puts("Usage: udhcpcd [OPTIONS]\n\n"
" -c, --clientid=CLIENTID Client identifier\n"
" -H, --hostname=HOSTNAME Client hostname\n"
" -f, --foreground Do not fork after getting lease\n"
" -i, --interface=INTERFACE Interface to use (default: eth0)\n"
" -n, --now Exit with failure if lease cannot be\n"
" immediately negotiated.\n"
" -p, --pidfile=file Store process ID of daemon in file\n"
" -q, --quit Quit after obtaining lease\n"
" -r, --request=IP IP address to request (default: none)\n"
" -s, --script=file Run file at dhcp events (default:\n"
" " DEFAULT_SCRIPT ")\n"
" -v, --version Display version");
return 0;
case 'i': case 'i':
client_config.interface = optarg; client_config.interface = optarg;
break; break;
@ -1328,6 +1313,8 @@ int udhcpc_main(int argc, char *argv[])
printf("udhcpcd, version %s\n\n", VERSION); printf("udhcpcd, version %s\n\n", VERSION);
exit_client(0); exit_client(0);
break; break;
default:
show_usage();
} }
} }