bb_applet_name -> applet_name

This commit is contained in:
Denis Vlasenko
2006-10-03 21:00:43 +00:00
parent 67b23e6043
commit 8f8f268cfd
45 changed files with 71 additions and 69 deletions

View File

@@ -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));

View File

@@ -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;
}

View File

@@ -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 {

View File

@@ -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) {

View File

@@ -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;
}

View File

@@ -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:"),

View File

@@ -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);
}
}

View File

@@ -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);
}

View File

@@ -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