9f7b92a2e
Denis Vlasenko
2007-08-15
Subject
dhcpd: make -S and -f actually work
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/usage.h+1 -0
| @@ -3676,6 +3676,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when | |
| "[-fS] [configfile]" \ | |
| #define udhcpd_full_usage \ | |
| + | "DHCP server" \ |
| "\n -f Stay in foreground" \ | |
| "\n -S Log to syslog too" | |
networking/udhcp/dhcpd.c+2 -1
| @@ -37,6 +37,7 @@ int udhcpd_main(int argc, char **argv) | |
| struct dhcpOfferedAddr *lease, static_lease; | |
| opt = getopt32(argc, argv, "fS"); | |
| + | argv += optind; |
| if (!(opt & 1)) { /* no -f */ | |
| bb_daemonize_or_rexec(0, argv); | |
| @@ -50,7 +51,7 @@ int udhcpd_main(int argc, char **argv) | |
| /* Would rather not do read_config before daemonization - | |
| * otherwise NOMMU machines will parse config twice */ | |
| - | read_config(argv[1] ? argv[1] : DHCPD_CONF_FILE); |
| + | read_config(argv[0] ? argv[0] : DHCPD_CONF_FILE); |
| /* Make sure fd 0,1,2 are open */ | |
| bb_sanitize_stdio(); | |