My first bout of untangling udhcp. Make lots of gratuitous #defines go
away, substitutie BB_VER for an external VERSION, use busybox CONFIG symbols
rather than checking for them then defining others, etc. Lots more cleanup
to do...
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 589214b..2c902fc 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -50,7 +50,7 @@
}
-void background(const char *pidfile)
+void udhcp_background(const char *pidfile)
{
#ifdef __uClinux__
LOG(LOG_ERR, "Cannot background in uclinux (yet)");
@@ -69,7 +69,7 @@
}
-#ifdef UDHCP_SYSLOG
+#ifdef CONFIG_FEATURE_UDHCP_SYSLOG
void udhcp_logging(int level, const char *fmt, ...)
{
@@ -115,7 +115,7 @@
#endif
-void start_log_and_pid(const char *client_server, const char *pidfile)
+void udhcp_start_log_and_pid(const char *client_server, const char *pidfile)
{
int pid_fd;
@@ -129,9 +129,8 @@
/* equivelent of doing a fflush after every \n */
setlinebuf(stdout);
-#ifdef UDHCP_SYSLOG
- openlog(client_server, LOG_PID | LOG_CONS, LOG_LOCAL0);
-#endif
+ if (ENABLE_FEATURE_UDHCP_SYSLOG)
+ openlog(client_server, LOG_PID | LOG_CONS, LOG_LOCAL0);
- udhcp_logging(LOG_INFO, "%s (v%s) started", client_server, VERSION);
+ udhcp_logging(LOG_INFO, "%s (v%s) started", client_server, BB_VER);
}