X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fdevfsd.c;h=f99a9462892b7f8188d4c269d295d4b36bf2c116;hb=2c99851181a652358aa3ca58ef38c57e46ae02e4;hp=a53328fab4d0d805f9134e294530c2835040b199;hpb=2af70005b9ca97fa45cf2531a1a63e50a40efb37;p=oweals%2Fbusybox.git diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index a53328fab..f99a94628 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -49,8 +49,8 @@ Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. */ -#include "libbb.h" #include "busybox.h" +#include "xregex.h" #include #include #include @@ -68,7 +68,6 @@ #include #include #include -#include #include #include @@ -93,7 +92,7 @@ #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 @@ -102,8 +101,9 @@ #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 */ +#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 */ @@ -118,17 +118,13 @@ struct devfsd_notify_struct 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_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 STRING_LENGTH 255 @@ -137,11 +133,15 @@ struct devfsd_notify_struct #define UID 0 #define GID 1 -/* for msg_logger(), do_ioctl(), - fork_and_execute() and xopendir(). */ -# define DIE 1 +/* fork_and_execute() */ +# define DIE 1 # define NO_DIE 0 +/* for dir_operation() */ +#define RESTORE 0 +#define SERVICE 1 +#define READ_CONFIG 2 + /* Update only after changing code to reflect new protocol */ #define DEVFSD_PROTOCOL_REVISION_DAEMON 5 @@ -151,11 +151,11 @@ struct devfsd_notify_struct #endif #define AC_PERMISSIONS 0 -#define AC_MODLOAD 1 /* not supported by busybox */ +#define AC_MODLOAD 1 #define AC_EXECUTE 2 #define AC_MFUNCTION 3 /* not supported by busybox */ #define AC_CFUNCTION 4 /* not supported by busybox */ -#define AC_COPY 5 +#define AC_COPY 5 #define AC_IGNORE 6 #define AC_MKOLDCOMPAT 7 #define AC_MKNEWCOMPAT 8 @@ -163,7 +163,6 @@ struct devfsd_notify_struct #define AC_RMNEWCOMPAT 10 #define AC_RESTORE 11 - struct permissions_type { mode_t mode; @@ -209,26 +208,28 @@ struct get_variable_info char devpath[STRING_LENGTH]; }; +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 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 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); +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 do_restore (const char *, int); +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 void do_scan_and_service (const char *); 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 ); @@ -240,12 +241,14 @@ static char get_old_ide_name (unsigned , unsigned); static char *write_old_sd_name (char *, unsigned, unsigned, 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 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 ); -DIR * xopendir(int die, const char * dir_name); static int get_uid_gid ( int, const char *); 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); /* Structs and vars */ static struct config_entry_struct *first_config = NULL; @@ -283,42 +286,67 @@ static struct event_type {0xffffffff, NULL} }; -/* busybox functions and messages */ +/* Busybox messages */ -extern void xregcomp(regex_t * preg, const char *regex, int cflags); +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"; -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"; -#endif - -static void msg_logger(int die, int pri, const char * fmt, ... ) +/* Busybox functions */ +static void msg_logger(int pri, const char * fmt, ... ) { va_list ap; + int ret; va_start(ap, fmt); - if (access ("/dev/log", F_OK) == 0) - { + ret = access ("/dev/log", F_OK); + if (ret == 0) { openlog(bb_applet_name, 0, LOG_DAEMON); - vsyslog( pri , fmt , ap); + vsyslog( pri , fmt, ap); + /* Man: A trailing newline is added when needed. */ closelog(); - } -#ifndef CONFIG_DEVFSD_VERBOSE - else -#endif - bb_verror_msg(fmt, ap); + } + /* 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); - if(die==DIE) - exit(EXIT_FAILURE); } +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 void do_ioctl(int die, int fd, int request, unsigned long event_mask_flag) +/* 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 defined(CONFIG_DEBUG) +#define debug_msg_logger(x, fmt, args...) msg_logger(x, fmt, ## args) +#else +#define debug_msg_logger(x, fmt, args...) +#endif +#else +#define debug_msg_logger(x, 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...) +#endif + +static void do_ioctl_and_die(int fd, int request, unsigned long event_mask_flag) { - if (ioctl (fd, request, event_mask_flag) != 0) - msg_logger(die, LOG_ERR, "ioctl() failed: %m\n"); + 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 ) @@ -330,7 +358,9 @@ static void fork_and_execute(int die, char *arg0, char **arg ) break; case -1: /* Parent: Error : die or return */ - msg_logger(die, LOG_ERR,(char *) bb_msg_memory_exhausted); + msg_logger(LOG_ERR,(char *) bb_msg_memory_exhausted); + if(die) + exit(EXIT_FAILURE); return; default: /* Parent : ok : return or exit */ @@ -345,25 +375,58 @@ static void fork_and_execute(int die, char *arg0, char **arg ) if(arg0 != NULL ) { execvp (arg0, arg); - msg_logger(DIE, LOG_ERR, "execvp() failed: %s: %m\n", arg0); + msg_logger_and_die(LOG_ERR, "execvp"); } } - -DIR * xopendir(int die, const char * dir_name) +static void safe_memcpy( char *dest, const char *src, int len) { - DIR *dp; + memcpy (dest , src , len ); + dest[len] = '\0'; +} - if ( ( dp = opendir (dir_name) ) == NULL ) - msg_logger( die, LOG_ERR, "opendir() failed: %s: %m\n", dir_name); - /* if die == DIE not reached else return NULL */ - return dp; +static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, char *ptr) +{ + if( d[n - 4]=='d' && d[n - 3]=='i' && d[n - 2]=='s' && d[n - 1]=='c') + return (2 + addendum); + else if( d[n - 2]=='c' && d[n - 1]=='d') + return (3 + addendum); + else if(ptr[0]=='p' && ptr[1]=='a' && ptr[2]=='r' && ptr[3]=='t') + return (4 + addendum); + else if( ptr[n - 2]=='m' && ptr[n - 1]=='t') + return (5 + addendum); + else + return 0; } -static void safe_memcpy( char *dest, const char *src, int len) +static unsigned int scan_dev_name(const char *d, unsigned int n, char *ptr) { - memcpy (dest , src , len ); - dest[len] = '\0'; + 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); + } + else 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); + } + else if(d[0]=='s' && d[1]=='b' && d[2]=='p' && d[3]=='/') + { + return 10; + } + else if(d[0]=='v' && d[1]=='c' && d[2]=='c' && d[3]=='/') + { + return 11; + } + else if(d[0]=='p' && d[1]=='t' && d[2]=='y' && d[3]=='/') + { + return 12; + } + return 0; } /* Public functions follow */ @@ -373,6 +436,7 @@ 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; @@ -383,27 +447,37 @@ int devfsd_main (int argc, char **argv) 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(); + 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(); + } } + /* 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]; if (chdir (mount_point) != 0) - bb_error_msg_and_die( " %s: %m", mount_point); + devfsd_perror_msg_and_die(mount_point); fd = bb_xopen (".devfsd", O_RDONLY); if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0) - bb_error_msg( "FD_CLOEXEC"); + devfsd_perror_msg_and_die("FD_CLOEXEC"); - do_ioctl(DIE, fd, DEVFSDIOC_GET_PROTO_REV,(int )&proto_rev); + if (ioctl (fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev) == -1) + msg_logger_and_die(LOG_ERR, "ioctl"); /*setup initial entries */ for (curr = initial_symlinks; curr->dest != NULL; ++curr) @@ -421,7 +495,7 @@ int devfsd_main (int argc, char **argv) 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); + do_ioctl_and_die(fd, DEVFSDIOC_SET_EVENT_MASK, 0); sigemptyset (&new_action.sa_mask); new_action.sa_flags = 0; @@ -429,42 +503,43 @@ 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 ) - bb_error_msg_and_die( "sigaction()"); + devfsd_error_msg_and_die( "sigaction"); bb_printf("%s v%s started for %s\n",bb_applet_name, DEVFSD_VERSION, mount_point); - /* Set umask so that mknod(2), open(2) and mkdir(2) have complete control over permissions */ + /* 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); /* Do the scan before forking, so that boot scripts see the finished product */ - do_scan_and_service (mount_point); - if (no_polling) + dir_operation(SERVICE,mount_point,0,NULL); + + if (ENABLE_DEVFSD_FG_NP && no_polling) exit (0); if (do_daemon) { /* Release so that the child can grab it */ - do_ioctl(DIE, fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0); + do_ioctl_and_die(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0); fork_and_execute(DIE, NULL, NULL); setsid (); /* Prevent hangups and become pgrp leader */ - } - else + } else if(ENABLE_DEVFSD_FG_NP) { setpgid (0, 0); /* Become process group leader */ + } while (TRUE) { - int do_scan = do_servicing (fd, event_mask); + do_scan = do_servicing (fd, event_mask); free_config (); read_config_file (CONFIG_FILE, FALSE, &event_mask); if (do_scan) - do_scan_and_service (mount_point); + dir_operation(SERVICE,mount_point,0,NULL); } } /* 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. The path to read the database from. If this is a directory, all entries in that directory will be read (except hidden entries). @@ -476,56 +551,45 @@ static void read_config_file (const char *path, int optional, unsigned long *eve 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 + debug_msg_logger(LOG_INFO, "%s: %s", __FUNCTION__, path); - if (stat (path, &statbuf) != 0 || statbuf.st_size == 0 ) - msg_logger((optional == 0 )? DIE : NO_DIE, LOG_ERR, " %s: %m\n", path); - - if ( S_ISDIR (statbuf.st_mode) ) + if (stat (path, &statbuf) == 0 ) { - - DIR *dp; - struct dirent *de; - - dp = xopendir(DIE, path); - - while ( ( de = readdir (dp) ) != NULL ) + /* Don't read 0 length files: ignored */ + /*if( statbuf.st_size == 0 ) + return;*/ + if ( S_ISDIR (statbuf.st_mode) ) { - char fname[STRING_LENGTH]; + /* 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'; - if (de->d_name[0] == '.') - continue; - snprintf (fname, STRING_LENGTH, "%s/%s", path, de->d_name); - read_config_file (fname, optional, event_mask); + dir_operation(READ_CONFIG, path, 0, event_mask); + return; } - closedir (dp); - return; - } - - if ( ( fp = fopen (path, "r") ) != NULL ) - { - while (fgets (buf, STRING_LENGTH, fp) != NULL) + if ( ( fp = fopen (path, "r") ) != NULL ) { - char *line; - - 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); + while (fgets (buf, STRING_LENGTH, fp) != NULL) + { + /* Skip whitespace */ + for (line = buf; isspace (*line); ++line) + /*VOID*/; + if (line[0] == '\0' || line[0] == '#' ) + continue; + process_config_line (line, event_mask); + } + fclose (fp); + } else { + goto read_config_file_err; } - fclose (fp); -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO, "read config file: %s\n", path); -#endif - return; + } else { +read_config_file_err: + if(optional == 0 && errno == ENOENT) + msg_logger_and_die(LOG_ERR, "read config file: %s: %m", path); } - msg_logger(( (optional == 0) && (errno == ENOENT) )? DIE : NO_DIE, LOG_ERR, " %s: %m\n", path); + return; } /* End Function read_config_file */ static void process_config_line (const char *line, unsigned long *event_mask) @@ -541,33 +605,49 @@ static void process_config_line (const char *line, unsigned long *event_mask) char when[STRING_LENGTH], what[STRING_LENGTH]; char name[STRING_LENGTH]; char * msg=""; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "process_config_line()\n"); -#endif + char *ptr; + 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 + }; + + debug_msg_logger(LOG_INFO, __FUNCTION__); 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) + + i = compare_string_array(options, when ); + + /*"CLEAR_CONFIG"*/ + if( i == 0) { free_config (); *event_mask = 0; return; } - if (num_args < 2) + + if ( num_args < 2) goto process_config_line_err; - if ( (strcasecmp (when, "INCLUDE") == 0) || - (strcasecmp (when, "OPTIONAL_INCLUDE") == 0) ) + /* "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); read_config_file (name, (toupper (when[0]) == 'I') ? FALSE : TRUE, event_mask); return; } - if (strcasecmp (when, "RESTORE") == 0) + /* "RESTORE" */ + if( i == 3) { - do_restore ( name, strlen (name) ); + dir_operation(RESTORE,name, strlen (name),NULL); return; } if (num_args < 3) @@ -589,59 +669,71 @@ static void process_config_line (const char *line, unsigned long *event_mask) goto process_config_line_err; } - if (strcasecmp (what, "PERMISSIONS") == 0) - { - char *ptr; - - 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 */ - } - - *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]); - } - else if (strcasecmp (what, "EXECUTE") == 0) - { - new->action.what = AC_EXECUTE; - num_args -= 3; - - for (count = 0; count < num_args; ++count) - new->u.execute.argv[count] = bb_xstrdup (p[count]); + i = compare_string_array(options, what ); - new->u.execute.argv[num_args] = NULL; - } - else if (strcasecmp (what, "COPY") == 0) + switch(i) { - new->action.what = AC_COPY; - num_args -= 3; - if (num_args != 2) - goto process_config_line_err; /* missing path and function in line */ + case 4: /* "PERMISSIONS" */ + 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"*/ + } - 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; - } + *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]); + + 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 = bb_xstrdup (p[0]); + new->u.copy.destination = bb_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); @@ -654,7 +746,7 @@ static void process_config_line (const char *line, unsigned long *event_mask) last_config = new; return; process_config_line_err: - msg_logger( DIE, LOG_ERR, bb_msg_bad_config, msg , line); + 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) @@ -668,17 +760,11 @@ static int do_servicing (int fd, unsigned long event_mask) struct devfsd_notify_struct info; unsigned long tmp_event_mask; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "do_servicing()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); + /* Tell devfs what events we care about */ tmp_event_mask = event_mask; - /* May need to trap inode creates to watch for syslogd(8) starting */ - /*if (!syslog_is_open && !no_syslog) - { - tmp_event_mask |= 1 << DEVFSD_NOTIFY_CREATE; *//*FIXME I'm not sure if this line is needed. TITO */ - /*}*/ - do_ioctl(DIE, fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask); + do_ioctl_and_die(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask); while (!caught_signal) { errno = 0; @@ -689,14 +775,6 @@ static int do_servicing (int fd, unsigned long event_mask) continue; /* Yes, the order is important */ if (bytes < 1) break; - /* Special trap for "/dev/log" creation */ - /* Open syslog, now that "/dev/log" exists */ - /*if (!syslog_is_open && !no_syslog && - (info.type == DEVFSD_NOTIFY_CREATE) &&(strcmp (info.devname, "log") == 0) ) - { - do_open_syslog (); - do_ioctl(DIE, fd, DEVFSDIOC_SET_EVENT_MASK, event_mask);*/ /*FIXME I'm not sure if this line is needed. TITO */ - /*}*/ service_name (&info); } if (caught_signal) @@ -707,11 +785,7 @@ static int do_servicing (int fd, unsigned long event_mask) caught_sighup = FALSE; 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) @@ -724,18 +798,18 @@ static void service_name (const struct devfsd_notify_struct *info) 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 + debug_msg_logger(LOG_INFO, __FUNCTION__); + if (ENABLE_DEBUG && info->overrun_count > 0) + debug_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)))) + 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) { @@ -744,44 +818,35 @@ static void service_name (const struct devfsd_notify_struct *info) continue; for (n = 0; (n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) /* VOID */; + + debug_msg_logger(LOG_INFO, "%s: action.what %d", __FUNCTION__, 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); break; + case AC_MODLOAD: + if(ENABLE_DEVFSD_MODLOAD) + action_modload (info, entry); + break; case AC_EXECUTE: -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "AC_EXECUTE\n"); -#endif 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); 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); break; default: - msg_logger( DIE, LOG_ERR, "Unknown action\n"); - /*break;*/ + msg_logger_and_die(LOG_ERR, "Unknown action"); } } } /* End Function service_name */ @@ -796,22 +861,39 @@ static void action_permissions (const struct devfsd_notify_struct *info, { struct stat statbuf; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "action_permission()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); 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() error for: %s: %m\n",info->devname); -#endif - return; + msg_logger(LOG_ERR, "Can't chmod or chown: %s: %m",info->devname); } - } /* End Function action_permissions */ +static void action_modload (const struct devfsd_notify_struct *info, + const struct config_entry_struct *entry ATTRIBUTE_UNUSED) +/* [SUMMARY] Load a module. + The devfs change. + The config file entry. + [RETURNS] Nothing. +*/ +{ + char *argv[6]; + char device[STRING_LENGTH]; + + argv[0] = MODPROBE; + argv[1] = MODPROBE_SWITCH_1; /* "-k" */ + argv[2] = MODPROBE_SWITCH_2; /* "-C" */ + argv[3] = CONFIG_MODULES_DEVFS; + argv[4] = device; + argv[5] = NULL; + + snprintf (device, sizeof (device), "/dev/%s", info->devname); + debug_msg_logger(LOG_INFO, "%s: %s %s %s %s %s",__FUNCTION__, argv[0],argv[1],argv[2],argv[3],argv[4]); + fork_and_execute(DIE, argv[0], argv); +} /* End Function action_modload */ + static void action_execute (const struct devfsd_notify_struct *info, const struct config_entry_struct *entry, const regmatch_t *regexpr, unsigned int numexpr) @@ -829,10 +911,7 @@ static void action_execute (const struct devfsd_notify_struct *info, char *argv[MAX_ARGS + 1]; char largv[MAX_ARGS + 1][STRING_LENGTH]; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "action_execute()\n"); -#endif - + debug_msg_logger(LOG_INFO ,__FUNCTION__); gv_info.info = info; gv_info.devname = info->devname; snprintf (gv_info.devpath, sizeof (gv_info.devpath), "%s/%s", mount_point, info->devname); @@ -845,30 +924,13 @@ static void action_execute (const struct devfsd_notify_struct *info, argv[count] = largv[count]; } argv[count] = NULL; - -#ifdef CONFIG_DEVFSD_DEBUG - int i; - char buff[1024]; - - 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); } /* 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) + const regmatch_t *regexpr, unsigned int numexpr) /* [SUMMARY] Copy permissions. The devfs change. The config file entry. @@ -882,18 +944,18 @@ static void action_copy (const struct devfsd_notify_struct *info, 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 + debug_msg_logger(LOG_INFO, __FUNCTION__); + + dest_stat.st_mode = 0; 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); + 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); @@ -903,41 +965,48 @@ static void action_copy (const struct devfsd_notify_struct *info, regexpr, numexpr); if ( !make_dir_tree (destination) || lstat (source, &source_stat) != 0) - goto action_copy_error; - + return; 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) ) new_mode |= S_ISVTX; -#ifdef CONFIG_DEVFSD_VERBOSE - if ( !copy_inode (destination, &dest_stat, new_mode, source, &source_stat) ) -action_copy_error: - msg_logger( NO_DIE, LOG_ERR, "error copying: %s to %s: %m\n", source, destination); -#else - copy_inode (destination, &dest_stat, new_mode, source,&source_stat); -action_copy_error: + ret = copy_inode (destination, &dest_stat, new_mode, source, &source_stat); + if (ENABLE_DEBUG && ret && (errno != EEXIST)) + debug_msg_logger(LOG_ERR, "copy_inode: %s to %s: %m", source, destination); return; -#endif } /* 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. The devfs change. The action to take. [RETURNS] Nothing. */ { + int ret; const char *compat_name = NULL; const char *dest_name = info->devname; - char *ptr; + char *ptr=NULL; 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) @@ -948,80 +1017,54 @@ static void action_compat (const struct devfsd_notify_struct *info, break; case AC_MKNEWCOMPAT: case AC_RMNEWCOMPAT: - if (strncmp (info->devname, "scsi/", 5) == 0) - { - int mode, host, bus, target, lun; + ptr = strrchr (info->devname, '/') + 1; + 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); + debug_msg_logger(LOG_INFO, "%s: scan_dev_name = %d", __FUNCTION__, i); + + /* 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; - } - if (compat_name == NULL) + /* 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; + + debug_msg_logger( LOG_INFO, "%s: %s", __FUNCTION__, compat_name); + /* Now decide what to do with it */ switch (action) { @@ -1031,63 +1074,32 @@ static void action_compat (const struct devfsd_notify_struct *info, 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) + debug_msg_logger(LOG_ERR, "unlink: %s: %m", compat_name); break; - } + /*esac*/ + } /* switch(action) */ } /* End Function action_compat */ -static void do_restore (const char *dir_name, int rootlen) -/* [SUMMARY] Restore state from a directory. - The directory containing the backing store. - The length of the root of the state directory hierarchy. - [RETURNS] Nothing. -*/ +static void restore(char *spath, struct stat source_stat, int rootlen) { - DIR *dp; - struct dirent *de; - -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "do_restore()\n"); -#endif - - if( (dp = xopendir(NO_DIE, dir_name))== NULL) - return; - - while ( (de = readdir (dp) ) != NULL ) - { - char spath[STRING_LENGTH], dpath[STRING_LENGTH]; - - struct stat source_stat, dest_stat; - dest_stat.st_mode = 0; + char dpath[STRING_LENGTH]; + struct stat dest_stat; - if ( (strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0) ) - continue; + debug_msg_logger(LOG_INFO, __FUNCTION__); - snprintf (spath, sizeof spath, "%s/%s", dir_name, de->d_name); + dest_stat.st_mode = 0; + snprintf (dpath, sizeof dpath, "%s%s", mount_point, spath + rootlen); + lstat (dpath, &dest_stat); - if (lstat (spath, &source_stat) != 0) - { -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_ERR, "%s: %m\n", spath); -#endif - continue; - } - 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_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); +} - if ( S_ISDIR (source_stat.st_mode) ) - do_restore (spath, rootlen); - } - closedir (dp); -} /* End Function do_restore */ static int copy_inode (const char *destpath, const struct stat *dest_stat, mode_t new_mode, @@ -1101,25 +1113,24 @@ static int copy_inode (const char *destpath, const struct stat *dest_stat, [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 + debug_msg_logger(LOG_INFO, __FUNCTION__); 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); source_link[source_len] = '\0'; - dest_link[dest_len] = '\0'; + dest_link[dest_len] = '\0'; if ( (source_len != dest_len) || (strcmp (source_link, dest_link) != 0) ) { unlink (destpath); @@ -1135,10 +1146,6 @@ static int copy_inode (const char *destpath, const struct stat *dest_stat, unlink (destpath); switch (source_stat->st_mode & S_IFMT) { - int fd, val; - struct sockaddr_un un_addr; - char symlink_val[STRING_LENGTH]; - case S_IFSOCK: if ( ( fd = socket (AF_UNIX, SOCK_STREAM, 0) ) < 0 ) break; @@ -1148,9 +1155,7 @@ static int copy_inode (const char *destpath, const struct stat *dest_stat, close (fd); if (val != 0 || chmod (destpath, new_mode & ~S_IFMT) != 0) break; - if (chown (destpath, source_stat->st_uid, source_stat->st_gid) == 0) - return (TRUE); - break; + goto do_chown; case S_IFLNK: if ( ( val = readlink (sourcepath, symlink_val, STRING_LENGTH - 1) ) < 0 ) break; @@ -1164,23 +1169,19 @@ static int copy_inode (const char *destpath, const struct stat *dest_stat, close (fd); if (chmod (destpath, new_mode & ~S_IFMT) != 0) break; - if (chown (destpath, source_stat->st_uid, source_stat->st_gid) == 0) - return (TRUE); - break; + goto do_chown; case S_IFBLK: case S_IFCHR: case S_IFIFO: if (mknod (destpath, new_mode, source_stat->st_rdev) != 0) break; - if (chown (destpath, source_stat->st_uid, source_stat->st_gid) == 0) - return (TRUE); - break; + goto do_chown; case S_IFDIR: 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); - return (TRUE); /*break;*/ } return (FALSE); @@ -1194,9 +1195,7 @@ static void free_config () struct config_entry_struct *c_entry; void *next; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "free_config()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); for (c_entry = first_config; c_entry != NULL; c_entry = next) { @@ -1228,16 +1227,15 @@ static int get_uid_gid (int flag, const char *string) { struct passwd *pw_ent; struct group *grp_ent; - char * msg_a="user"; - char * msg_b="U"; + static char *msg; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_uid_gid()\n"); + if (ENABLE_DEVFSD_VERBOSE) + msg="user"; + debug_msg_logger(LOG_INFO, __FUNCTION__); - if(flag != UID && flag != GID ) - msg_logger( DIE, LOG_ERR,"flag != UID && flag != GID\n"); -#endif + if(ENABLE_DEBUG && flag != UID && flag != GID) + msg_logger_and_die(LOG_ERR,"%s: flag != UID && flag != GID", __FUNCTION__); if ( isdigit (string[0]) || ( (string[0] == '-') && isdigit (string[1]) ) ) return atoi (string); @@ -1247,13 +1245,11 @@ static int get_uid_gid (int flag, const char *string) if ( flag == GID && ( grp_ent = getgrnam (string) ) != NULL ) return (grp_ent->gr_gid); - else - { - msg_a="group"; - msg_b="G"; - } + else if(ENABLE_DEVFSD_VERBOSE) + msg="group"; - msg_logger( NO_DIE, LOG_ERR,"unknown %s: %s, defaulting to %cID=0\n", msg_a, string, msg_b); + 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 */ @@ -1264,87 +1260,104 @@ static mode_t get_mode (const char *string) */ { mode_t mode; + int i; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_mode()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); if ( isdigit (string[0]) ) return strtoul (string, NULL, 8); if (strlen (string) != 9) - msg_logger( DIE, LOG_ERR, "bad mode: %s\n", string); + msg_logger_and_die(LOG_ERR, "bad mode: %s", string); + mode = 0; - if (string[0] == 'r') mode |= S_IRUSR; - if (string[1] == 'w') mode |= S_IWUSR; - if (string[2] == 'x') mode |= S_IXUSR; - if (string[3] == 'r') mode |= S_IRGRP; - if (string[4] == 'w') mode |= S_IWGRP; - if (string[5] == 'x') mode |= S_IXGRP; - if (string[6] == 'r') mode |= S_IROTH; - if (string[7] == 'w') mode |= S_IWOTH; - if (string[8] == 'x') mode |= S_IXOTH; + i= S_IRUSR; + while(i>0) + { + if(string[0]=='r'||string[0]=='w'||string[0]=='x') + mode+=i; + i=i/2; + string++; + } return (mode); } /* End Function get_mode */ static void signal_handler (int sig) { -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "signal_handler()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); 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 + + msg_logger(LOG_INFO, "Caught signal %d", sig); } /* End Function signal_handler */ static const char *get_variable (const char *variable, void *info) { 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 }; + int i; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_variable()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); if (gethostname (hostname, STRING_LENGTH - 1) != 0) - msg_logger( DIE, LOG_ERR, "gethostname(): %m\n"); + 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'; - 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) + hostname[STRING_LENGTH - 1] = '\0'; + + /* compare_string_array returns i>=0 */ + i=compare_string_array(field_names, variable); + + if ( i > 6 && (i > 1 && gv_info == NULL)) + return (NULL); + if( i >= 0 || i <= 3) { - sprintf (sbuf, "%o", gv_info->info->mode); - return (sbuf); + debug_msg_logger(LOG_INFO, "%s: i=%d %s", __FUNCTION__, i ,field_names[i+7]); + return(field_names[i+7]); } - if (strcmp (variable, "uid") == 0) - { + + if(i == 4 ) sprintf (sbuf, "%u", gv_info->info->uid); - return (sbuf); - } - if (strcmp (variable, "gid") == 0) - { + else if(i == 5) sprintf (sbuf, "%u", gv_info->info->gid); - return (sbuf); - } - return (NULL); + else if(i == 6) + sprintf (sbuf, "%o", gv_info->info->mode); + + debug_msg_logger(LOG_INFO, "%s: %s", __FUNCTION__, sbuf); + + return (sbuf); } /* End Function get_variable */ -static void do_scan_and_service (const char *dir_name) +static void service(struct stat statbuf, char *path) +{ + struct devfsd_notify_struct info; + + debug_msg_logger(LOG_INFO, __FUNCTION__); + + 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.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); +} + +static void dir_operation(int type, const char * dir_name, int var, unsigned long *event_mask) /* [SUMMARY] Scan a directory tree and generate register events on leaf nodes. - The directory pointer. This is closed upon completion. + To choose which function to perform + The directory pointer. This is closed upon completion. The name of the directory. + string length parameter. [RETURNS] Nothing. */ { @@ -1353,39 +1366,39 @@ static void do_scan_and_service (const char *dir_name) struct dirent *de; char path[STRING_LENGTH]; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "do_scan_and_service ()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); - if((dp = xopendir(NO_DIE, dir_name))==NULL) + if((dp = opendir( dir_name))==NULL) + { + debug_msg_logger(LOG_ERR, "opendir: %s: %m", dir_name); return; + } while ( (de = readdir (dp) ) != NULL ) { - struct devfsd_notify_struct info; - if ( (strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0) ) + if(de->d_name && *de->d_name == '.' && (!de->d_name[1] || (de->d_name[1] == '.' && !de->d_name[2]))) continue; snprintf (path, sizeof (path), "%s/%s", dir_name, de->d_name); + debug_msg_logger(LOG_ERR, "%s: %s", __FUNCTION__, path); + if (lstat (path, &statbuf) != 0) { -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_ERR, "%s: %m\n", path); -#endif + debug_msg_logger(LOG_ERR, "%s: %s: %m", __FUNCTION__, path); continue; } - 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.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) ) - do_scan_and_service (path); + 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; + } } closedir (dp); } /* End Function do_scan_and_service */ @@ -1397,28 +1410,18 @@ static int mksymlink (const char *oldpath, const char *newpath) [RETURNS] 0 on success, else -1. */ { -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "mksymlink()\n", newpath); -#endif - + debug_msg_logger(LOG_INFO, __FUNCTION__); if ( !make_dir_tree (newpath) ) return (-1); if (symlink (oldpath, newpath) != 0) { -#ifdef CONFIG_DEVFSD_VERBOSE - if (errno == EEXIST) - msg_logger( NO_DIE, LOG_INFO, "symlink(): %s: already exists\n", newpath); - else + if (errno != EEXIST) { - msg_logger( NO_DIE, LOG_ERR, "symlink(): %s: %m\n", newpath); + debug_msg_logger(LOG_ERR, "%s: %s to %s: %m", __FUNCTION__, oldpath, newpath); return (-1); } -#else - if (errno != EEXIST) - return (-1); -#endif } return (0); } /* End Function mksymlink */ @@ -1426,19 +1429,15 @@ static int mksymlink (const char *oldpath, const char *newpath) static int make_dir_tree (const char *path) /* [SUMMARY] Creating intervening directories for a path as required. - The full pathname (including he leaf node). + 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 + debug_msg_logger(LOG_INFO, __FUNCTION__); - if (bb_make_directory( (char *)path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH , FILEUTILS_RECUR )==-1) + if (bb_make_directory( dirname((char *)path), -1, FILEUTILS_RECUR )==-1) { -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_ERR, "make_dir_tree(): %s: %m\n", path); -#endif + debug_msg_logger(LOG_ERR, "%s: %s: %m",__FUNCTION__, path); return (FALSE); } return(TRUE); @@ -1447,10 +1446,10 @@ static int make_dir_tree (const char *path) 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. + void *info, + const char *devname, + const regmatch_t *ex, unsigned int numexp) +/* [SUMMARY] Expand environment variables and regular subexpressions in string. The output expanded expression is written here. The size of the output buffer. The input expression. This may equal <>. @@ -1467,9 +1466,7 @@ static int expand_expression(char *output, unsigned int outsize, { char temp[STRING_LENGTH]; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "expand_expression()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); if ( !st_expr_expand (temp, STRING_LENGTH, input, get_variable_func, info) ) return (FALSE); @@ -1498,9 +1495,7 @@ static void expand_regexp (char *output, size_t outsize, const char *input, const char last_exp = '0' - 1 + numex; int c = -1; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "expand_regexp()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); /* Guarantee NULL termination by writing an explicit '\0' character into the very last byte */ @@ -1597,14 +1592,35 @@ const char *get_old_name (const char *devname, unsigned int namelen, const char *compat_name = NULL; char *ptr; struct translate_struct *trans; - -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_old_name()\n"); -#endif + unsigned int i; + char mode; + int indexx; + const char *pty1; + const char *pty2; + size_t len; + /* 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 + }; + + debug_msg_logger(LOG_INFO, __FUNCTION__); for (trans = translate_table; trans->match != NULL; ++trans) { - size_t len = strlen (trans->match); + len = strlen (trans->match); if (strncmp (devname, trans->match, len) == 0) { @@ -1614,80 +1630,63 @@ const char *get_old_name (const char *devname, unsigned int namelen, return (buffer); } } - if (strncmp (devname, "sbp/", 4) == 0) - { - sprintf (buffer, "sbpcd%u", minor); + + ptr = (strrchr (devname, '/') + 1); + i = scan_dev_name(devname, namelen, ptr); + + if( i > 0 && i < 13) compat_name = buffer; + else + return NULL; + + debug_msg_logger(LOG_INFO, "%s: scan_dev_name = %d", __FUNCTION__, i); + + /* 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) + /* 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, "vcs%s", devname + 4); + sprintf (buffer, fmt[i], devname + 4); if (buffer[3] == '0') buffer[3] = '\0'; - compat_name = buffer; } - else if (strncmp (devname, "pty/", 4) == 0) + /* 12 == pty/ */ + if( i == 12 ) { - 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; + pty1 = "pqrstuvwxyzabcde"; + pty2 = "0123456789abcdef"; + indexx = atoi (devname + 5); + sprintf (buffer, fmt[i], (devname[4] == 'm') ? 'p' : 't', pty1[indexx >> 4], pty2[indexx & 0x0f]); } + + if(ENABLE_DEBUG && compat_name!=NULL) + msg_logger(LOG_INFO, "%s: compat_name %s", __FUNCTION__, compat_name); + return (compat_name); } /* End Function get_old_name */ @@ -1699,13 +1698,10 @@ static char get_old_ide_name (unsigned int major, unsigned int minor) */ { char letter='y'; /* 121 */ - char c='a'; /* 97 */ + char c='a'; /* 97 */ int i=IDE0_MAJOR; - -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_old_ide_name()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); /* I hope it works like the previous code as it saves a few bytes. Tito ;P */ do { @@ -1714,7 +1710,7 @@ static char get_old_ide_name (unsigned int major, unsigned int minor) i==IDE6_MAJOR || i==IDE7_MAJOR || i==IDE8_MAJOR || i==IDE9_MAJOR ) { - if(i==major) + if((unsigned int)i==major) { letter=c; break; @@ -1742,9 +1738,7 @@ static char *write_old_sd_name (char *buffer, { unsigned int disc_index; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "write_old_sd_name()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); if (major == 8) { @@ -1791,9 +1785,7 @@ int st_expr_expand (char *output, unsigned int length, const char *input, 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 + debug_msg_logger(LOG_INFO, __FUNCTION__); if (length > BUFFER_SIZE) length = BUFFER_SIZE; @@ -1815,9 +1807,7 @@ int st_expr_expand (char *output, unsigned int length, const char *input, /* 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 + msg_logger(LOG_INFO, bb_msg_variable_not_found, "HOME"); return (FALSE); } len = strlen (env); @@ -1837,9 +1827,7 @@ int st_expr_expand (char *output, unsigned int length, const char *input, input = ptr - 1; if ( ( pwent = getpwnam (tmp) ) == NULL ) { -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO, "getpwnam(): %s\n", tmp); -#endif + msg_logger(LOG_INFO, "no pwent for: %s", tmp); return (FALSE); } len = strlen (pwent->pw_dir); @@ -1865,9 +1853,7 @@ int st_expr_expand (char *output, unsigned int length, const char *input, } return (FALSE); st_expr_expand_out: -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO, bb_msg_small_buffer); -#endif + msg_logger(LOG_INFO, bb_msg_small_buffer); return (FALSE); } /* End Function st_expr_expand */ @@ -1898,9 +1884,7 @@ static const char *expand_variable (char *buffer, unsigned int length, const char *env, *ptr; char tmp[STRING_LENGTH]; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "expand_variable()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); ch = input[0]; if (ch == '$') @@ -1922,16 +1906,14 @@ static const char *expand_variable (char *buffer, unsigned int length, 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); 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 + msg_logger(LOG_INFO, bb_msg_variable_not_found, tmp); return (NULL); } len = strlen (env); @@ -1950,7 +1932,7 @@ static const char *expand_variable (char *buffer, unsigned int length, { /* 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); @@ -1961,14 +1943,12 @@ static const char *expand_variable (char *buffer, unsigned int length, } if (ch != ':' || ptr[1] != '-' ) { -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO,"illegal char in var name\n"); -#endif + msg_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); @@ -1988,9 +1968,7 @@ static const char *expand_variable (char *buffer, unsigned int length, --open_braces; break; case '\0': -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO,"\"}\" not found in: %s\n", input); -#endif + msg_logger(LOG_INFO,"\"}\" not found in: %s", input); return (NULL); default: break; @@ -2015,7 +1993,7 @@ static const char *expand_variable (char *buffer, unsigned int length, 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); @@ -2030,9 +2008,7 @@ static const char *expand_variable (char *buffer, unsigned int length, *out_pos += len; return (input); expand_variable_out: -#ifdef CONFIG_DEVFSD_VERBOSE - msg_logger( NO_DIE, LOG_INFO, bb_msg_small_buffer); -#endif + msg_logger(LOG_INFO, bb_msg_small_buffer); return (NULL); } /* End Function expand_variable */ @@ -2050,9 +2026,7 @@ static const char *get_variable_v2 (const char *variable, { const char *value; -#ifdef CONFIG_DEVFSD_DEBUG - msg_logger( NO_DIE, LOG_INFO, "get_variable_v2()\n"); -#endif + debug_msg_logger(LOG_INFO, __FUNCTION__); if (func != NULL) {