X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fdevfsd.c;h=cd94869ae63f888b86ccb5690cfb4c5a21acbafb;hb=bfc3d82256c45fb1e6e04ca85fac8a65b34b72a1;hp=dfb616abe99b3683202ce6bc2900fe0c648acb8e;hpb=c965f4b14194ade82c9f30807fa948d6545e55d6;p=oweals%2Fbusybox.git

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index dfb616abe..cd94869ae 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -234,27 +234,21 @@ static char get_old_ide_name(unsigned , unsigned);
 static char *write_old_sd_name(char *, unsigned, unsigned, const char *);
 
 /* busybox functions */
-static void msg_logger(int pri, const char * fmt, ...)__attribute__((format(printf, 2, 3)));
-static void msg_logger_and_die(int pri, const char * fmt, ...)__attribute__((noreturn, format(printf, 2, 3)));
-static void do_ioctl_and_die(int fd, int request, unsigned long event_mask_flag);
-static void fork_and_execute(int die, char *arg0, char **arg);
-static int get_uid_gid(int, const char *);
+static int get_uid_gid(int flag, const char *string);
 static void safe_memcpy(char * dest, const char * src, int len);
-static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, char *ptr);
-static unsigned int scan_dev_name(const char *d, unsigned int n, char *ptr);
+static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, const char *ptr);
+static unsigned int scan_dev_name(const char *d, unsigned int n, const char *ptr);
 
 /* Structs and vars */
 static struct config_entry_struct *first_config = NULL;
 static struct config_entry_struct *last_config = NULL;
-static const char *mount_point = NULL;
+static char *mount_point = NULL;
 static volatile int caught_signal = FALSE;
 static volatile int caught_sighup = FALSE;
