diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /patches/udhcpd_foreground.diff | |
parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) | |
download | busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2 busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'patches/udhcpd_foreground.diff')
-rw-r--r-- | patches/udhcpd_foreground.diff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/udhcpd_foreground.diff b/patches/udhcpd_foreground.diff index 9f1e3b913..3b8c7eb0c 100644 --- a/patches/udhcpd_foreground.diff +++ b/patches/udhcpd_foreground.diff | |||
@@ -10,24 +10,24 @@ diff -u -r1.5 dhcpd.c | |||
10 | int max_sock; | 10 | int max_sock; |
11 | unsigned long num_ips; | 11 | unsigned long num_ips; |
12 | + int daemonize = 1; | 12 | + int daemonize = 1; |
13 | + | 13 | + |
14 | + while (strcmp(argv[1],"-f")==0 || strcmp(argv[1],"--foreground")==0) { | 14 | + while (strcmp(argv[1],"-f")==0 || strcmp(argv[1],"--foreground")==0) { |
15 | + daemonize = 0; | 15 | + daemonize = 0; |
16 | + argv++; | 16 | + argv++; |
17 | + argc--; | 17 | + argc--; |
18 | + } | 18 | + } |
19 | 19 | ||
20 | memset(&server_config, 0, sizeof(struct server_config_t)); | 20 | memset(&server_config, 0, sizeof(struct server_config_t)); |
21 | read_config(argc < 2 ? DHCPD_CONF_FILE : argv[1]); | 21 | read_config(argc < 2 ? DHCPD_CONF_FILE : argv[1]); |
22 | @@ -99,9 +106,8 @@ | 22 | @@ -99,9 +106,8 @@ |
23 | &server_config.server, server_config.arp) < 0) | 23 | &server_config.server, server_config.arp) < 0) |
24 | return 1; | 24 | return 1; |
25 | 25 | ||
26 | -#ifndef UDHCP_DEBUG | 26 | -#ifndef UDHCP_DEBUG |
27 | - background(server_config.pidfile); /* hold lock during fork. */ | 27 | - background(server_config.pidfile); /* hold lock during fork. */ |
28 | -#endif | 28 | -#endif |
29 | + if(daemonize) | 29 | + if(daemonize) |
30 | + background(server_config.pidfile); /* hold lock during fork. */ | 30 | + background(server_config.pidfile); /* hold lock during fork. */ |
31 | 31 | ||
32 | /* Setup the signal pipe */ | 32 | /* Setup the signal pipe */ |
33 | udhcp_sp_setup(); | 33 | udhcp_sp_setup(); |