From d8cf793135eac928e653eb5178894a611aa27837 Mon Sep 17 00:00:00 2001
From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Tue, 3 Oct 2006 21:00:43 +0000
Subject: bb_applet_name -> applet_name
git-svn-id: svn://busybox.net/trunk/busybox@16306 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
init/halt.c | 2 +-
init/init.c | 4 ++--
init/init_shared.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'init')
diff --git a/init/halt.c b/init/halt.c
index d796a4aea..2ac210e59 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -31,7 +31,7 @@ RB_AUTOBOOT
int which, flags, rc = 1;
/* Figure out which applet we're running */
- for(which=0;delay[which]!=*bb_applet_name;which++);
+ for(which=0;delay[which]!=*applet_name;which++);
/* Parse and handle arguments */
flags = getopt32(argc, argv, "d:nf", &delay);
diff --git a/init/init.c b/init/init.c
index d7d14a2d5..8257b7fb0 100644
--- a/init/init.c
+++ b/init/init.c
@@ -195,7 +195,7 @@ static void message(int device, const char *fmt, ...)
/* Log the message to syslogd */
if (device & LOG) {
/* don`t out "\r\n" */
- openlog(bb_applet_name, 0, LOG_DAEMON);
+ openlog(applet_name, 0, LOG_DAEMON);
syslog(LOG_INFO, "%s", msg + 1);
closelog();
}
@@ -982,7 +982,7 @@ int init_main(int argc, char **argv)
#if !ENABLE_DEBUG_INIT
/* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
if (getpid() != 1 &&
- (!ENABLE_FEATURE_INITRD || !strstr(bb_applet_name, "linuxrc")))
+ (!ENABLE_FEATURE_INITRD || !strstr(applet_name, "linuxrc")))
{
bb_show_usage();
}
diff --git a/init/init_shared.c b/init/init_shared.c
index 5e46abf09..47480fc21 100644
--- a/init/init_shared.c
+++ b/init/init_shared.c
@@ -31,7 +31,7 @@ int bb_shutdown_system(unsigned long magic)
#endif
reboot(RB_ENABLE_CAD);
- openlog(bb_applet_name, 0, pri);
+ openlog(applet_name, 0, pri);
message = "\nThe system is going down NOW !!";
syslog(pri, "%s", message);
--
cgit v1.2.3-55-g6feb