+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
/*
devfsd implementation for busybox
The postal address is:
Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
*/
+//config:config DEVFSD
+//config: bool "devfsd (obsolete)"
+//config: default n
+//config: select PLATFORM_LINUX
+//config: select FEATURE_SYSLOG
+//config: help
+//config: This is deprecated and should NOT be used anymore.
+//config: Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+//config: See docs/mdev.txt for detailed instructions on how to use mdev
+//config: instead.
+//config:
+//config: Provides compatibility with old device names on a devfs systems.
+//config: You should set it to true if you have devfs enabled.
+//config: The following keywords in devsfd.conf are supported:
+//config: "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
+//config: "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
+//config: "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
+//config:
+//config: But only if they are written UPPERCASE!!!!!!!!
+//config:
+//config:config DEVFSD_MODLOAD
+//config: bool "Adds support for MODLOAD keyword in devsfd.conf"
+//config: default y
+//config: depends on DEVFSD
+//config: help
+//config: This actually doesn't work with busybox modutils but needs
+//config: the external modutils.
+//config:
+//config:config DEVFSD_FG_NP
+//config: bool "Enable the -fg and -np options"
+//config: default y
+//config: depends on DEVFSD
+//config: help
+//config: -fg Run the daemon in the foreground.
+//config: -np Exit after parsing the configuration file.
+//config: Do not poll for events.
+//config:
+//config:config DEVFSD_VERBOSE
+//config: bool "Increases logging (and size)"
+//config: default y
+//config: depends on DEVFSD
+//config: help
+//config: Increases logging to stderr or syslog.
+//config:
+//config:config FEATURE_DEVFS
+//config: bool "Use devfs names for all devices (obsolete)"
+//config: default n
+//config: select PLATFORM_LINUX
+//config: help
+//config: This is obsolete and should NOT be used anymore.
+//config: Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+//config:
+//config: For legacy systems -- if there is no way around devfsd -- this
+//config: tells busybox to look for names like /dev/loop/0 instead of
+//config: /dev/loop0. If your /dev directory has normal names instead of
+//config: devfs names, you don't want this.
+
+//applet:IF_DEVFSD(APPLET(devfsd, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_DEVFSD) += devfsd.o
+
+//usage:#define devfsd_trivial_usage
+//usage: "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
+//usage:#define devfsd_full_usage "\n\n"
+//usage: "Manage devfs permissions and old device name symlinks\n"
+//usage: "\n mntpnt The mount point where devfs is mounted"
+//usage: "\n -v Print the protocol version numbers for devfsd"
+//usage: "\n and the kernel-side protocol version and exit"
+//usage: IF_DEVFSD_FG_NP(
+//usage: "\n -fg Run in foreground"
+//usage: "\n -np Exit after parsing the configuration file"
+//usage: "\n and processing synthetic REGISTER events,"
+//usage: "\n don't poll for events"
+//usage: )
#include "libbb.h"
-#include "busybox.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <dirent.h>
-#include <fcntl.h>
+#include "xregex.h"
#include <syslog.h>
-#include <signal.h>
-#include <regex.h>
-#include <errno.h>
-#include <sys/sysmacros.h>
+#include <sys/un.h>
+#include <sys/sysmacros.h>
/* Various defines taken from linux/major.h */
#define IDE0_MAJOR 3
/* Various defines taken from linux/devfs_fs.h */
#define DEVFSD_PROTOCOL_REVISION_KERNEL 5
-#define DEVFSD_IOCTL_BASE 'd'
+#define DEVFSD_IOCTL_BASE 'd'
/* These are the various ioctls */
#define DEVFSDIOC_GET_PROTO_REV _IOR(DEVFSD_IOCTL_BASE, 0, int)
#define DEVFSDIOC_SET_EVENT_MASK _IOW(DEVFSD_IOCTL_BASE, 2, int)
#define DEVFSDIOC_RELEASE_EVENT_QUEUE _IOW(DEVFSD_IOCTL_BASE, 3, int)
-#define DEVFSDIOC_SET_DEBUG_MASK _IOW(DEVFSD_IOCTL_BASE, 4, int)
+#define DEVFSDIOC_SET_CONFIG_DEBUG_MASK _IOW(DEVFSD_IOCTL_BASE, 4, int)
#define DEVFSD_NOTIFY_REGISTERED 0
#define DEVFSD_NOTIFY_UNREGISTERED 1
#define DEVFSD_NOTIFY_ASYNC_OPEN 2
#define DEVFSD_NOTIFY_CHANGE 5
#define DEVFSD_NOTIFY_CREATE 6
#define DEVFSD_NOTIFY_DELETE 7
-#define DEVFS_PATHLEN 1024 /* Never change this otherwise the
- binary interface will change */
-struct devfsd_notify_struct
-{ /* Use native C types to ensure same types in kernel and user space */
- unsigned int type; /* DEVFSD_NOTIFY_* value */
- unsigned int mode; /* Mode of the inode or device entry */
- unsigned int major; /* Major number of device entry */
- unsigned int minor; /* Minor number of device entry */
- unsigned int uid; /* Uid of process, inode or device entry */
- unsigned int gid; /* Gid of process, inode or device entry */
- unsigned int overrun_count; /* Number of lost events */
- unsigned int namelen; /* Number of characters not including '\0' */
- /* The device name MUST come last */
- char devname[DEVFS_PATHLEN]; /* This will be '\0' terminated */
+#define DEVFS_PATHLEN 1024
+/* Never change this otherwise the binary interface will change */
+
+struct devfsd_notify_struct {
+ /* Use native C types to ensure same types in kernel and user space */
+ unsigned int type; /* DEVFSD_NOTIFY_* value */
+ unsigned int mode; /* Mode of the inode or device entry */
+ unsigned int major; /* Major number of device entry */
+ unsigned int minor; /* Minor number of device entry */
+ unsigned int uid; /* Uid of process, inode or device entry */
+ unsigned int gid; /* Gid of process, inode or device entry */
+ unsigned int overrun_count; /* Number of lost events */
+ unsigned int namelen; /* Number of characters not including '\0' */
+ /* The device name MUST come last */
+ char devname[DEVFS_PATHLEN]; /* This will be '\0' terminated */
};
-
-
-/* These are now in Config.in */
-/* define this if you want to have more output on stderr and syslog at the same time */
-/*#define CONFIG_DEVFSD_VERBOSE*/
-/* define this if you want to have the function names in output */
-/*#define CONFIG_DEVFSD_DEBUG*/
-
#define BUFFER_SIZE 16384
#define DEVFSD_VERSION "1.3.25"
#define CONFIG_FILE "/etc/devfsd.conf"
-#define MODPROBE "/sbin/modprobe"
+#define MODPROBE "/sbin/modprobe"
+#define MODPROBE_SWITCH_1 "-k"
+#define MODPROBE_SWITCH_2 "-C"
#define CONFIG_MODULES_DEVFS "/etc/modules.devfs"
#define MAX_ARGS (6 + 1)
#define MAX_SUBEXPR 10
#define UID 0
#define GID 1
-/* for msg_logger(), do_ioctl(),
- fork_and_execute() */
+/* fork_and_execute() */
# define DIE 1
# define NO_DIE 0
#define AC_RMNEWCOMPAT 10
#define AC_RESTORE 11
-
-struct permissions_type
-{
- mode_t mode;
- uid_t uid;
- gid_t gid;
+struct permissions_type {
+ mode_t mode;
+ uid_t uid;
+ gid_t gid;
};
-struct execute_type
-{
- char *argv[MAX_ARGS + 1]; /* argv[0] must always be the programme */
+struct execute_type {
+ char *argv[MAX_ARGS + 1]; /* argv[0] must always be the programme */
};
-struct copy_type
-{
- const char *source;
- const char *destination;
+struct copy_type {
+ const char *source;
+ const char *destination;
};
-struct action_type
-{
- unsigned int what;
- unsigned int when;
+struct action_type {
+ unsigned int what;
+ unsigned int when;
};
-struct config_entry_struct
-{
- struct action_type action;
- regex_t preg;
- union
- {
+struct config_entry_struct {
+ struct action_type action;
+ regex_t preg;
+ union
+ {
struct permissions_type permissions;
struct execute_type execute;
struct copy_type copy;
- }
- u;
- struct config_entry_struct *next;
+ }
+ u;
+ struct config_entry_struct *next;
};
-struct get_variable_info
-{
- const struct devfsd_notify_struct *info;
- const char *devname;
- char devpath[STRING_LENGTH];
+struct get_variable_info {
+ const struct devfsd_notify_struct *info;
+ const char *devname;
+ char devpath[STRING_LENGTH];
};
-static void dir_operation(int , const char * , int, unsigned long* );
+static void dir_operation(int , const char * , int, unsigned long*);
static void service(struct stat statbuf, char *path);
-static int st_expr_expand(char *, unsigned, const char *, const char *(*) (const char *, void *), void *);
+static int st_expr_expand(char *, unsigned, const char *, const char *(*)(const char *, void *), void *);
static const char *get_old_name(const char *, unsigned, char *, unsigned, unsigned);
-static int mksymlink (const char *oldpath, const char *newpath);
-static void read_config_file (const char *path, int optional, unsigned long *event_mask);
-static void process_config_line (const char *, unsigned long *);
-static int do_servicing (int, unsigned long);
-static void service_name (const struct devfsd_notify_struct *);
-static void action_permissions (const struct devfsd_notify_struct *, const struct config_entry_struct *);
-static void action_execute (const struct devfsd_notify_struct *, const struct config_entry_struct *,
+static int mksymlink(const char *oldpath, const char *newpath);
+static void read_config_file(char *path, int optional, unsigned long *event_mask);
+static void process_config_line(const char *, unsigned long *);
+static int do_servicing(int, unsigned long);
+static void service_name(const struct devfsd_notify_struct *);
+static void action_permissions(const struct devfsd_notify_struct *, const struct config_entry_struct *);
+static void action_execute(const struct devfsd_notify_struct *, const struct config_entry_struct *,
const regmatch_t *, unsigned);
-#ifdef CONFIG_DEVFSD_MODLOAD
-static void action_modload (const struct devfsd_notify_struct *info, const struct config_entry_struct *entry);
-#endif
-static void action_copy (const struct devfsd_notify_struct *, const struct config_entry_struct *,
- const regmatch_t *, unsigned);
-static void action_compat (const struct devfsd_notify_struct *, unsigned);
-static void free_config (void);
+static void action_modload(const struct devfsd_notify_struct *info, const struct config_entry_struct *entry);
+static void action_copy(const struct devfsd_notify_struct *, const struct config_entry_struct *,
+ const regmatch_t *, unsigned);
+static void action_compat(const struct devfsd_notify_struct *, unsigned);
+static void free_config(void);
static void restore(char *spath, struct stat source_stat, int rootlen);
-static int copy_inode (const char *, const struct stat *, mode_t, const char *, const struct stat *);
-static mode_t get_mode (const char *);
-static void signal_handler (int);
-static const char *get_variable (const char *, void *);
-static int make_dir_tree (const char *);
+static int copy_inode(const char *, const struct stat *, mode_t, const char *, const struct stat *);
+static mode_t get_mode(const char *);
+static void signal_handler(int);
+static const char *get_variable(const char *, void *);
+static int make_dir_tree(const char *);
static int expand_expression(char *, unsigned, const char *, const char *(*)(const char *, void *), void *,
- const char *, const regmatch_t *, unsigned );
-static void expand_regexp (char *, size_t, const char *, const char *, const regmatch_t *, unsigned );
+ const char *, const regmatch_t *, unsigned);
+static void expand_regexp(char *, size_t, const char *, const char *, const regmatch_t *, unsigned);
static const char *expand_variable( char *, unsigned, unsigned *, const char *,
- const char *(*) (const char *, void *), void * );
-static const char *get_variable_v2(const char *, const char *(*) (const char *, void *), void *);
-static char get_old_ide_name (unsigned , unsigned);
-static char *write_old_sd_name (char *, unsigned, unsigned, char *);
+ const char *(*)(const char *, void *), void *);
+static const char *get_variable_v2(const char *, const char *(*)(const char *, void *), void *);
+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 die, int pri, const char * fmt, ... );
-static void do_ioctl(int 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 void safe_memcpy( char * dest, const char * src, int len);
+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, 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
-{
- char *dest;
- char *name;
-} initial_symlinks[] =
-{
- {"/proc/self/fd", "fd"},
- {"fd/0", "stdin"},
- {"fd/1", "stdout"},
- {"fd/2", "stderr"},
- {NULL, NULL},
+static struct initial_symlink_struct {
+ const char *dest;
+ const char *name;
+} initial_symlinks[] = {
+ {"/proc/self/fd", "fd"},
+ {"fd/0", "stdin"},
+ {"fd/1", "stdout"},
+ {"fd/2", "stderr"},
+ {NULL, NULL},
};
-static struct event_type
-{
- unsigned int type; /* The DEVFSD_NOTIFY_* value */
- const char *config_name; /* The name used in the config file */
-} event_types[] =
-{
- {DEVFSD_NOTIFY_REGISTERED, "REGISTER"},
- {DEVFSD_NOTIFY_UNREGISTERED, "UNREGISTER"},
- {DEVFSD_NOTIFY_ASYNC_OPEN, "ASYNC_OPEN"},
- {DEVFSD_NOTIFY_CLOSE, "CLOSE"},
- {DEVFSD_NOTIFY_LOOKUP, "LOOKUP"},
- {DEVFSD_NOTIFY_CHANGE, "CHANGE"},
- {DEVFSD_NOTIFY_CREATE, "CREATE"},
- {DEVFSD_NOTIFY_DELETE, "DELETE"},
- {0xffffffff, NULL}
+static struct event_type {
+ unsigned int type; /* The DEVFSD_NOTIFY_* value */
+ const char *config_name; /* The name used in the config file */
+} event_types[] = {
+ {DEVFSD_NOTIFY_REGISTERED, "REGISTER"},
+ {DEVFSD_NOTIFY_UNREGISTERED, "UNREGISTER"},
+ {DEVFSD_NOTIFY_ASYNC_OPEN, "ASYNC_OPEN"},
+ {DEVFSD_NOTIFY_CLOSE, "CLOSE"},
+ {DEVFSD_NOTIFY_LOOKUP, "LOOKUP"},
+ {DEVFSD_NOTIFY_CHANGE, "CHANGE"},
+ {DEVFSD_NOTIFY_CREATE, "CREATE"},
+ {DEVFSD_NOTIFY_DELETE, "DELETE"},
+ {0xffffffff, NULL}
};
-/* busybox functions and messages */
+/* Busybox messages */
-extern void xregcomp(regex_t * preg, const char *regex, int cflags);
+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";
-const char * const bb_msg_bad_config = "bad %s config file: %s\n";
-const char * const bb_msg_proto_rev = "protocol revision";
-#ifdef CONFIG_DEVFSD_VERBOSE
-const char * const bb_msg_small_buffer = "buffer too small\n";
-const char * const bb_msg_variable_not_found= "variable: %s not found\n";
+/* Busybox stuff */
+#if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
+#define info_logger(p, fmt, args...) bb_error_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(EXIT_FAILURE)
+#define error_logger(p, fmt, args...)
+#define error_logger_and_die(p, fmt, args...) exit(EXIT_FAILURE)
#endif
-static void msg_logger(int die, int pri, const char * fmt, ... )
+static void safe_memcpy(char *dest, const char *src, int len)
{
- va_list ap;
-
- va_start(ap, fmt);
- if (access ("/dev/log", F_OK) == 0)
- {
- openlog(bb_applet_name, 0, LOG_DAEMON);
- vsyslog( pri , fmt , ap);
- closelog();
- }
-#ifndef CONFIG_DEVFSD_VERBOSE
- else
-#endif
- bb_verror_msg(fmt, ap);
- va_end(ap);
- if(die==DIE)
- exit(EXIT_FAILURE);
+ memcpy(dest , src, len);
+ dest[len] = '\0';
}
-
-static void do_ioctl(int die, int fd, int request, unsigned long event_mask_flag)
+static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, const char *ptr)
{
- if (ioctl (fd, request, event_mask_flag) != 0)
- msg_logger(die, LOG_ERR, "ioctl(): %m\n");
+ if (d[n - 4] == 'd' && d[n - 3] == 'i' && d[n - 2] == 's' && d[n - 1] == 'c')
+ return 2 + addendum;
+ if (d[n - 2] == 'c' && d[n - 1] == 'd')
+ return 3 + addendum;
+ if (ptr[0] == 'p' && ptr[1] == 'a' && ptr[2] == 'r' && ptr[3] == 't')
+ return 4 + addendum;
+ if (ptr[n - 2] == 'm' && ptr[n - 1] == 't')
+ return 5 + addendum;
+ return 0;
}
-static void fork_and_execute(int die, char *arg0, char **arg )
+static unsigned int scan_dev_name(const char *d, unsigned int n, const char *ptr)
{
- switch ( fork () )
- {
- case 0:
- /* Child */
- break;
- case -1:
- /* Parent: Error : die or return */
- msg_logger(die, LOG_ERR,(char *) bb_msg_memory_exhausted);
- 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 )
- {
- execvp (arg0, arg);
- msg_logger(DIE, LOG_ERR, "execvp(): %s: %m\n", arg0);
+ 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'
+ && d[n - 4] == 'e' && d[n - 3] == 'r' && d[n - 2] == 'i' && d[n - 1] == 'c'
+ )
+ return 1;
+ return scan_dev_name_common(d, n, 0, ptr);
}
-}
-
-static void safe_memcpy( char *dest, const char *src, int len)
-{
- memcpy (dest , src , len );
- dest[len] = '\0';
+ if (d[0] == 'i' && d[1] == 'd' && d[2] == 'e' && d[3] == '/'
+ && d[4] == 'h' && d[5] == 'o' && d[6] == 's' && d[7] == 't'
+ )
+ return scan_dev_name_common(d, n, 4, ptr);
+ if (d[0] == 's' && d[1] == 'b' && d[2] == 'p' && d[3] == '/')
+ return 10;
+ if (d[0] == 'v' && d[1] == 'c' && d[2] == 'c' && d[3] == '/')
+ return 11;
+ if (d[0] == 'p' && d[1] == 't' && d[2] == 'y' && d[3] == '/')
+ return 12;
+ return 0;
}
/* 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;
int do_daemon = TRUE;
int no_polling = FALSE;
+ int do_scan;
int fd, proto_rev, count;
unsigned long event_mask = 0;
struct sigaction new_action;
if (argc < 2)
bb_show_usage();
- for (count = 2; count < argc; ++count)
- {
- if (strcmp (argv[count], "-v") == 0)
- print_version = TRUE;
- else if (strcmp (argv[count], "-fg") == 0)
- do_daemon = FALSE;
- else if (strcmp (argv[count], "-np") == 0)
- no_polling = TRUE;
- else
- bb_show_usage();
+ for (count = 2; count < argc; ++count) {
+ if (argv[count][0] == '-') {
+ if (argv[count][1] == 'v' && !argv[count][2]) /* -v */
+ print_version = TRUE;
+ else if (ENABLE_DEVFSD_FG_NP && argv[count][1] == 'f'
+ && 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;
+ else
+ bb_show_usage();
+ }
}
- mount_point = argv[1];
-
- if (chdir (mount_point) != 0)
- bb_error_msg_and_die( " %s: %m", mount_point);
+ mount_point = bb_simplify_path(argv[1]);
- fd = bb_xopen (".devfsd", O_RDONLY);
+ xchdir(mount_point);
- if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0)
- bb_error_msg( "FD_CLOEXEC");
-
- do_ioctl(DIE, fd, DEVFSDIOC_GET_PROTO_REV,(int )&proto_rev);
+ fd = xopen(".devfsd", O_RDONLY);
+ close_on_exec_on(fd);
+ xioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev);
/*setup initial entries */
- for (curr = initial_symlinks; curr->dest != NULL; ++curr)
- symlink (curr->dest, curr->name);
+ 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) )
- {
- bb_printf( "%s v%s\nDaemon %s:\t%d\nKernel-side %s:\t%d\n",
- bb_applet_name,DEVFSD_VERSION,bb_msg_proto_rev,
- DEVFSD_PROTOCOL_REVISION_DAEMON,bb_msg_proto_rev, 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);
if (DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev)
- bb_error_msg_and_die( "%s mismatch!",bb_msg_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(DIE, fd, DEVFSDIOC_SET_EVENT_MASK, 0);
-
- sigemptyset (&new_action.sa_mask);
- new_action.sa_flags = 0;
+ /* Tell kernel we are special(i.e. we get to see hidden entries) */
+ xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
/* Set up SIGHUP and SIGUSR1 handlers */
+ sigemptyset(&new_action.sa_mask);
+ new_action.sa_flags = 0;
new_action.sa_handler = signal_handler;
- if (sigaction (SIGHUP, &new_action, NULL) != 0 || sigaction (SIGUSR1, &new_action, NULL) != 0 )
- bb_error_msg_and_die( "sigaction()");
+ sigaction_set(SIGHUP, &new_action);
+ sigaction_set(SIGUSR1, &new_action);
- bb_printf("%s v%s started for %s\n",bb_applet_name, DEVFSD_VERSION, mount_point);
+ printf("%s v%s started for %s\n", applet_name, DEVFSD_VERSION, mount_point);
- /* Set umask so that mknod(2), open(2) and mkdir(2) have complete control over permissions */
- umask (0);
- read_config_file (CONFIG_FILE, FALSE, &event_mask);
+ /* Set umask so that mknod(2), open(2) and mkdir(2) have complete control over permissions */
+ umask(0);
+ read_config_file((char*)CONFIG_FILE, FALSE, &event_mask);
/* Do the scan before forking, so that boot scripts see the finished product */
- dir_operation(SERVICE,mount_point,0,NULL);
- if (no_polling)
- exit (0);
- if (do_daemon)
- {
+ dir_operation(SERVICE, mount_point, 0, NULL);
+
+ if (ENABLE_DEVFSD_FG_NP && no_polling)
+ exit(EXIT_SUCCESS);
+
+ 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(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 */
}
- else
- setpgid (0, 0); /* Become process group leader */
- while (TRUE)
- {
- int do_scan = do_servicing (fd, event_mask);
+ while (TRUE) {
+ do_scan = do_servicing(fd, event_mask);
- free_config ();
- read_config_file (CONFIG_FILE, FALSE, &event_mask);
+ free_config();
+ read_config_file((char*)CONFIG_FILE, FALSE, &event_mask);
if (do_scan)
- dir_operation(SERVICE,mount_point,0,NULL);
+ dir_operation(SERVICE, mount_point, 0, NULL);
}
+ if (ENABLE_FEATURE_CLEAN_UP) free(mount_point);
} /* End Function main */
/* Private functions follow */
-static void read_config_file (const char *path, int optional, unsigned long *event_mask)
+static void read_config_file(char *path, int optional, unsigned long *event_mask)
/* [SUMMARY] Read a configuration database.
<path> The path to read the database from. If this is a directory, all
- entries in that directory will be read (except hidden entries).
+ entries in that directory will be read(except hidden entries).
<optional> If TRUE, the routine will silently ignore a missing config file.
<event_mask> The event mask is written here. This is not initialised.
[RETURNS] Nothing.
struct stat statbuf;
FILE *fp;
char buf[STRING_LENGTH];
- char *line=NULL;
-
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "read_config_file()\n");
-#endif
- if (stat (path, &statbuf) != 0 || statbuf.st_size == 0 )
- goto read_config_file_err;
-
- if ( S_ISDIR (statbuf.st_mode) )
- {
- dir_operation(READ_CONFIG, path, 0, event_mask);
- return;
- }
-
- if ( ( fp = fopen (path, "r") ) != NULL )
- {
- while (fgets (buf, STRING_LENGTH, fp) != NULL)
- {
- /* GETS(3) Linux Programmer's Manual
- fgets() reads in at most one less than size characters from stream and
- stores them into the buffer pointed to by s. Reading stops after an
- EOF or a newline. If a newline is read, it is stored into the buffer.
- A '\0' is stored after the last character in the buffer.
- */
- /*buf[strlen (buf) - 1] = '\0';*/
- /* Skip whitespace */
- for (line = buf; isspace (*line); ++line)
- /*VOID*/;
- if (line[0] == '\0' || line[0] == '#' )
- continue;
- process_config_line (line, event_mask);
+ 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)) {
+ p = bb_simplify_path(path);
+ dir_operation(READ_CONFIG, p, 0, event_mask);
+ free(p);
+ return;
}
- fclose (fp);
- errno=0;
- }
+ fp = fopen_for_read(path);
+ if (fp != NULL) {
+ while (fgets(buf, STRING_LENGTH, fp) != NULL) {
+ /* Skip whitespace */
+ line = buf;
+ line = skip_whitespace(line);
+ if (line[0] == '\0' || line[0] == '#')
+ continue;
+ process_config_line(line, event_mask);
+ }
+ fclose(fp);
+ } else {
+ goto read_config_file_err;
+ }
+ } else {
read_config_file_err:
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger(((optional == 0 ) && (errno == ENOENT))? DIE : NO_DIE, LOG_ERR, "read config file: %s: %m\n", path);
-#endif
- return;
+ if (optional == 0 && errno == ENOENT)
+ error_logger_and_die(LOG_ERR, "read config file: %s", path);
+ }
} /* End Function read_config_file */
-static void process_config_line (const char *line, unsigned long *event_mask)
+static void process_config_line(const char *line, unsigned long *event_mask)
/* [SUMMARY] Process a line from a configuration file.
<line> The configuration line.
<event_mask> The event mask is written here. This is not initialised.
char p[MAX_ARGS][STRING_LENGTH];
char when[STRING_LENGTH], what[STRING_LENGTH];
char name[STRING_LENGTH];
- char * msg="";
+ const char *msg = "";
char *ptr;
+ int i;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "process_config_line()\n");
-#endif
+ /* !!!! Only Uppercase Keywords in devsfd.conf */
+ 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';
- num_args = sscanf (line, "%s %s %s %s %s %s %s %s %s %s",
+ for (count = 0; count < MAX_ARGS; ++count)
+ p[count][0] = '\0';
+ num_args = sscanf(line, "%s %s %s %s %s %s %s %s %s %s",
when, name, what,
p[0], p[1], p[2], p[3], p[4], p[5], p[6]);
- if (strcasecmp (when, "CLEAR_CONFIG") == 0)
- {
- free_config ();
+
+ i = index_in_strings(options, when);
+
+ /* "CLEAR_CONFIG" */
+ if (i == 0) {
+ free_config();
*event_mask = 0;
return;
}
+
if (num_args < 2)
goto process_config_line_err;
- if ( (strcasecmp (when, "INCLUDE") == 0) ||
- (strcasecmp (when, "OPTIONAL_INCLUDE") == 0) )
- {
- st_expr_expand (name, STRING_LENGTH, name, get_variable, NULL );
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, "%sinclude: %s\n",(toupper (when[0]) == 'I') ? "": "optional_", name);
-#endif
- read_config_file (name, (toupper (when[0]) == 'I') ? FALSE : TRUE, event_mask);
+ /* "INCLUDE" & "OPTIONAL_INCLUDE" */
+ if (i == 1 || i == 2) {
+ st_expr_expand(name, STRING_LENGTH, name, get_variable, NULL);
+ 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;
}
- if (strcasecmp (when, "RESTORE") == 0)
- {
- dir_operation(RESTORE,name, strlen (name),NULL);
+ /* "RESTORE" */
+ if (i == 3) {
+ dir_operation(RESTORE, name, strlen(name),NULL);
return;
}
if (num_args < 3)
goto process_config_line_err;
- new = xmalloc (sizeof *new);
- memset (new, 0, sizeof *new);
+ new = xzalloc(sizeof *new);
- for (count = 0; event_types[count].config_name != NULL; ++count)
- {
- if (strcasecmp (when, event_types[count].config_name) != 0)
+ for (count = 0; event_types[count].config_name != NULL; ++count) {
+ if (strcasecmp(when, event_types[count].config_name) != 0)
continue;
new->action.when = event_types[count].type;
break;
}
- if (event_types[count].config_name == NULL)
- {
- msg="WHEN in";
+ if (event_types[count].config_name == NULL) {
+ msg = "WHEN in";
goto process_config_line_err;
}
- if (strcasecmp (what, "PERMISSIONS") == 0)
- {
- new->action.what = AC_PERMISSIONS;
- /* Get user and group */
- if ( ( ptr = strchr (p[0], '.') ) == NULL )
- {
- msg="UID.GID";
- goto process_config_line_err; /*"missing '.' in UID.GID */
- }
+ i = index_in_strings(options, what);
- *ptr++ = '\0';
- new->u.permissions.uid = get_uid_gid (UID, p[0]);
- new->u.permissions.gid = get_uid_gid (GID, ptr);
- /* Get mode */
- new->u.permissions.mode = get_mode (p[1]);
- }
-#ifdef CONFIG_DEVFSD_MODLOAD
- else if (strcasecmp (what, "MODLOAD") == 0)
- /*This action will pass "/dev/$devname" (i.e. "/dev/" prefixed to
- the device name) to the module loading facility. In addition,
- the /etc/modules.devfs configuration file is used.*/
+ switch (i) {
+ case 4: /* "PERMISSIONS" */
+ new->action.what = AC_PERMISSIONS;
+ /* Get user and group */
+ ptr = strchr(p[0], '.');
+ if (ptr == NULL) {
+ msg = "UID.GID";
+ goto process_config_line_err; /*"missing '.' in UID.GID"*/
+ }
- new->action.what = AC_MODLOAD;
-#endif
- else if (strcasecmp (what, "EXECUTE") == 0)
- {
- new->action.what = AC_EXECUTE;
- num_args -= 3;
+ *ptr++ = '\0';
+ new->u.permissions.uid = get_uid_gid(UID, p[0]);
+ new->u.permissions.gid = get_uid_gid(GID, ptr);
+ /* Get mode */
+ new->u.permissions.mode = get_mode(p[1]);
+ break;
+ case 5: /* MODLOAD */
+ /*This action will pass "/dev/$devname"(i.e. "/dev/" prefixed to
+ the device name) to the module loading facility. In addition,
+ the /etc/modules.devfs configuration file is used.*/
+ if (ENABLE_DEVFSD_MODLOAD)
+ new->action.what = AC_MODLOAD;
+ break;
+ case 6: /* EXECUTE */
+ new->action.what = AC_EXECUTE;
+ num_args -= 3;
- for (count = 0; count < num_args; ++count)
- new->u.execute.argv[count] = bb_xstrdup (p[count]);
+ for (count = 0; count < num_args; ++count)
+ new->u.execute.argv[count] = xstrdup(p[count]);
- new->u.execute.argv[num_args] = NULL;
- }
- else if (strcasecmp (what, "COPY") == 0)
- {
- new->action.what = AC_COPY;
- num_args -= 3;
- if (num_args != 2)
- goto process_config_line_err; /* missing path and function in line */
-
- new->u.copy.source = bb_xstrdup (p[0]);
- new->u.copy.destination = bb_xstrdup (p[1]);
- }
- else if (strcasecmp (what, "IGNORE") == 0)
- new->action.what = AC_IGNORE;
- else if (strcasecmp (what, "MKOLDCOMPAT") == 0)
- new->action.what = AC_MKOLDCOMPAT;
- else if (strcasecmp (what, "MKNEWCOMPAT") == 0)
- new->action.what = AC_MKNEWCOMPAT;
- else if (strcasecmp (what, "RMOLDCOMPAT") == 0)
- new->action.what = AC_RMOLDCOMPAT;
- else if (strcasecmp (what, "RMNEWCOMPAT") == 0)
- new->action.what = AC_RMNEWCOMPAT;
- else
- {
- msg ="WHAT in";
- goto process_config_line_err;
- }
+ new->u.execute.argv[num_args] = NULL;
+ break;
+ case 7: /* COPY */
+ new->action.what = AC_COPY;
+ num_args -= 3;
+ if (num_args != 2)
+ goto process_config_line_err; /* missing path and function in line */
+
+ new->u.copy.source = xstrdup(p[0]);
+ new->u.copy.destination = xstrdup(p[1]);
+ break;
+ case 8: /* IGNORE */
+ /* FALLTROUGH */
+ case 9: /* MKOLDCOMPAT */
+ /* FALLTROUGH */
+ case 10: /* MKNEWCOMPAT */
+ /* FALLTROUGH */
+ case 11:/* RMOLDCOMPAT */
+ /* FALLTROUGH */
+ case 12: /* RMNEWCOMPAT */
+ /* AC_IGNORE 6
+ AC_MKOLDCOMPAT 7
+ AC_MKNEWCOMPAT 8
+ AC_RMOLDCOMPAT 9
+ AC_RMNEWCOMPAT 10*/
+ new->action.what = i - 2;
+ break;
+ default:
+ msg = "WHAT in";
+ goto process_config_line_err;
+ /*esac*/
+ } /* switch (i) */
- xregcomp( &new->preg, name, REG_EXTENDED);
+ xregcomp(&new->preg, name, REG_EXTENDED);
*event_mask |= 1 << new->action.when;
new->next = NULL;
last_config->next = new;
last_config = new;
return;
-process_config_line_err:
- msg_logger( DIE, LOG_ERR, bb_msg_bad_config, msg , line);
+
+ process_config_line_err:
+ msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
} /* End Function process_config_line */
-static int do_servicing (int fd, unsigned long event_mask)
+static int do_servicing(int fd, unsigned long event_mask)
/* [SUMMARY] Service devfs changes until a signal is received.
<fd> The open control file.
<event_mask> The event mask.
{
ssize_t bytes;
struct devfsd_notify_struct info;
- unsigned long tmp_event_mask;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "do_servicing()\n");
-#endif
- /* Tell devfs what events we care about */
- tmp_event_mask = event_mask;
- do_ioctl(DIE, fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
- while (!caught_signal)
- {
+ /* (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);
+ bytes = read(fd, (char *) &info, sizeof info);
if (caught_signal)
break; /* Must test for this first */
if (errno == EINTR)
continue; /* Yes, the order is important */
if (bytes < 1)
break;
- service_name (&info);
+ service_name(&info);
}
- if (caught_signal)
- {
+ if (caught_signal) {
int c_sighup = caught_sighup;
caught_signal = FALSE;
caught_sighup = FALSE;
- return (c_sighup);
+ return c_sighup;
}
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_ERR, "read error on control file: %m\n");
-#endif
- /* This is to shut up a compiler warning */
- exit(1);
+ msg_logger_and_die(LOG_ERR, "read error on control file");
} /* End Function do_servicing */
-static void service_name (const struct devfsd_notify_struct *info)
+static void service_name(const struct devfsd_notify_struct *info)
/* [SUMMARY] Service a single devfs change.
<info> The devfs change.
[RETURNS] Nothing.
regmatch_t mbuf[MAX_SUBEXPR];
struct config_entry_struct *entry;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "service_name()\n");
-#endif
-#ifdef CONFIG_DEVFSD_VERBOSE
- if (info->overrun_count > 0)
- msg_logger( NO_DIE, LOG_ERR, "lost %u events\n", info->overrun_count);
-#endif
+ if (ENABLE_DEBUG && info->overrun_count > 0)
+ msg_logger(LOG_ERR, "lost %u events", info->overrun_count);
/* Discard lookups on "/dev/log" and "/dev/initctl" */
- if (info->type == DEVFSD_NOTIFY_LOOKUP &&
- (( (strcmp (info->devname, "log") == 0) ||
- (strcmp (info->devname, "initctl") == 0))))
- return;
- for (entry = first_config; entry != NULL; entry = entry->next)
- {
+ if (info->type == DEVFSD_NOTIFY_LOOKUP
+ && ((info->devname[0] == 'l' && info->devname[1] == 'o'
+ && 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'
+ && info->devname[6] == 'l' && !info->devname[7]))
+ )
+ return;
+
+ 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 || regexec (&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0 )
+ 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)
+ for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n)
/* VOID */;
- switch (entry->action.what)
- {
+
+ switch (entry->action.what) {
case AC_PERMISSIONS:
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_PERMISSIONS\n");
-#endif
- action_permissions (info, entry);
+ action_permissions(info, entry);
break;
-#ifdef CONFIG_DEVFSD_MODLOAD
case AC_MODLOAD:
- #ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_MODLOAD\n");
- #endif
- action_modload (info, entry);
+ if (ENABLE_DEVFSD_MODLOAD)
+ action_modload(info, entry);
break;
-#endif
case AC_EXECUTE:
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_EXECUTE\n");
-#endif
- action_execute (info, entry, mbuf, n);
+ action_execute(info, entry, mbuf, n);
break;
case AC_COPY:
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_COPY\n");
-#endif
- action_copy (info, entry, mbuf, n);
+ action_copy(info, entry, mbuf, n);
break;
case AC_IGNORE:
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_IGNORE\n");
-#endif
return;
/*break;*/
case AC_MKOLDCOMPAT:
case AC_MKNEWCOMPAT:
case AC_RMOLDCOMPAT:
case AC_RMNEWCOMPAT:
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "AC_COMPAT\n");
-#endif
- action_compat (info, entry->action.what);
+ action_compat(info, entry->action.what);
break;
default:
- msg_logger( DIE, LOG_ERR, "Unknown action\n");
- /*break;*/
+ msg_logger_and_die(LOG_ERR, "Unknown action");
}
}
} /* End Function service_name */
-static void action_permissions (const struct devfsd_notify_struct *info,
+static void action_permissions(const struct devfsd_notify_struct *info,
const struct config_entry_struct *entry)
/* [SUMMARY] Update permissions for a device entry.
<info> The devfs change.
{
struct stat statbuf;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "action_permission()\n");
-#endif
-
- 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)
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_ERR, "chmod() or chown(): %s: %m\n",info->devname);
-#endif
- return;
- }
-
+ 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
+ )
+ error_logger(LOG_ERR, "Can't chmod or chown: %s", info->devname);
} /* End Function action_permissions */
-#ifdef CONFIG_DEVFSD_MODLOAD
-static void action_modload (const struct devfsd_notify_struct *info,
- const struct config_entry_struct *entry)
+static void action_modload(const struct devfsd_notify_struct *info,
+ const struct config_entry_struct *entry UNUSED_PARAM)
/* [SUMMARY] Load a module.
<info> The devfs change.
<entry> The config file entry.
*/
{
char *argv[6];
- char device[STRING_LENGTH];
- argv[0] = MODPROBE;
- argv[1] = "-k";
- argv[2] = "-C";
- argv[3] = CONFIG_MODULES_DEVFS;
- argv[4] = device;
+ 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;
- #ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "action_modload()\n");
- #endif
- snprintf (device, sizeof (device), "/dev/%s", info->devname);
- fork_and_execute(DIE, argv[0], argv);
+
+ spawn_and_wait(argv);
+ free(argv[4]);
} /* End Function action_modload */
-#endif
-static void action_execute (const struct devfsd_notify_struct *info,
- const struct config_entry_struct *entry,
- const regmatch_t *regexpr, unsigned int numexpr)
+static void action_execute(const struct devfsd_notify_struct *info,
+ const struct config_entry_struct *entry,
+ const regmatch_t *regexpr, unsigned int numexpr)
/* [SUMMARY] Execute a programme.
<info> The devfs change.
<entry> The config file entry.
- <regexpr> The number of subexpression (start, end) offsets within the
+ <regexpr> The number of subexpression(start, end) offsets within the
device name.
<numexpr> The number of elements within <<regexpr>>.
[RETURNS] Nothing.
char *argv[MAX_ARGS + 1];
char largv[MAX_ARGS + 1][STRING_LENGTH];
-#ifdef CONFIG_DEVFSD_DEBUG
- int i;
- char buff[1024];
-
- msg_logger( NO_DIE, LOG_INFO, "action_execute()\n");
-#endif
-
gv_info.info = info;
gv_info.devname = info->devname;
- snprintf (gv_info.devpath, sizeof (gv_info.devpath), "%s/%s", mount_point, info->devname);
- for (count = 0; entry->u.execute.argv[count] != NULL; ++count)
- {
- expand_expression (largv[count], STRING_LENGTH,
+ snprintf(gv_info.devpath, sizeof(gv_info.devpath), "%s/%s", mount_point, info->devname);
+ for (count = 0; entry->u.execute.argv[count] != NULL; ++count) {
+ expand_expression(largv[count], STRING_LENGTH,
entry->u.execute.argv[count],
get_variable, &gv_info,
- gv_info.devname, regexpr, numexpr );
+ gv_info.devname, regexpr, numexpr);
argv[count] = largv[count];
}
argv[count] = NULL;
-
-#ifdef CONFIG_DEVFSD_DEBUG
- buff[0]='\0';
- for(i=0;argv[i]!=NULL;i++) /* argv[i] < MAX_ARGS + 1 */
- {
- strcat(buff," ");
- if( (strlen(buff)+ 1 + strlen(argv[i])) >= 1024)
- break;
- strcat(buff,argv[i]);
- }
- strcat(buff,"\n");
- msg_logger( NO_DIE, LOG_INFO, "action_execute(): %s",buff);
-#endif
-
- fork_and_execute(NO_DIE, argv[0], argv);
+ spawn_and_wait(argv);
} /* End Function action_execute */
-static void action_copy (const struct devfsd_notify_struct *info,
- const struct config_entry_struct *entry,
- const regmatch_t *regexpr, unsigned int numexpr)
+static void action_copy(const struct devfsd_notify_struct *info,
+ const struct config_entry_struct *entry,
+ const regmatch_t *regexpr, unsigned int numexpr)
/* [SUMMARY] Copy permissions.
<info> The devfs change.
<entry> The config file entry.
- <regexpr> This list of subexpression (start, end) offsets within the
+ <regexpr> This list of subexpression(start, end) offsets within the
device name.
<numexpr> The number of elements in <<regexpr>>.
[RETURNS] Nothing.
struct get_variable_info gv_info;
struct stat source_stat, dest_stat;
char source[STRING_LENGTH], destination[STRING_LENGTH];
- dest_stat.st_mode = 0;
+ int ret = 0;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "action_copy()\n");
-#endif
+ dest_stat.st_mode = 0;
- if ( (info->type == DEVFSD_NOTIFY_CHANGE) && S_ISLNK (info->mode) )
+ if ((info->type == DEVFSD_NOTIFY_CHANGE) && S_ISLNK(info->mode))
return;
gv_info.info = info;
gv_info.devname = info->devname;
- snprintf (gv_info.devpath, sizeof (gv_info.devpath), "%s/%s", mount_point, info->devname);
- expand_expression (source, STRING_LENGTH, entry->u.copy.source,
+ snprintf(gv_info.devpath, sizeof(gv_info.devpath), "%s/%s", mount_point, info->devname);
+ expand_expression(source, STRING_LENGTH, entry->u.copy.source,
get_variable, &gv_info, gv_info.devname,
regexpr, numexpr);
- expand_expression (destination, STRING_LENGTH, entry->u.copy.destination,
+ expand_expression(destination, STRING_LENGTH, entry->u.copy.destination,
get_variable, &gv_info, gv_info.devname,
regexpr, numexpr);
- if ( !make_dir_tree (destination) || lstat (source, &source_stat) != 0)
+ if (!make_dir_tree(destination) || lstat(source, &source_stat) != 0)
return;
- lstat (destination, &dest_stat);
+ lstat(destination, &dest_stat);
new_mode = source_stat.st_mode & ~S_ISVTX;
if (info->type == DEVFSD_NOTIFY_CREATE)
new_mode |= S_ISVTX;
- else if ( (info->type == DEVFSD_NOTIFY_CHANGE) && (dest_stat.st_mode & S_ISVTX) )
+ else if ((info->type == DEVFSD_NOTIFY_CHANGE) &&(dest_stat.st_mode & S_ISVTX))
new_mode |= S_ISVTX;
-#ifdef CONFIG_DEVFSD_VERBOSE
- if ( !copy_inode (destination, &dest_stat, new_mode, source, &source_stat) )
- msg_logger( NO_DIE, LOG_ERR, "copy_inode(): %s to %s: %m\n", source, destination);
-#else
- copy_inode (destination, &dest_stat, new_mode, source, &source_stat);
-#endif
- return;
+ ret = copy_inode(destination, &dest_stat, new_mode, source, &source_stat);
+ if (ENABLE_DEBUG && ret && (errno != EEXIST))
+ 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)
+static void action_compat(const struct devfsd_notify_struct *info, unsigned int action)
/* [SUMMARY] Process a compatibility request.
<info> The devfs change.
<action> The action to take.
[RETURNS] Nothing.
*/
{
+ int ret;
const char *compat_name = NULL;
const char *dest_name = info->devname;
- char *ptr;
+ const char *ptr;
char compat_buf[STRING_LENGTH], dest_buf[STRING_LENGTH];
-
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "action_compat()\n");
-#endif
+ int mode, host, bus, target, lun;
+ unsigned int i;
+ char rewind_;
+ /* 1 to 5 "scsi/" , 6 to 9 "ide/host" */
+ static const char *const fmt[] = {
+ NULL ,
+ "sg/c%db%dt%du%d", /* scsi/generic */
+ "sd/c%db%dt%du%d", /* scsi/disc */
+ "sr/c%db%dt%du%d", /* scsi/cd */
+ "sd/c%db%dt%du%dp%d", /* scsi/part */
+ "st/c%db%dt%du%dm%d%c", /* scsi/mt */
+ "ide/hd/c%db%dt%du%d", /* ide/host/disc */
+ "ide/cd/c%db%dt%du%d", /* ide/host/cd */
+ "ide/hd/c%db%dt%du%dp%d", /* ide/host/part */
+ "ide/mt/c%db%dt%du%d%s", /* ide/host/mt */
+ NULL
+ };
/* First construct compatibility name */
- switch (action)
- {
+ switch (action) {
case AC_MKOLDCOMPAT:
case AC_RMOLDCOMPAT:
- compat_name = get_old_name (info->devname, info->namelen, compat_buf, info->major, info->minor);
+ compat_name = get_old_name(info->devname, info->namelen, compat_buf, info->major, info->minor);
break;
case AC_MKNEWCOMPAT:
case AC_RMNEWCOMPAT:
- if (strncmp (info->devname, "scsi/", 5) == 0)
- {
- int mode, host, bus, target, lun;
+ ptr = bb_basename(info->devname);
+ i = scan_dev_name(info->devname, info->namelen, ptr);
- sscanf (info->devname + 5, "host%d/bus%d/target%d/lun%d/",
- &host, &bus, &target, &lun);
- compat_name = compat_buf;
- snprintf (dest_buf, sizeof (dest_buf), "../%s", info->devname);
+ /* nothing found */
+ if (i == 0 || i > 9)
+ return;
+
+ sscanf(info->devname + ((i < 6) ? 5 : 4), "host%d/bus%d/target%d/lun%d/", &host, &bus, &target, &lun);
+ snprintf(dest_buf, sizeof(dest_buf), "../%s", info->devname + (( i > 5) ? 4 : 0));
dest_name = dest_buf;
- if (strncmp (ptr = (strrchr (info->devname, '/') + 1), "mt", 2)== 0)
- {
- char rewind_ = info->devname[info->namelen - 1];
+ compat_name = compat_buf;
+
+ /* 1 == scsi/generic 2 == scsi/disc 3 == scsi/cd 6 == ide/host/disc 7 == ide/host/cd */
+ if (i == 1 || i == 2 || i == 3 || i == 6 || i ==7)
+ sprintf(compat_buf, fmt[i], host, bus, target, lun);
+
+ /* 4 == scsi/part 8 == ide/host/part */
+ if (i == 4 || i == 8)
+ sprintf(compat_buf, fmt[i], host, bus, target, lun, atoi(ptr + 4));
+
+ /* 5 == scsi/mt */
+ if (i == 5) {
+ rewind_ = info->devname[info->namelen - 1];
if (rewind_ != 'n')
rewind_ = '\0';
-
- switch (ptr[2])
- {
- default:
- mode = 0;
- break;
- case 'l':
- mode = 1;
- break;
- case 'm':
- mode = 2;
- break;
- case 'a':
- mode = 3;
- break;
- }
- sprintf (compat_buf, "st/c%db%dt%du%dm%d%c", host, bus, target, lun, mode, rewind_);
+ mode=0;
+ if (ptr[2] == 'l' /*108*/ || ptr[2] == 'm'/*109*/)
+ mode = ptr[2] - 107; /* 1 or 2 */
+ if (ptr[2] == 'a')
+ mode = 3;
+ sprintf(compat_buf, fmt[i], host, bus, target, lun, mode, rewind_);
}
- else if (strcmp (info->devname + info->namelen - 7,"generic") == 0)
- sprintf (compat_buf, "sg/c%db%dt%du%d",
- host, bus, target, lun);
- else if (strcmp (info->devname + info->namelen - 2, "cd") == 0)
- sprintf (compat_buf, "sr/c%db%dt%du%d",
- host, bus, target, lun);
- else if (strcmp (info->devname + info->namelen - 4, "disc") == 0)
- sprintf (compat_buf, "sd/c%db%dt%du%d",
- host, bus, target, lun);
- else if (strncmp (ptr = (strrchr (info->devname, '/') + 1), "part", 4) == 0)
- sprintf ( compat_buf, "sd/c%db%dt%du%dp%d",
- host, bus, target, lun, atoi (ptr + 4) );
- else compat_name = NULL;
- }
- else if (strncmp (info->devname, "ide/host", 8) == 0)
- {
- int host, bus, target, lun;
- sscanf (info->devname + 4, "host%d/bus%d/target%d/lun%d/",
- &host, &bus, &target, &lun);
- compat_name = compat_buf;
- snprintf (dest_buf, sizeof (dest_buf), "../%s", info->devname + 4);
- dest_name = dest_buf;
- if (strcmp (info->devname + info->namelen - 4, "disc") == 0)
- sprintf (compat_buf, "ide/hd/c%db%dt%du%d",
- host, bus, target, lun);
- else if (strncmp (ptr = (strrchr (info->devname, '/') + 1), "part", 4) == 0)
- sprintf ( compat_buf, "ide/hd/c%db%dt%du%dp%d",
- host, bus, target, lun, atoi (ptr + 4) );
- else if (strcmp (info->devname + info->namelen - 2, "cd") == 0)
- sprintf (compat_buf, "ide/cd/c%db%dt%du%d",
- host, bus, target,lun);
- else if (strncmp (ptr = (strrchr (info->devname, '/') + 1), "mt", 2) == 0)
- snprintf (compat_buf, sizeof (compat_buf), "ide/mt/c%db%dt%du%d%s",
- host, bus, target, lun, ptr + 2);
- else compat_name = NULL;
- }
- break;
- }
+ /* 9 == ide/host/mt */
+ if (i == 9)
+ snprintf(compat_buf, sizeof(compat_buf), fmt[i], host, bus, target, lun, ptr + 2);
+ /* esac */
+ } /* switch (action) */
+
if (compat_name == NULL)
return;
+
/* Now decide what to do with it */
- switch (action)
- {
+ switch (action) {
case AC_MKOLDCOMPAT:
case AC_MKNEWCOMPAT:
- mksymlink (dest_name, compat_name);
+ mksymlink(dest_name, compat_name);
break;
case AC_RMOLDCOMPAT:
case AC_RMNEWCOMPAT:
-#ifdef CONFIG_DEVFSD_VERBOSE
- if (unlink (compat_name) != 0)
- msg_logger( NO_DIE, LOG_ERR, "unlink(): %s: %m\n", compat_name);
-#else
- unlink (compat_name);
-#endif
+ ret = unlink(compat_name);
+ if (ENABLE_DEBUG && ret)
+ error_logger(LOG_ERR, "unlink: %s", compat_name);
break;
- }
+ /*esac*/
+ } /* switch (action) */
} /* End Function action_compat */
static void restore(char *spath, struct stat source_stat, int rootlen)
{
- char dpath[STRING_LENGTH];
+ char *dpath;
struct stat dest_stat;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "restore()\n");
-#endif
-
dest_stat.st_mode = 0;
- snprintf (dpath, sizeof dpath, "%s%s", mount_point, spath + rootlen);
- lstat (dpath, &dest_stat);
-
- 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) )
- dir_operation(RESTORE, spath, rootlen,NULL);
+ 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))
+ copy_inode(dpath, &dest_stat, (source_stat.st_mode & ~S_ISVTX), spath, &source_stat);
+
+ if (S_ISDIR(source_stat.st_mode))
+ dir_operation(RESTORE, spath, rootlen, NULL);
}
-static int copy_inode (const char *destpath, const struct stat *dest_stat,
+static int copy_inode(const char *destpath, const struct stat *dest_stat,
mode_t new_mode,
const char *sourcepath, const struct stat *source_stat)
/* [SUMMARY] Copy an inode.
[RETURNS] TRUE on success, else FALSE.
*/
{
+ int source_len, dest_len;
+ char source_link[STRING_LENGTH], dest_link[STRING_LENGTH];
+ int fd, val;
+ struct sockaddr_un un_addr;
+ char symlink_val[STRING_LENGTH];
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "copy_inode()\n");
-#endif
-
- if ( (source_stat->st_mode & S_IFMT) == (dest_stat->st_mode & S_IFMT) )
- {
+ if ((source_stat->st_mode & S_IFMT) ==(dest_stat->st_mode & S_IFMT)) {
/* Same type */
- if ( S_ISLNK (source_stat->st_mode) )
- {
- int source_len, dest_len;
- char source_link[STRING_LENGTH], dest_link[STRING_LENGTH];
-
-
- if (( source_len = readlink (sourcepath, source_link, STRING_LENGTH - 1) ) < 0 ||
- ( dest_len = readlink (destpath , dest_link , STRING_LENGTH - 1) ) < 0 )
- return (FALSE);
+ if (S_ISLNK(source_stat->st_mode)) {
+ source_len = readlink(sourcepath, source_link, STRING_LENGTH - 1);
+ if ((source_len < 0)
+ || (dest_len = readlink(destpath, dest_link, STRING_LENGTH - 1)) < 0
+ )
+ return FALSE;
source_link[source_len] = '\0';
- dest_link[dest_len] = '\0';
- if ( (source_len != dest_len) || (strcmp (source_link, dest_link) != 0) )
- {
- unlink (destpath);
- symlink (source_link, destpath);
+ dest_link[dest_len] = '\0';
+ if ((source_len != dest_len) || (strcmp(source_link, dest_link) != 0)) {
+ unlink(destpath);
+ symlink(source_link, destpath);
}
- return (TRUE);
+ return TRUE;
} /* Else not a symlink */
- chmod (destpath, new_mode & ~S_IFMT);
- chown (destpath, source_stat->st_uid, source_stat->st_gid);
- return (TRUE);
+ chmod(destpath, new_mode & ~S_IFMT);
+ chown(destpath, source_stat->st_uid, source_stat->st_gid);
+ return TRUE;
}
/* Different types: unlink and create */
- unlink (destpath);
- switch (source_stat->st_mode & S_IFMT)
- {
- int fd, val;
- struct sockaddr_un un_addr;
- char symlink_val[STRING_LENGTH];
-
+ unlink(destpath);
+ switch (source_stat->st_mode & S_IFMT) {
case S_IFSOCK:
- if ( ( fd = socket (AF_UNIX, SOCK_STREAM, 0) ) < 0 )
+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0)
break;
un_addr.sun_family = AF_UNIX;
- snprintf (un_addr.sun_path, sizeof (un_addr.sun_path), "%s", destpath);
- val = bind (fd, (struct sockaddr *) &un_addr, (int) sizeof un_addr);
- close (fd);
- if (val != 0 || chmod (destpath, new_mode & ~S_IFMT) != 0)
+ snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath);
+ val = bind(fd, (struct sockaddr *) &un_addr, (int) sizeof un_addr);
+ close(fd);
+ if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
break;
goto do_chown;
case S_IFLNK:
- if ( ( val = readlink (sourcepath, symlink_val, STRING_LENGTH - 1) ) < 0 )
+ val = readlink(sourcepath, symlink_val, STRING_LENGTH - 1);
+ if (val < 0)
break;
symlink_val[val] = '\0';
- if (symlink (symlink_val, destpath) == 0)
- return (TRUE);
+ if (symlink(symlink_val, destpath) == 0)
+ return TRUE;
break;
case S_IFREG:
- if ( ( fd = open (destpath, O_RDONLY | O_CREAT, new_mode & ~S_IFMT) ) < 0 )
+ fd = open(destpath, O_RDONLY | O_CREAT, new_mode & ~S_IFMT);
+ if (fd < 0)
break;
- close (fd);
- if (chmod (destpath, new_mode & ~S_IFMT) != 0)
+ close(fd);
+ if (chmod(destpath, new_mode & ~S_IFMT) != 0)
break;
goto do_chown;
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
- if (mknod (destpath, new_mode, source_stat->st_rdev) != 0)
+ if (mknod(destpath, new_mode, source_stat->st_rdev) != 0)
break;
goto do_chown;
case S_IFDIR:
- if (mkdir (destpath, new_mode & ~S_IFMT) != 0)
+ if (mkdir(destpath, new_mode & ~S_IFMT) != 0)
break;
do_chown:
- if (chown (destpath, source_stat->st_uid, source_stat->st_gid) == 0)
- return (TRUE);
+ if (chown(destpath, source_stat->st_uid, source_stat->st_gid) == 0)
+ return TRUE;
/*break;*/
}
- return (FALSE);
+ return FALSE;
} /* End Function copy_inode */
-static void free_config ()
+static void free_config(void)
/* [SUMMARY] Free the configuration information.
[RETURNS] Nothing.
*/
struct config_entry_struct *c_entry;
void *next;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "free_config()\n");
-#endif
-
- for (c_entry = first_config; c_entry != NULL; c_entry = next)
- {
+ for (c_entry = first_config; c_entry != NULL; c_entry = next) {
unsigned int count;
next = c_entry->next;
- regfree (&c_entry->preg);
- if (c_entry->action.what == AC_EXECUTE)
- {
- for (count = 0; count < MAX_ARGS; ++count)
- {
+ regfree(&c_entry->preg);
+ if (c_entry->action.what == AC_EXECUTE) {
+ for (count = 0; count < MAX_ARGS; ++count) {
if (c_entry->u.execute.argv[count] == NULL)
break;
- free (c_entry->u.execute.argv[count]);
+ free(c_entry->u.execute.argv[count]);
}
}
- free (c_entry);
+ free(c_entry);
}
first_config = NULL;
last_config = NULL;
} /* End Function free_config */
-static int get_uid_gid (int flag, const char *string)
+static int get_uid_gid(int flag, const char *string)
/* [SUMMARY] Convert a string to a UID or GID value.
<flag> "UID" or "GID".
<string> The string.
{
struct passwd *pw_ent;
struct group *grp_ent;
- char * msg="user";
-
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_uid_gid()\n");
+ const char *msg;
+ if (isdigit(string[0]) || ((string[0] == '-') && isdigit(string[1])))
+ return atoi(string);
- if(flag != UID && flag != GID )
- msg_logger( DIE, LOG_ERR,"get_uid_gid(): flag != UID && flag != GID\n");
-#endif
-
- if ( isdigit (string[0]) || ( (string[0] == '-') && isdigit (string[1]) ) )
- return atoi (string);
+ if (flag == UID && (pw_ent = getpwnam(string)) != NULL)
+ return pw_ent->pw_uid;
- if ( flag == UID && ( pw_ent = getpwnam (string) ) != NULL )
- return (pw_ent->pw_uid);
+ if (ENABLE_DEVFSD_VERBOSE)
+ msg = "user";
- if ( flag == GID && ( grp_ent = getgrnam (string) ) != NULL )
- return (grp_ent->gr_gid);
- else
- msg="group";
+ if (flag == GID) {
+ if ((grp_ent = getgrnam(string)) != NULL)
+ return grp_ent->gr_gid;
+ if (ENABLE_DEVFSD_VERBOSE)
+ msg = "group";
+ }
- msg_logger( NO_DIE, LOG_ERR,"unknown %s: %s, defaulting to %cID=0\n", msg, string, msg[0] - 32);
- return (0);
+ if (ENABLE_DEVFSD_VERBOSE)
+ msg_logger(LOG_ERR, "unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]);
+ return 0;
}/* End Function get_uid_gid */
-static mode_t get_mode (const char *string)
+static mode_t get_mode(const char *string)
/* [SUMMARY] Convert a string to a mode value.
<string> The string.
[RETURNS] The mode value.
{
mode_t mode;
int i;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_mode()\n");
-#endif
- if ( isdigit (string[0]) )
- return strtoul (string, NULL, 8);
- if (strlen (string) != 9)
- msg_logger( DIE, LOG_ERR, "bad mode: %s\n", string);
+ if (isdigit(string[0]))
+ return strtoul(string, NULL, 8);
+ if (strlen(string) != 9)
+ msg_logger_and_die(LOG_ERR, "bad mode: %s", string);
+
mode = 0;
- i= S_IRUSR;
- while(i>0)
- {
- if(string[0]=='r'||string[0]=='w'||string[0]=='x')
- mode+=i;
- i=i/2;
+ i = S_IRUSR;
+ while (i > 0) {
+ if (string[0] == 'r' || string[0] == 'w' || string[0] == 'x')
+ mode += i;
+ i = i / 2;
string++;
}
- return (mode);
+ return mode;
} /* End Function get_mode */
-static void signal_handler (int sig)
+static void signal_handler(int sig)
{
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "signal_handler()\n");
-#endif
-
caught_signal = TRUE;
if (sig == SIGHUP)
caught_sighup = TRUE;
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, "Caught %s\n",(sig == SIGHUP)?"SIGHUP" : "SIGUSR1");
-#endif
+
+ info_logger(LOG_INFO, "Caught signal %d", sig);
} /* End Function signal_handler */
-static const char *get_variable (const char *variable, void *info)
+static const char *get_variable(const char *variable, void *info)
{
+ static char *hostname;
+
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",
+ NULL, mount_point, gv_info->devpath, gv_info->devname, NULL
+ };
+ int i;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_variable()\n");
-#endif
+ if (!hostname)
+ hostname = safe_gethostname();
+ field_names[7] = hostname;
- if (gethostname (hostname, STRING_LENGTH - 1) != 0)
- msg_logger( DIE, LOG_ERR, "gethostname(): %m\n");
- /* Here on error we should do exit(RV_SYS_ERROR), instead we do exit(EXIT_FAILURE) */
- hostname[STRING_LENGTH - 1] = '\0';
- if (strcmp (variable, "hostname") == 0)
- return (hostname);
- if (strcmp (variable, "mntpnt") == 0)
- return (mount_point);
- if (gv_info == NULL)
- return (NULL);
- if (strcmp (variable, "devpath") == 0)
- return (gv_info->devpath);
- if (strcmp (variable, "devname") == 0)
- return (gv_info->devname);
- if (strcmp (variable, "mode") == 0)
- {
- sprintf (sbuf, "%o", gv_info->info->mode);
- return (sbuf);
- }
- if (strcmp (variable, "uid") == 0)
- {
- sprintf (sbuf, "%u", gv_info->info->uid);
- return (sbuf);
- }
- if (strcmp (variable, "gid") == 0)
- {
- sprintf (sbuf, "%u", gv_info->info->gid);
- return (sbuf);
- }
- return (NULL);
+ /* 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 field_names[i + 7];
+
+ if (i == 4)
+ return auto_string(xasprintf("%u", gv_info->info->uid));
+ if (i == 5)
+ return auto_string(xasprintf("%u", gv_info->info->gid));
+ /* i == 6 */
+ return auto_string(xasprintf("%o", gv_info->info->mode));
} /* End Function get_variable */
static void service(struct stat statbuf, char *path)
{
struct devfsd_notify_struct info;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "service()\n");
-#endif
-
- memset (&info, 0, sizeof info);
+ memset(&info, 0, sizeof info);
info.type = DEVFSD_NOTIFY_REGISTERED;
info.mode = statbuf.st_mode;
- info.major = major (statbuf.st_rdev);
- info.minor = minor (statbuf.st_rdev);
+ info.major = major(statbuf.st_rdev);
+ info.minor = minor(statbuf.st_rdev);
info.uid = statbuf.st_uid;
info.gid = statbuf.st_gid;
- snprintf (info.devname, sizeof (info.devname), "%s", path + strlen (mount_point) + 1);
- info.namelen = strlen (info.devname);
- service_name (&info);
- if ( S_ISDIR (statbuf.st_mode) )
- dir_operation(SERVICE,path,0,NULL);
+ snprintf(info.devname, sizeof(info.devname), "%s", path + strlen(mount_point) + 1);
+ info.namelen = strlen(info.devname);
+ service_name(&info);
+ if (S_ISDIR(statbuf.st_mode))
+ dir_operation(SERVICE, path, 0, NULL);
}
static void dir_operation(int type, const char * dir_name, int var, unsigned long *event_mask)
struct stat statbuf;
DIR *dp;
struct dirent *de;
- char path[STRING_LENGTH];
-
+ char *path;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "dir_operation()\n");
-#endif
-
- if((dp = opendir( dir_name))==NULL)
- {
- msg_logger( NO_DIE, LOG_ERR, "opendir(): %s: %m\n", dir_name);
+ dp = warn_opendir(dir_name);
+ if (dp == NULL)
return;
- }
- while ( (de = readdir (dp) ) != NULL )
- {
+ while ((de = readdir(dp)) != NULL) {
- if ( (strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0) )
+ if (de->d_name && DOT_OR_DOTDOT(de->d_name))
continue;
- snprintf (path, sizeof (path), "%s%s%s", dir_name,(last_char_is(dir_name,'/')==NULL)?"/":"", de->d_name);
-
- if (lstat (path, &statbuf) != 0)
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_ERR, "%s: %m\n", path);
-#endif
- continue;
- }
- switch(type)
- {
- case SERVICE:
- service(statbuf,path);
- break;
- case RESTORE:
- restore(path, statbuf, var);
- break;
- case READ_CONFIG:
- read_config_file (path, var, event_mask);
- break;
+ path = concat_path_file(dir_name, de->d_name);
+ if (lstat(path, &statbuf) == 0) {
+ switch (type) {
+ case SERVICE:
+ service(statbuf, path);
+ break;
+ case RESTORE:
+ restore(path, statbuf, var);
+ break;
+ case READ_CONFIG:
+ read_config_file(path, var, event_mask);
+ break;
+ }
}
+ free(path);
}
- closedir (dp);
+ closedir(dp);
} /* End Function do_scan_and_service */
-static int mksymlink (const char *oldpath, const char *newpath)
+static int mksymlink(const char *oldpath, const char *newpath)
/* [SUMMARY] Create a symlink, creating intervening directories as required.
<oldpath> The string contained in the symlink.
<newpath> The name of the new symlink.
[RETURNS] 0 on success, else -1.
*/
{
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "mksymlink()\n", newpath);
-#endif
-
-
- if ( !make_dir_tree (newpath) )
- return (-1);
+ if (!make_dir_tree(newpath))
+ return -1;
- if (symlink (oldpath, newpath) != 0)
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_ERR, "symlink(): %s to %s: %m\n", oldpath, newpath);
-#endif
+ if (symlink(oldpath, newpath) != 0) {
if (errno != EEXIST)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
} /* End Function mksymlink */
-static int make_dir_tree (const char *path)
+static int make_dir_tree(const char *path)
/* [SUMMARY] Creating intervening directories for a path as required.
- <path> The full pathname (including the leaf node).
+ <path> The full pathname(including the leaf node).
[RETURNS] TRUE on success, else FALSE.
*/
{
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "make_dir_tree()\n");
-#endif
- if (bb_make_directory( dirname((char *)path), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH ,FILEUTILS_RECUR )==-1)
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_ERR, "make_dir_tree(): %s: %m\n", path);
-#endif
- return (FALSE);
- }
- return(TRUE);
+ if (bb_make_directory(dirname((char *)path), -1, FILEUTILS_RECUR) == -1)
+ return FALSE;
+ return TRUE;
} /* End Function make_dir_tree */
static int expand_expression(char *output, unsigned int outsize,
- const char *input,
- const char *(*get_variable_func)(const char *variable, void *info),
- void *info,
- const char *devname,
- const regmatch_t *ex, unsigned int numexp)
-/* [SUMMARY] Expand enviroment variables and regular subexpressions in string.
+ const char *input,
+ const char *(*get_variable_func)(const char *variable, void *info),
+ void *info,
+ const char *devname,
+ const regmatch_t *ex, unsigned int numexp)
+/* [SUMMARY] Expand environment variables and regular subexpressions in string.
<output> The output expanded expression is written here.
<length> The size of the output buffer.
<input> The input expression. This may equal <<output>>.
{
char temp[STRING_LENGTH];
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "expand_expression()\n");
-#endif
-
- if ( !st_expr_expand (temp, STRING_LENGTH, input, get_variable_func, info) )
- return (FALSE);
- expand_regexp (output, outsize, temp, devname, ex, numexp);
- return (TRUE);
+ if (!st_expr_expand(temp, STRING_LENGTH, input, get_variable_func, info))
+ return FALSE;
+ expand_regexp(output, outsize, temp, devname, ex, numexp);
+ return TRUE;
} /* End Function expand_expression */
-static void expand_regexp (char *output, size_t outsize, const char *input,
- const char *devname,
- const regmatch_t *ex, unsigned int numex )
+static void expand_regexp(char *output, size_t outsize, const char *input,
+ const char *devname,
+ const regmatch_t *ex, unsigned int numex)
/* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9.
<output> The output expanded expression is written here.
<outsize> The size of the output buffer.
const char last_exp = '0' - 1 + numex;
int c = -1;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "expand_regexp()\n");
-#endif
-
/* Guarantee NULL termination by writing an explicit '\0' character into
the very last byte */
if (outsize)
/* Copy the input string into the output buffer, replacing '\\' with '\'
and '\0' .. '\9' with subexpressions 0 .. 9, if they exist. Other \x
codes are deleted */
- while ( (c != '\0') && (outsize != 0) )
- {
+ while ((c != '\0') && (outsize != 0)) {
c = *input;
++input;
- if (c == '\\')
- {
+ if (c == '\\') {
c = *input;
++input;
- if (c != '\\')
- {
- if ((c >= '0') && (c <= last_exp))
- {
+ if (c != '\\') {
+ if ((c >= '0') && (c <= last_exp)) {
const regmatch_t *subexp = ex + (c - '0');
unsigned int sublen = subexp->rm_eo - subexp->rm_so;
/* Range checking */
if (sublen > outsize)
sublen = outsize;
- strncpy (output, devname + subexp->rm_so, sublen);
+ strncpy(output, devname + subexp->rm_so, sublen);
output += sublen;
outsize -= sublen;
}
/* from compat_name.c */
-struct translate_struct
-{
- char *match; /* The string to match to (up to length) */
- char *format; /* Format of output, "%s" takes data past match string,
- NULL is effectively "%s" (just more efficient) */
+struct translate_struct {
+ const char *match; /* The string to match to(up to length) */
+ const char *format; /* Format of output, "%s" takes data past match string,
+ NULL is effectively "%s"(just more efficient) */
};
static struct translate_struct translate_table[] =
{NULL, NULL}
};
-const char *get_old_name (const char *devname, unsigned int namelen,
- char *buffer, unsigned int major, unsigned int minor)
+const char *get_old_name(const char *devname, unsigned int namelen,
+ char *buffer, unsigned int major, unsigned int minor)
/* [SUMMARY] Translate a kernel-supplied name into an old name.
<devname> The device name provided by the kernel.
<namelen> The length of the name.
*/
{
const char *compat_name = NULL;
- char *ptr;
+ const char *ptr;
struct translate_struct *trans;
-
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_old_name()\n");
-#endif
-
- for (trans = translate_table; trans->match != NULL; ++trans)
- {
- size_t len = strlen (trans->match);
-
- if (strncmp (devname, trans->match, len) == 0)
- {
+ unsigned int i;
+ char mode;
+ int indexx;
+ const char *pty1;
+ const char *pty2;
+ /* 1 to 5 "scsi/" , 6 to 9 "ide/host", 10 sbp/, 11 vcc/, 12 pty/ */
+ static const char *const fmt[] = {
+ NULL ,
+ "sg%u", /* scsi/generic */
+ NULL, /* scsi/disc */
+ "sr%u", /* scsi/cd */
+ NULL, /* scsi/part */
+ "nst%u%c", /* scsi/mt */
+ "hd%c" , /* ide/host/disc */
+ "hd%c" , /* ide/host/cd */
+ "hd%c%s", /* ide/host/part */
+ "%sht%d", /* ide/host/mt */
+ "sbpcd%u", /* sbp/ */
+ "vcs%s", /* vcc/ */
+ "%cty%c%c", /* pty/ */
+ NULL
+ };
+
+ for (trans = translate_table; trans->match != NULL; ++trans) {
+ char *after_match = is_prefixed_with(devname, trans->match);
+ if (after_match) {
if (trans->format == NULL)
- return (devname + len);
- sprintf (buffer, trans->format, devname + len);
- return (buffer);
+ return after_match;
+ sprintf(buffer, trans->format, after_match);
+ return buffer;
}
}
- if (strncmp (devname, "sbp/", 4) == 0)
- {
- sprintf (buffer, "sbpcd%u", minor);
+
+ ptr = bb_basename(devname);
+ i = scan_dev_name(devname, namelen, ptr);
+
+ if (i > 0 && i < 13)
compat_name = buffer;
+ else
+ return NULL;
+
+ /* 1 == scsi/generic, 3 == scsi/cd, 10 == sbp/ */
+ if (i == 1 || i == 3 || i == 10)
+ sprintf(buffer, fmt[i], minor);
+
+ /* 2 ==scsi/disc, 4 == scsi/part */
+ if (i == 2 || i == 4)
+ compat_name = write_old_sd_name(buffer, major, minor, ((i == 2) ? "" : (ptr + 4)));
+
+ /* 5 == scsi/mt */
+ if (i == 5) {
+ mode = ptr[2];
+ if (mode == 'n')
+ mode = '\0';
+ sprintf(buffer, fmt[i], minor & 0x1f, mode);
+ if (devname[namelen - 1] != 'n')
+ ++compat_name;
}
- else if (strncmp (devname, "scsi/", 5) == 0)
- { /* All SCSI devices */
- if (strcmp (devname + namelen - 7, "generic") == 0)
- {
- sprintf (buffer, "sg%u", minor);
- compat_name = buffer;
- }
- else if (strncmp (ptr = (strrchr (devname, '/') + 1), "mt", 2) == 0)
- {
- char mode = ptr[2];
-
- if (mode == 'n')
- mode = '\0';
- sprintf (buffer, "nst%u%c", minor & 0x1f, mode);
- compat_name = buffer;
- if (devname[namelen - 1] != 'n')
- ++compat_name;
- }
- else if (strcmp (devname + namelen - 2, "cd") == 0)
- {
- sprintf (buffer, "sr%u", minor);
- compat_name = buffer;
- }
- else if (strcmp (devname + namelen - 4, "disc") == 0)
- compat_name = write_old_sd_name (buffer, major, minor, "");
- else if (strncmp (ptr = (strrchr (devname, '/') + 1), "part", 4) == 0)
- compat_name = write_old_sd_name (buffer, major, minor, ptr + 4);
- return (compat_name);
- }
- else if (strncmp (devname, "ide/host", 8) == 0)
- { /* All IDE devices */
- if (strncmp (ptr = (strrchr (devname, '/') + 1), "mt", 2) == 0)
- {
- sprintf (buffer, "%sht%d", ptr + 2, minor & 0x7f);
- compat_name = buffer;
- }
- else if (strcmp (devname + namelen - 4, "disc") == 0)
- {
- sprintf ( buffer, "hd%c", get_old_ide_name (major, minor) );
- compat_name = buffer;
- }
- else if (strncmp (ptr = (strrchr (devname, '/') + 1), "part", 4) == 0)
- {
- sprintf (buffer, "hd%c%s", get_old_ide_name (major, minor), ptr + 4);
- compat_name = buffer;
- }
- else if (strcmp (devname + namelen - 2, "cd") == 0)
- {
- sprintf ( buffer, "hd%c", get_old_ide_name (major, minor) );
- compat_name = buffer;
- }
- return (compat_name);
- }
- else if (strncmp (devname, "vcc/", 4) == 0)
- {
- sprintf (buffer, "vcs%s", devname + 4);
+ /* 6 == ide/host/disc, 7 == ide/host/cd, 8 == ide/host/part */
+ if (i == 6 || i == 7 || i == 8)
+ /* last arg should be ignored for i == 6 or i== 7 */
+ sprintf(buffer, fmt[i] , get_old_ide_name(major, minor), ptr + 4);
+
+ /* 9 == ide/host/mt */
+ if (i == 9)
+ sprintf(buffer, fmt[i], ptr + 2, minor & 0x7f);
+
+ /* 11 == vcc/ */
+ if (i == 11) {
+ sprintf(buffer, fmt[i], devname + 4);
if (buffer[3] == '0')
buffer[3] = '\0';
- compat_name = buffer;
}
- else if (strncmp (devname, "pty/", 4) == 0)
- {
- int indexx = atoi (devname + 5);
- const char *pty1 = "pqrstuvwxyzabcde";
- const char *pty2 = "0123456789abcdef";
-
- sprintf (buffer, "%cty%c%c", (devname[4] == 'm') ? 'p' : 't', pty1[indexx >> 4], pty2[indexx & 0x0f]);
- compat_name = buffer;
+ /* 12 == pty/ */
+ if (i == 12) {
+ pty1 = "pqrstuvwxyzabcde";
+ pty2 = "0123456789abcdef";
+ indexx = atoi(devname + 5);
+ sprintf(buffer, fmt[i], (devname[4] == 'm') ? 'p' : 't', pty1[indexx >> 4], pty2[indexx & 0x0f]);
}
- return (compat_name);
+ return compat_name;
} /* End Function get_old_name */
-static char get_old_ide_name (unsigned int major, unsigned int minor)
+static char get_old_ide_name(unsigned int major, unsigned int minor)
/* [SUMMARY] Get the old IDE name for a device.
<major> The major number for the device.
<minor> The minor number for the device.
[RETURNS] The drive letter.
*/
{
- char letter='y'; /* 121 */
- char c='a'; /* 97 */
- int i=IDE0_MAJOR;
-
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_old_ide_name()\n");
-#endif
+ char letter = 'y'; /* 121 */
+ char c = 'a'; /* 97 */
+ int i = IDE0_MAJOR;
/* I hope it works like the previous code as it saves a few bytes. Tito ;P */
do {
- if( i==IDE0_MAJOR || i==IDE1_MAJOR || i==IDE2_MAJOR ||
- i==IDE3_MAJOR || i==IDE4_MAJOR || i==IDE5_MAJOR ||
- i==IDE6_MAJOR || i==IDE7_MAJOR || i==IDE8_MAJOR ||
- i==IDE9_MAJOR )
- {
- if(i==major)
- {
- letter=c;
+ if (i == IDE0_MAJOR || i == IDE1_MAJOR || i == IDE2_MAJOR
+ || i == IDE3_MAJOR || i == IDE4_MAJOR || i == IDE5_MAJOR
+ || i == IDE6_MAJOR || i == IDE7_MAJOR || i == IDE8_MAJOR
+ || i == IDE9_MAJOR
+ ) {
+ if ((unsigned int)i == major) {
+ letter = c;
break;
}
- c+=2;
+ c += 2;
}
i++;
- } while(i<=IDE9_MAJOR);
+ } while (i <= IDE9_MAJOR);
if (minor > 63)
++letter;
- return (letter);
+ return letter;
} /* End Function get_old_ide_name */
-static char *write_old_sd_name (char *buffer,
+static char *write_old_sd_name(char *buffer,
unsigned int major, unsigned int minor,
- char *part)
+ const char *part)
/* [SUMMARY] Write the old SCSI disc name to a buffer.
<buffer> The buffer to write to.
<major> The major number for the device.
{
unsigned int disc_index;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "write_old_sd_name()\n");
-#endif
-
- if (major == 8)
- {
- sprintf (buffer, "sd%c%s", 'a' + (minor >> 4), part);
- return (buffer);
+ if (major == 8) {
+ sprintf(buffer, "sd%c%s", 'a' + (minor >> 4), part);
+ return buffer;
}
- if ( (major > 64) && (major < 72) )
- {
- disc_index = ( (major - 64) << 4 ) + (minor >> 4);
+ if ((major > 64) && (major < 72)) {
+ disc_index = ((major - 64) << 4) +(minor >> 4);
if (disc_index < 26)
- sprintf (buffer, "sd%c%s", 'a' + disc_index, part);
+ sprintf(buffer, "sd%c%s", 'a' + disc_index, part);
else
- sprintf (buffer, "sd%c%c%s", 'a' + (disc_index / 26) - 1, 'a' + disc_index % 26,part);
- return (buffer);
+ sprintf(buffer, "sd%c%c%s", 'a' +(disc_index / 26) - 1, 'a' + disc_index % 26, part);
+ return buffer;
}
- return (NULL);
+ return NULL;
} /* End Function write_old_sd_name */
/*EXPERIMENTAL_FUNCTION*/
-int st_expr_expand (char *output, unsigned int length, const char *input,
- const char *(*get_variable_func) (const char *variable,
- void *info),
- void *info)
+int st_expr_expand(char *output, unsigned int length, const char *input,
+ const char *(*get_variable_func)(const char *variable,
+ void *info),
+ void *info)
/* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules.
<output> The output expanded expression is written here.
<length> The size of the output buffer.
struct passwd *pwent;
char buffer[BUFFER_SIZE], tmp[STRING_LENGTH];
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "st_expr_expand()\n");
-#endif
-
if (length > BUFFER_SIZE)
length = BUFFER_SIZE;
- for (; TRUE; ++input)
- {
- switch (ch = *input)
- {
+ for (; TRUE; ++input) {
+ switch (ch = *input) {
case '$':
/* Variable expansion */
- input = expand_variable (buffer, length, &out_pos, ++input, get_variable_func, info);
+ input = expand_variable(buffer, length, &out_pos, ++input, get_variable_func, info);
if (input == NULL)
- return (FALSE);
+ return FALSE;
break;
case '~':
/* Home directory expansion */
ch = input[1];
- if ( isspace (ch) || (ch == '/') || (ch == '\0') )
- {
+ if (isspace(ch) ||(ch == '/') ||(ch == '\0')) {
/* User's own home directory: leave separator for next time */
- if ( ( env = getenv ("HOME") ) == NULL )
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, bb_msg_variable_not_found, "HOME");
-#endif
- return (FALSE);
+ env = getenv("HOME");
+ if (env == NULL) {
+ info_logger(LOG_INFO, bb_msg_variable_not_found, "HOME");
+ return FALSE;
}
- len = strlen (env);
+ len = strlen(env);
if (len + out_pos >= length)
goto st_expr_expand_out;
- memcpy (buffer + out_pos, env, len + 1);
+ memcpy(buffer + out_pos, env, len + 1);
out_pos += len;
continue;
}
/* Someone else's home directory */
- for (ptr = ++input; !isspace (ch) && (ch != '/') && (ch != '\0'); ch = *++ptr)
- /* VOID */ ;
+ for (ptr = ++input; !isspace(ch) && (ch != '/') && (ch != '\0'); ch = *++ptr)
+ /* VOID */;
len = ptr - input;
if (len >= sizeof tmp)
goto st_expr_expand_out;
- safe_memcpy (tmp, input, len);
+ safe_memcpy(tmp, input, len);
input = ptr - 1;
- if ( ( pwent = getpwnam (tmp) ) == NULL )
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, "getpwnam(): %s\n", tmp);
-#endif
- return (FALSE);
+ pwent = getpwnam(tmp);
+ if (pwent == NULL) {
+ info_logger(LOG_INFO, "no pwent for: %s", tmp);
+ return FALSE;
}
- len = strlen (pwent->pw_dir);
+ len = strlen(pwent->pw_dir);
if (len + out_pos >= length)
goto st_expr_expand_out;
- memcpy (buffer + out_pos, pwent->pw_dir, len + 1);
+ memcpy(buffer + out_pos, pwent->pw_dir, len + 1);
out_pos += len;
break;
case '\0':
if (out_pos >= length)
goto st_expr_expand_out;
buffer[out_pos++] = ch;
- if (ch == '\0')
- {
- memcpy (output, buffer, out_pos);
- return (TRUE);
+ if (ch == '\0') {
+ memcpy(output, buffer, out_pos);
+ return TRUE;
}
break;
/* esac */
}
}
- return (FALSE);
+ return FALSE;
st_expr_expand_out:
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, bb_msg_small_buffer);
-#endif
- return (FALSE);
+ info_logger(LOG_INFO, bb_msg_small_buffer);
+ return FALSE;
} /* End Function st_expr_expand */
/* Private functions follow */
-static const char *expand_variable (char *buffer, unsigned int length,
- unsigned int *out_pos, const char *input,
- const char *(*func) (const char *variable,
- void *info),
- void *info)
+static const char *expand_variable(char *buffer, unsigned int length,
+ unsigned int *out_pos, const char *input,
+ const char *(*func)(const char *variable,
+ void *info),
+ void *info)
/* [SUMMARY] Expand a variable.
<buffer> The buffer to write to.
<length> The length of the output buffer.
const char *env, *ptr;
char tmp[STRING_LENGTH];
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "expand_variable()\n");
-#endif
-
ch = input[0];
- if (ch == '$')
- {
+ if (ch == '$') {
/* Special case for "$$": PID */
- sprintf ( tmp, "%d", (int) getpid () );
- len = strlen (tmp);
+ sprintf(tmp, "%d", (int) getpid());
+ len = strlen(tmp);
if (len + *out_pos >= length)
goto expand_variable_out;
- memcpy (buffer + *out_pos, tmp, len + 1);
+ memcpy(buffer + *out_pos, tmp, len + 1);
out_pos += len;
- return (input);
+ return input;
}
/* Ordinary variable expansion, possibly in braces */
- if (ch != '{')
- {
+ if (ch != '{') {
/* Simple variable expansion */
- for (ptr = input; isalnum (ch) || (ch == '_') || (ch == ':');ch = *++ptr)
- /* VOID */ ;
+ for (ptr = input; isalnum(ch) || (ch == '_') || (ch == ':'); ch = *++ptr)
+ /* VOID */;
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
- safe_memcpy (tmp, input, len);
+ safe_memcpy(tmp, input, len);
input = ptr - 1;
- if ( ( env = get_variable_v2 (tmp, func, info) ) == NULL )
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, bb_msg_variable_not_found, tmp);
-#endif
- return (NULL);
+ env = get_variable_v2(tmp, func, info);
+ if (env == NULL) {
+ info_logger(LOG_INFO, bb_msg_variable_not_found, tmp);
+ return NULL;
}
- len = strlen (env);
+ len = strlen(env);
if (len + *out_pos >= length)
goto expand_variable_out;
- memcpy (buffer + *out_pos, env, len + 1);
+ memcpy(buffer + *out_pos, env, len + 1);
*out_pos += len;
- return (input);
+ return input;
}
/* Variable in braces: check for ':' tricks */
ch = *++input;
- for (ptr = input; isalnum (ch) || (ch == '_'); ch = *++ptr)
+ for (ptr = input; isalnum(ch) || (ch == '_'); ch = *++ptr)
/* VOID */;
- if (ch == '}')
- {
+ if (ch == '}') {
/* Must be simple variable expansion with "${var}" */
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
- safe_memcpy (tmp, input, len);
- ptr = expand_variable (buffer, length, out_pos, tmp, func, info );
+ safe_memcpy(tmp, input, len);
+ ptr = expand_variable(buffer, length, out_pos, tmp, func, info);
if (ptr == NULL)
- return (NULL);
- return (input + len);
+ return NULL;
+ return input + len;
}
- if (ch != ':' || ptr[1] != '-' )
- {
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO,"illegal char in var name\n");
-#endif
- return (NULL);
+ if (ch != ':' || ptr[1] != '-') {
+ info_logger(LOG_INFO, "illegal char in var name");
+ return NULL;
}
/* It's that handy "${var:-word}" expression. Check if var is defined */
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
- safe_memcpy (tmp, input, len);
+ safe_memcpy(tmp, input, len);
/* Move input pointer to ':' */
input = ptr;
/* First skip to closing brace, taking note of nested expressions */
ptr += 2;
ch = ptr[0];
- for (open_braces = 1; open_braces > 0; ch = *++ptr)
- {
- switch (ch)
- {
+ for (open_braces = 1; open_braces > 0; ch = *++ptr) {
+ switch (ch) {
case '{':
++open_braces;
break;
--open_braces;
break;
case '\0':
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO,"\"}\" not found in: %s\n", input);
-#endif
- return (NULL);
+ info_logger(LOG_INFO, "\"}\" not found in: %s", input);
+ return NULL;
default:
break;
}
}
--ptr;
/* At this point ptr should point to closing brace of "${var:-word}" */
- if ( ( env = get_variable_v2 (tmp, func, info) ) != NULL )
- {
+ env = get_variable_v2(tmp, func, info);
+ if (env != NULL) {
/* Found environment variable, so skip the input to the closing brace
and return the variable */
input = ptr;
- len = strlen (env);
+ len = strlen(env);
if (len + *out_pos >= length)
goto expand_variable_out;
- memcpy (buffer + *out_pos, env, len + 1);
+ memcpy(buffer + *out_pos, env, len + 1);
*out_pos += len;
- return (input);
+ return input;
}
/* Environment variable was not found, so process word. Advance input
pointer to start of word in "${var:-word}" */
input += 2;
len = ptr - input;
- if (len >= sizeof tmp)
+ if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
- safe_memcpy (tmp, input, len);
+ safe_memcpy(tmp, input, len);
input = ptr;
- if ( !st_expr_expand (tmp, STRING_LENGTH, tmp, func, info ) )
- return (NULL);
- len = strlen (tmp);
+ if (!st_expr_expand(tmp, STRING_LENGTH, tmp, func, info))
+ return NULL;
+ len = strlen(tmp);
if (len + *out_pos >= length)
goto expand_variable_out;
- memcpy (buffer + *out_pos, tmp, len + 1);
+ memcpy(buffer + *out_pos, tmp, len + 1);
*out_pos += len;
- return (input);
+ return input;
expand_variable_out:
-#ifdef CONFIG_DEVFSD_VERBOSE
- msg_logger( NO_DIE, LOG_INFO, bb_msg_small_buffer);
-#endif
- return (NULL);
+ info_logger(LOG_INFO, bb_msg_small_buffer);
+ return NULL;
} /* End Function expand_variable */
-static const char *get_variable_v2 (const char *variable,
- const char *(*func) (const char *variable, void *info),
- void *info)
+static const char *get_variable_v2(const char *variable,
+ const char *(*func)(const char *variable, void *info),
+ void *info)
/* [SUMMARY] Get a variable from the environment or .
<variable> The variable name.
<func> A function which will be used to get the variable. If this returns
{
const char *value;
-#ifdef CONFIG_DEVFSD_DEBUG
- msg_logger( NO_DIE, LOG_INFO, "get_variable_v2()\n");
-#endif
-
- if (func != NULL)
- {
- value = (*func) (variable, info);
+ if (func != NULL) {
+ value = (*func)(variable, info);
if (value != NULL)
- return (value);
+ return value;
}
- return getenv (variable);
+ return getenv(variable);
} /* End Function get_variable */
/* END OF CODE */