From 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 3 Oct 2006 21:00:43 +0000 Subject: bb_applet_name -> applet_name --- networking/fakeidentd.c | 2 +- networking/ftpgetput.c | 4 ++-- networking/ifupdown.c | 2 +- networking/inetd.c | 2 +- networking/nameif.c | 2 +- networking/telnetd.c | 2 +- networking/traceroute.c | 2 +- networking/udhcp/common.c | 4 ++-- networking/zcip.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'networking') diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c index 6070e5f2d..c8d32765a 100644 --- a/networking/fakeidentd.c +++ b/networking/fakeidentd.c @@ -219,7 +219,7 @@ static int checkInput(char *buf, int len, int l) int fakeidentd_main(int argc, char **argv) { /* This applet is an inetd-style daemon */ - openlog(bb_applet_name, 0, LOG_DAEMON); + openlog(applet_name, 0, LOG_DAEMON); logmode = LOGMODE_SYSLOG; memset(conns, 0, sizeof(conns)); diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 25b7f1427..492854153 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -288,10 +288,10 @@ int ftpgetput_main(int argc, char **argv) int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = NULL; /* Check to see if the command is ftpget or ftput */ - if (ENABLE_FTPPUT && (!ENABLE_FTPGET || bb_applet_name[3] == 'p')) { + if (ENABLE_FTPPUT && (!ENABLE_FTPGET || applet_name[3] == 'p')) { ftp_action = ftp_send; } - if (ENABLE_FTPGET && (!ENABLE_FTPPUT || bb_applet_name[3] == 'g')) { + if (ENABLE_FTPGET && (!ENABLE_FTPPUT || applet_name[3] == 'g')) { ftp_action = ftp_receive; } diff --git a/networking/ifupdown.c b/networking/ifupdown.c index f34287580..6334cbc43 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1080,7 +1080,7 @@ int ifupdown_main(int argc, char **argv) int any_failures = 0; int i; - if (bb_applet_name[2] == 'u') { + if (applet_name[2] == 'u') { /* ifup command */ cmds = iface_up; } else { diff --git a/networking/inetd.c b/networking/inetd.c index 350f91dc4..e22115a5c 100644 --- a/networking/inetd.c +++ b/networking/inetd.c @@ -1251,7 +1251,7 @@ inetd_main(int argc, char *argv[]) LastArg = envp[-1] + strlen(envp[-1]); #endif - openlog(bb_applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON); + openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON); opt = getopt32(argc, argv, "R:f", &stoomany); if(opt & 1) { diff --git a/networking/nameif.c b/networking/nameif.c index 146eccea9..f60a97e8b 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -66,7 +66,7 @@ int nameif_main(int argc, char **argv) mactable_t *ch; if (1 & getopt32(argc, argv, "sc:", &fname)) { - openlog(bb_applet_name, 0, LOG_LOCAL0); + openlog(applet_name, 0, LOG_LOCAL0); logmode = LOGMODE_SYSLOG; } diff --git a/networking/telnetd.c b/networking/telnetd.c index 808d4be51..1c4dede39 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c @@ -384,7 +384,7 @@ telnetd_main(int argc, char **argv) * look into syslog for all errors, even early ones. * Direct all output to syslog at once. */ - openlog(bb_applet_name, 0, LOG_USER); + openlog(applet_name, 0, LOG_USER); logmode = LOGMODE_SYSLOG; opt = getopt32(argc, argv, "f:l:" USE_FEATURE_TELNETD_INETD("p:b:"), diff --git a/networking/traceroute.c b/networking/traceroute.c index 042cbe35a..4af523625 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -697,7 +697,7 @@ send_probe(int seq, int ttl, struct timeval *tp) if (cc < 0) bb_perror_msg_and_die("sendto"); printf("%s: wrote %s %d chars, ret=%d\n", - bb_applet_name, hostname, packlen, cc); + applet_name, hostname, packlen, cc); (void)fflush(stdout); } } diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index c34b3de26..ca0c79b95 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c @@ -82,9 +82,9 @@ void udhcp_start_log_and_pid(const char *pidfile) setlinebuf(stdout); if (ENABLE_FEATURE_UDHCP_SYSLOG) { - openlog(bb_applet_name, LOG_PID, LOG_LOCAL0); + openlog(applet_name, LOG_PID, LOG_LOCAL0); logmode |= LOGMODE_SYSLOG; } - bb_info_msg("%s (v%s) started", bb_applet_name, BB_VER); + bb_info_msg("%s (v%s) started", applet_name, BB_VER); } diff --git a/networking/zcip.c b/networking/zcip.c index d9c1adf19..6bd7f255b 100644 --- a/networking/zcip.c +++ b/networking/zcip.c @@ -222,7 +222,7 @@ int zcip_main(int argc, char *argv[]) if (!FOREGROUND) { /* Do it early, before all bb_xx_msg calls */ logmode = LOGMODE_SYSLOG; - openlog(bb_applet_name, 0, LOG_DAEMON); + openlog(applet_name, 0, LOG_DAEMON); } if (opts & 4) { // -r n.n.n.n if (inet_aton(r_opt, &ip) == 0 -- cgit v1.2.3