-static struct initial_symlink_struct
-{
+static struct initial_symlink_struct {
 	const char *dest;
 	const char *name;
-} initial_symlinks[] =
-{
+} initial_symlinks[] = {
 	{"/proc/self/fd", "fd"},
 	{"fd/0", "stdin"},
 	{"fd/1", "stdout"},
@@ -262,12 +256,10 @@ static struct initial_symlink_struct
 	{NULL, NULL},
 };
 
-static struct event_type
-{
+static struct event_type {
 	unsigned int type;        /*  The DEVFSD_NOTIFY_* value                  */
 	const char *config_name;  /*  The name used in the config file           */
-} event_types[] =
-{
+} event_types[] = {
 	{DEVFSD_NOTIFY_REGISTERED,   "REGISTER"},
 	{DEVFSD_NOTIFY_UNREGISTERED, "UNREGISTER"},
 	{DEVFSD_NOTIFY_ASYNC_OPEN,   "ASYNC_OPEN"},
@@ -281,95 +273,33 @@ static struct event_type
 
 /* Busybox messages */
 
-static const char * const bb_msg_proto_rev			= "protocol revision";
-static const char * const bb_msg_bad_config		= "bad %s config file: %s";
-static const char * const bb_msg_small_buffer		= "buffer too small";
-static const char * const bb_msg_variable_not_found = "variable: %s not found";
-
-/* Busybox functions  */
-static void msg_logger(int pri, const char * fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = access("/dev/log", F_OK);
-	if (ret == 0) {
-		openlog(applet_name, 0, LOG_DAEMON);
-		vsyslog(pri , fmt, ap);
-		/* Man: A trailing newline is added when needed. */
-		closelog();
-	}
-	/* ENABLE_DEVFSD_VERBOSE is always enabled if msg_logger is used */
-	if ((ENABLE_DEVFSD_VERBOSE && ret) || ENABLE_DEBUG) {
-		bb_error_msg(fmt, ap);
-	}
-	va_end(ap);
-}
-
-static void msg_logger_and_die(int pri, const char* fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	msg_logger(pri, fmt, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
+static const char bb_msg_proto_rev[] ALIGN1          = "protocol revision";
+static const char bb_msg_bad_config[] ALIGN1         = "bad %s config file: %s";
+static const char bb_msg_small_buffer[] ALIGN1       = "buffer too small";
+static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
 
 /* Busybox stuff */
-#if defined(CONFIG_DEVFSD_VERBOSE) || defined(CONFIG_DEBUG)
-#define devfsd_error_msg(fmt, args...)                bb_error_msg(fmt, ## args)
-#define devfsd_perror_msg_and_die(fmt, args...)       bb_perror_msg_and_die(fmt, ## args)
-#define devfsd_error_msg_and_die(fmt, args...)        bb_error_msg_and_die(fmt, ## args)
+#if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
+#define info_logger(p, fmt, args...)                 bb_info_msg(fmt, ## args)
+#define msg_logger(p, fmt, args...)                  bb_error_msg(fmt, ## args)
+#define msg_logger_and_die(p, fmt, args...)          bb_error_msg_and_die(fmt, ## args)
+#define error_logger(p, fmt, args...)                bb_perror_msg(fmt, ## args)
+#define error_logger_and_die(p, fmt, args...)        bb_perror_msg_and_die(fmt, ## args)
 #else
+#define info_logger(p, fmt, args...)
 #define msg_logger(p, fmt, args...)
 #define msg_logger_and_die(p, fmt, args...)           exit(1)
-#define devfsd_perror_msg_and_die(fmt, args...)       exit(1)
-#define devfsd_error_msg_and_die(fmt, args...)        exit(1)
-#define devfsd_error_msg(fmt, args...)
+#define error_logger(p, fmt, args...)
+#define error_logger_and_die(p, fmt, args...)         exit(1)
 #endif
 
-static void do_ioctl_and_die(int fd, int request, unsigned long event_mask_flag)
-{
-	if (ioctl(fd, request, event_mask_flag) == -1)
-		msg_logger_and_die(LOG_ERR, "ioctl");
-}
-
-static void fork_and_execute(int die, char *arg0, char **arg)
-{
-	switch (fork()) {
-		case 0:
-			/*  Child  */
-			break;
-		case -1:
-			/*  Parent: Error  : die or return */
-			msg_logger(LOG_ERR,(char *)bb_msg_memory_exhausted);
-			if (die)
-				exit(EXIT_FAILURE);
-			return;
-		default:
-			/*  Parent : ok : return or exit  */
-			if (arg0 != NULL) {
-				wait(NULL);
-				return;
-			}
-			exit(EXIT_SUCCESS);
-	}
-	 /* Child : if arg0 != NULL do execvp */
-	if (arg0 != NULL) {
-		BB_EXECVP(arg0, arg);
-		msg_logger_and_die(LOG_ERR, "execvp");
-	}
-}
-
 static void safe_memcpy(char *dest, const char *src, int len)
 {
 	memcpy(dest , src, len);
 	dest[len] = '\0';
 }
 
-static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, char *ptr)
+static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, const char *ptr)
 {
 	if (d[n - 4] == 'd' && d[n - 3] == 'i' && d[n - 2] == 's' && d[n - 1] == 'c')
 		return 2 + addendum;
@@ -382,7 +312,7 @@ static unsigned int scan_dev_name_common(const char *d, unsigned int n, int adde
 	return 0;
 }
 
-static unsigned int scan_dev_name(const char *d, unsigned int n, char *ptr)
+static unsigned int scan_dev_name(const char *d, unsigned int n, const char *ptr)
 {
 	if (d[0] == 's' && d[1] == 'c' && d[2] == 's' && d[3] == 'i' && d[4] == '/') {
 		if (d[n - 7] == 'g' && d[n - 6] == 'e' && d[n - 5] == 'n'
@@ -406,7 +336,7 @@ static unsigned int scan_dev_name(const char *d, unsigned int n, char *ptr)
 
 /*  Public functions follow  */
 
-int devfsd_main(int argc, char **argv);
+int devfsd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int devfsd_main(int argc, char **argv)
 {
 	int print_version = FALSE;
@@ -424,50 +354,42 @@ int devfsd_main(int argc, char **argv)
 	for (count = 2; count < argc; ++count) {
 		if (argv[count][0] == '-') {
 			if (argv[count][1] == 'v' && !argv[count][2]) /* -v */
-					print_version = TRUE;
+				print_version = TRUE;
 			else if (ENABLE_DEVFSD_FG_NP && argv[count][1] == 'f'
-					&& argv[count][2] == 'g' && !argv[count][3]) /* -fg */
-					do_daemon = FALSE;
+			 && argv[count][2] == 'g' && !argv[count][3]) /* -fg */
+				do_daemon = FALSE;
 			else if (ENABLE_DEVFSD_FG_NP && argv[count][1] == 'n'
-					&& argv[count][2] == 'p' && !argv[count][3]) /* -np */
-					no_polling = TRUE;
+			 && argv[count][2] == 'p' && !argv[count][3]) /* -np */
+				no_polling = TRUE;
 			else
 				bb_show_usage();
 		}
 	}
 
-	/* strip last / from mount point, so we don't need to check for it later */
-	while (argv[1][1] != '\0' && argv[1][strlen(argv[1]) - 1] == '/')
-		argv[1][strlen(argv[1]) - 1] = '\0';
-
-	mount_point = argv[1];
+	mount_point = bb_simplify_path(argv[1]);
 
 	xchdir(mount_point);
 
 	fd = xopen(".devfsd", O_RDONLY);
-
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0)
-		devfsd_perror_msg_and_die("FD_CLOEXEC");
-
-	if (ioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev) == -1)
-		msg_logger_and_die(LOG_ERR, "ioctl");
+	close_on_exec_on(fd);
+	xioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev);
 
 	/*setup initial entries */
-    for (curr = initial_symlinks; curr->dest != NULL; ++curr)
+	for (curr = initial_symlinks; curr->dest != NULL; ++curr)
 		symlink(curr->dest, curr->name);
 
 	/* NB: The check for CONFIG_FILE is done in read_config_file() */
 
-	if (print_version ||(DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev)) {
+	if (print_version || (DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev)) {
 		printf("%s v%s\nDaemon %s:\t%d\nKernel-side %s:\t%d\n",
 				applet_name, DEVFSD_VERSION, bb_msg_proto_rev,
-				DEVFSD_PROTOCOL_REVISION_DAEMON,bb_msg_proto_rev, proto_rev);
+				DEVFSD_PROTOCOL_REVISION_DAEMON, bb_msg_proto_rev, proto_rev);
 		if (DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev)
 			bb_error_msg_and_die("%s mismatch!", bb_msg_proto_rev);
 		exit(EXIT_SUCCESS); /* -v */
 	}
 	/*  Tell kernel we are special(i.e. we get to see hidden entries)  */
-	do_ioctl_and_die(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
+	xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
 
 	sigemptyset(&new_action.sa_mask);
 	new_action.sa_flags = 0;
@@ -475,7 +397,7 @@ int devfsd_main(int argc, char **argv)
 	/*  Set up SIGHUP and SIGUSR1 handlers  */
 	new_action.sa_handler = signal_handler;
 	if (sigaction(SIGHUP, &new_action, NULL) != 0 || sigaction(SIGUSR1, &new_action, NULL) != 0)
-		devfsd_error_msg_and_die("sigaction");
+		bb_error_msg_and_die("sigaction");
 
 	printf("%s v%s  started for %s\n",applet_name, DEVFSD_VERSION, mount_point);
 
@@ -487,11 +409,19 @@ int devfsd_main(int argc, char **argv)
 
 	if (ENABLE_DEVFSD_FG_NP && no_polling)
 		exit(0);
+
+	if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG)
+		logmode = LOGMODE_BOTH;
+	else if (do_daemon == TRUE)
+		logmode = LOGMODE_SYSLOG;
+	/* This is the default */
+	/*else
+		logmode = LOGMODE_STDIO; */
+
 	if (do_daemon) {
 		/*  Release so that the child can grab it  */
-		do_ioctl_and_die(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0);
-		fork_and_execute(DIE, NULL, NULL);
-		setsid();        /*  Prevent hangups and become pgrp leader         */
+		xioctl(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0);
+		bb_daemonize_or_rexec(0, argv);
 	} else if (ENABLE_DEVFSD_FG_NP) {
 		setpgid(0, 0);  /*  Become process group leader                    */
 	}
@@ -504,6 +434,7 @@ int devfsd_main(int argc, char **argv)
 		if (do_scan)
 			dir_operation(SERVICE, mount_point, 0, NULL);
 	}
+	if (ENABLE_FEATURE_CLEAN_UP) free(mount_point);
 }   /*  End Function main  */
 
 
@@ -522,24 +453,23 @@ static void read_config_file(char *path, int optional, unsigned long *event_mask
 	FILE *fp;
 	char buf[STRING_LENGTH];
 	char *line = NULL;
+	char *p;
 
 	if (stat(path, &statbuf) == 0) {
 		/* Don't read 0 length files: ignored */
 		/*if (statbuf.st_size == 0)
 				return;*/
 		if (S_ISDIR(statbuf.st_mode)) {
-			/* strip last / from dirname so we don't need to check for it later */
-			while (path && path[1] != '\0' && path[strlen(path) - 1] == '/')
-				path[strlen(path) - 1] = '\0';
-
-			dir_operation(READ_CONFIG, path, 0, event_mask);
+			p = bb_simplify_path(path);
+			dir_operation(READ_CONFIG, p, 0, event_mask);
+			free(p);
 			return;
 		}
 		if ((fp = fopen(path, "r")) != NULL) {
 			while (fgets(buf, STRING_LENGTH, fp) != NULL) {
 				/*  Skip whitespace  */
-				for (line = buf; isspace(*line); ++line)
-					/*VOID*/;
+				line = buf;
+				line = skip_whitespace(line);
 				if (line[0] == '\0' || line[0] == '#')
 					continue;
 				process_config_line(line, event_mask);
@@ -550,8 +480,8 @@ static void read_config_file(char *path, int optional, unsigned long *event_mask
 		}
 	} else {
 read_config_file_err:
-	if (optional ==  0  && errno == ENOENT)
-		msg_logger_and_die(LOG_ERR, "read config file: %s: %m", path);
+		if (optional == 0 && errno == ENOENT)
+			error_logger_and_die(LOG_ERR, "read config file: %s", path);
 	}
 }   /*  End Function read_config_file   */
 
@@ -572,12 +502,11 @@ static void process_config_line(const char *line, unsigned long *event_mask)
 	int i;
 
 	/* !!!! Only Uppercase Keywords in devsfd.conf */
-	static const char *const options[] = {
-		"CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE",
-		"RESTORE", "PERMISSIONS", "MODLOAD", "EXECUTE",
-		"COPY", "IGNORE", "MKOLDCOMPAT", "MKNEWCOMPAT",
-		"RMOLDCOMPAT", "RMNEWCOMPAT", 0
-	};
+	static const char options[] ALIGN1 =
+		"CLEAR_CONFIG\0""INCLUDE\0""OPTIONAL_INCLUDE\0"
+		"RESTORE\0""PERMISSIONS\0""MODLOAD\0""EXECUTE\0"
+		"COPY\0""IGNORE\0""MKOLDCOMPAT\0""MKNEWCOMPAT\0"
+		"RMOLDCOMPAT\0""RMNEWCOMPAT\0";
 
 	for (count = 0; count < MAX_ARGS; ++count)
 		p[count][0] = '\0';
@@ -585,9 +514,9 @@ static void process_config_line(const char *line, unsigned long *event_mask)
 			when, name, what,
 			p[0], p[1], p[2], p[3], p[4], p[5], p[6]);
 
-	i = index_in_str_array(options, when);
+	i = index_in_strings(options, when);
 
-	/*"CLEAR_CONFIG"*/
+	/* "CLEAR_CONFIG" */
 	if (i == 0) {
 		free_config();
 		*event_mask = 0;
@@ -600,7 +529,7 @@ static void process_config_line(const char *line, unsigned long *event_mask)
 	/* "INCLUDE" & "OPTIONAL_INCLUDE" */
 	if (i == 1 || i == 2) {
 		st_expr_expand(name, STRING_LENGTH, name, get_variable, NULL);
-		msg_logger(LOG_INFO, "%sinclude: %s", (toupper(when[0]) == 'I') ? "": "optional_", name);
+		info_logger(LOG_INFO, "%sinclude: %s", (toupper(when[0]) == 'I') ? "": "optional_", name);
 		read_config_file(name, (toupper(when[0]) == 'I') ? FALSE : TRUE, event_mask);
 		return;
 	}
@@ -625,7 +554,7 @@ static void process_config_line(const char *line, unsigned long *event_mask)
 		goto process_config_line_err;
 	}
 
-	i = index_in_str_array(options, what);
+	i = index_in_strings(options, what);
 
 	switch (i) {
 		case 4:	/* "PERMISSIONS" */
@@ -699,7 +628,8 @@ static void process_config_line(const char *line, unsigned long *event_mask)
 		last_config->next = new;
 	last_config = new;
 	return;
-process_config_line_err:
+
+ process_config_line_err:
 	msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
 }  /*  End Function process_config_line   */
 
@@ -712,11 +642,9 @@ static int do_servicing(int fd, unsigned long event_mask)
 {
 	ssize_t bytes;
 	struct devfsd_notify_struct info;
-	unsigned long tmp_event_mask;
 
-	/*  Tell devfs what events we care about  */
-	tmp_event_mask = event_mask;
-	do_ioctl_and_die(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
+	/* (void*) cast is only in order to match prototype */
+	xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
 	while (!caught_signal) {
 		errno = 0;
 		bytes = read(fd,(char *) &info, sizeof info);
@@ -752,9 +680,9 @@ static void service_name(const struct devfsd_notify_struct *info)
 		msg_logger(LOG_ERR, "lost %u events", info->overrun_count);
 
 	/*  Discard lookups on "/dev/log" and "/dev/initctl"  */
-	if (info->type == DEVFSD_NOTIFY_LOOKUP 
+	if (info->type == DEVFSD_NOTIFY_LOOKUP
 		&& ((info->devname[0] == 'l' && info->devname[1] == 'o'
-		&& info->devname[2] == 'g' && !info->devname[3]) 
+		&& info->devname[2] == 'g' && !info->devname[3])
 		|| (info->devname[0] == 'i' && info->devname[1] == 'n'
 		&& info->devname[2] == 'i' && info->devname[3] == 't'
 		&& info->devname[4] == 'c' && info->devname[5] == 't'
@@ -764,7 +692,7 @@ static void service_name(const struct devfsd_notify_struct *info)
 
 	for (entry = first_config; entry != NULL; entry = entry->next) {
 		/*  First check if action matches the type, then check if name matches */
-		if (info->type != entry->action.when 
+		if (info->type != entry->action.when
 		|| regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0)
 			continue;
 		for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n)
@@ -809,11 +737,11 @@ static void action_permissions(const struct devfsd_notify_struct *info,
 {
 	struct stat statbuf;
 
-	if (stat(info->devname, &statbuf) != 0	||
-		 chmod(info->devname,(statbuf.st_mode & S_IFMT) |(entry->u.permissions.mode & ~S_IFMT)) != 0 ||
-		chown(info->devname, entry->u.permissions.uid, entry->u.permissions.gid) != 0
+	if (stat(info->devname, &statbuf) != 0
+	 || chmod(info->devname, (statbuf.st_mode & S_IFMT) | (entry->u.permissions.mode & ~S_IFMT)) != 0
+	 || chown(info->devname, entry->u.permissions.uid, entry->u.permissions.gid) != 0
 	)
-		msg_logger(LOG_ERR, "Can't chmod or chown: %s: %m", info->devname);
+		error_logger(LOG_ERR, "Can't chmod or chown: %s", info->devname);
 }   /*  End Function action_permissions  */
 
 static void action_modload(const struct devfsd_notify_struct *info,
@@ -826,14 +754,14 @@ static void action_modload(const struct devfsd_notify_struct *info,
 {
 	char *argv[6];
 
-	argv[0] =(char*)MODPROBE;
-	argv[1] =(char*)MODPROBE_SWITCH_1; /* "-k" */
-	argv[2] =(char*)MODPROBE_SWITCH_2; /* "-C" */
-	argv[3] =(char*)CONFIG_MODULES_DEVFS;
+	argv[0] = (char*)MODPROBE;
+	argv[1] = (char*)MODPROBE_SWITCH_1; /* "-k" */
+	argv[2] = (char*)MODPROBE_SWITCH_2; /* "-C" */
+	argv[3] = (char*)CONFIG_MODULES_DEVFS;
 	argv[4] = concat_path_file("/dev", info->devname); /* device */
 	argv[5] = NULL;
 
-	fork_and_execute(DIE, argv[0], argv);
+	wait4pid(xspawn(argv));
 	free(argv[4]);
 }  /*  End Function action_modload  */
 
@@ -865,7 +793,7 @@ static void action_execute(const struct devfsd_notify_struct *info,
 		argv[count] = largv[count];
 	}
 	argv[count] = NULL;
-	fork_and_execute(NO_DIE, argv[0], argv);
+	wait4pid(spawn(argv));
 }   /*  End Function action_execute  */
 
 
@@ -913,7 +841,7 @@ static void action_copy(const struct devfsd_notify_struct *info,
 		new_mode |= S_ISVTX;
 	ret = copy_inode(destination, &dest_stat, new_mode, source, &source_stat);
 	if (ENABLE_DEBUG && ret && (errno != EEXIST))
-		msg_logger(LOG_ERR, "copy_inode: %s to %s: %m", source, destination);
+		error_logger(LOG_ERR, "copy_inode: %s to %s", source, destination);
 }   /*  End Function action_copy  */
 
 static void action_compat(const struct devfsd_notify_struct *info, unsigned int action)
@@ -926,7 +854,7 @@ static void action_compat(const struct devfsd_notify_struct *info, unsigned int
 	int ret;
 	const char *compat_name = NULL;
 	const char *dest_name = info->devname;
-	char *ptr=NULL;
+	const char *ptr;
 	char compat_buf[STRING_LENGTH], dest_buf[STRING_LENGTH];
 	int mode, host, bus, target, lun;
 	unsigned int i;
@@ -954,7 +882,7 @@ static void action_compat(const struct devfsd_notify_struct *info, unsigned int
 			break;
 		case AC_MKNEWCOMPAT:
 		case AC_RMNEWCOMPAT:
-			ptr = strrchr(info->devname, '/') + 1;
+			ptr = bb_basename(info->devname);
 			i = scan_dev_name(info->devname, info->namelen, ptr);
 
 			/* nothing found */
@@ -1007,7 +935,7 @@ static void action_compat(const struct devfsd_notify_struct *info, unsigned int
 		case AC_RMNEWCOMPAT:
 			ret = unlink(compat_name);
 			if (ENABLE_DEBUG && ret)
-				msg_logger(LOG_ERR, "unlink: %s: %m", compat_name);
+				error_logger(LOG_ERR, "unlink: %s", compat_name);
 			break;
 		/*esac*/
 	} /* switch (action) */
@@ -1022,7 +950,7 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
 	dpath = concat_path_file(mount_point, spath + rootlen);
 	lstat(dpath, &dest_stat);
 	free(dpath);
-	if (S_ISLNK(source_stat.st_mode) ||(source_stat.st_mode & S_ISVTX))
+	if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
 		copy_inode(dpath, &dest_stat,(source_stat.st_mode & ~S_ISVTX) , spath, &source_stat);
 
 	if (S_ISDIR(source_stat.st_mode))
@@ -1198,32 +1126,35 @@ static void signal_handler(int sig)
 	if (sig == SIGHUP)
 		caught_sighup = TRUE;
 
-	msg_logger(LOG_INFO, "Caught signal %d", sig);
+	info_logger(LOG_INFO, "Caught signal %d", sig);
 }   /*  End Function signal_handler  */
 
 static const char *get_variable(const char *variable, void *info)
 {
+	static char sbuf[sizeof(int)*3 + 2]; /* sign and NUL */
+
+	char hostname[STRING_LENGTH];
 	struct get_variable_info *gv_info = info;
-	static char hostname[STRING_LENGTH], sbuf[STRING_LENGTH];
-	const char *field_names[] = { "hostname", "mntpt", "devpath", "devname",
-								   "uid", "gid", "mode", hostname, mount_point,
-								   gv_info->devpath, gv_info->devname, 0 };
+	const char *field_names[] = {
+			"hostname", "mntpt", "devpath", "devname",
+			"uid", "gid", "mode", hostname, mount_point,
+			gv_info->devpath, gv_info->devname, NULL
+	};
 	int i;
 
 	if (gethostname(hostname, STRING_LENGTH - 1) != 0)
-		msg_logger_and_die(LOG_ERR, "gethostname: %m");
-
 		/* Here on error we should do exit(RV_SYS_ERROR), instead we do exit(EXIT_FAILURE) */
-		hostname[STRING_LENGTH - 1] = '\0';
+		error_logger_and_die(LOG_ERR, "gethostname");
+
+	hostname[STRING_LENGTH - 1] = '\0';
 
 	/* index_in_str_array returns i>=0  */
 	i = index_in_str_array(field_names, variable);
 
 	if (i > 6 || i < 0 || (i > 1 && gv_info == NULL))
-			return NULL;
-	if (i >= 0 && i <= 3) {
+		return NULL;
+	if (i >= 0 && i <= 3)
 		return field_names[i + 7];
-	}
 
 	if (i == 4)
 		sprintf(sbuf, "%u", gv_info->info->uid);
@@ -1460,7 +1391,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
 */
 {
 	const char *compat_name = NULL;
-	char *ptr;
+	const char *ptr;
 	struct translate_struct *trans;
 	unsigned int i;
 	char mode;
@@ -1497,7 +1428,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
 		}
 	}
 
-	ptr = (strrchr(devname, '/') + 1);
+	ptr = bb_basename(devname);
 	i = scan_dev_name(devname, namelen, ptr);
 
 	if (i > 0 && i < 13)
@@ -1651,7 +1582,7 @@ int st_expr_expand(char *output, unsigned int length, const char *input,
 				if (isspace(ch) ||(ch == '/') ||(ch == '\0')) {
 					/* User's own home directory: leave separator for next time */
 					if ((env = getenv("HOME")) == NULL) {
-						msg_logger(LOG_INFO, bb_msg_variable_not_found, "HOME");
+						info_logger(LOG_INFO, bb_msg_variable_not_found, "HOME");
 						return FALSE;
 					}
 					len = strlen(env);
@@ -1663,14 +1594,14 @@ int st_expr_expand(char *output, unsigned int length, const char *input,
 				}
 				/*  Someone else's home directory  */
 				for (ptr = ++input; !isspace(ch) && (ch != '/') && (ch != '\0'); ch = *++ptr)
-					/* VOID */ ;
+					/* VOID */;
 				len = ptr - input;
 				if (len >= sizeof tmp)
 					goto st_expr_expand_out;
 				safe_memcpy(tmp, input, len);
 				input = ptr - 1;
 				if ((pwent = getpwnam(tmp)) == NULL) {
-					msg_logger(LOG_INFO, "no pwent for: %s", tmp);
+					info_logger(LOG_INFO, "no pwent for: %s", tmp);
 					return FALSE;
 				}
 				len = strlen(pwent->pw_dir);
@@ -1695,7 +1626,7 @@ int st_expr_expand(char *output, unsigned int length, const char *input,
 	}
 	return FALSE;
 st_expr_expand_out:
-	msg_logger(LOG_INFO, bb_msg_small_buffer);
+	info_logger(LOG_INFO, bb_msg_small_buffer);
 	return FALSE;
 }   /*  End Function st_expr_expand  */
 
@@ -1742,7 +1673,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
 	if (ch != '{') {
 		/*  Simple variable expansion  */
 		for (ptr = input; isalnum(ch) || (ch == '_') || (ch == ':'); ch = *++ptr)
-			/* VOID */ ;
+			/* VOID */;
 		len = ptr - input;
 		if ((size_t)len >= sizeof tmp)
 			goto expand_variable_out;
@@ -1750,7 +1681,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
 		safe_memcpy(tmp, input, len);
 		input = ptr - 1;
 		if ((env = get_variable_v2(tmp, func, info)) == NULL) {
-			msg_logger(LOG_INFO, bb_msg_variable_not_found, tmp);
+			info_logger(LOG_INFO, bb_msg_variable_not_found, tmp);
 			return NULL;
 		}
 		len = strlen(env);
@@ -1778,7 +1709,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
 		return input + len;
 	}
 	if (ch != ':' || ptr[1] != '-') {
-		msg_logger(LOG_INFO, "illegal char in var name");
+		info_logger(LOG_INFO, "illegal char in var name");
 		return NULL;
 	}
 	/*  It's that handy "${var:-word}" expression. Check if var is defined  */
@@ -1801,7 +1732,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
 				--open_braces;
 				break;
 			case '\0':
-				msg_logger(LOG_INFO,"\"}\" not found in: %s", input);
+				info_logger(LOG_INFO,"\"}\" not found in: %s", input);
 				return NULL;
 			default:
 				break;
@@ -1840,7 +1771,7 @@ static const char *expand_variable(char *buffer, unsigned int length,
 	*out_pos += len;
 	return input;
 expand_variable_out:
-	msg_logger(LOG_INFO, bb_msg_small_buffer);
+	info_logger(LOG_INFO, bb_msg_small_buffer);
 	return NULL;
 }   /*  End Function expand_variable  */