#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 */
+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 BUFFER_SIZE 16384
#define AC_RMNEWCOMPAT 10
#define AC_RESTORE 11
-struct permissions_type
-{
+struct permissions_type {
mode_t mode;
uid_t uid;
gid_t gid;
};
-struct execute_type
-{
+struct execute_type {
char *argv[MAX_ARGS + 1]; /* argv[0] must always be the programme */
};
-struct copy_type
-{
+struct copy_type {
const char *source;
const char *destination;
};
-struct action_type
-{
+struct action_type {
unsigned int what;
unsigned int when;
};
-struct config_entry_struct
-{
+struct config_entry_struct {
struct action_type action;
regex_t preg;
union
struct config_entry_struct *next;
};
-struct get_variable_info
-{
+struct get_variable_info {
const struct devfsd_notify_struct *info;
const char *devname;
char devpath[STRING_LENGTH];
#else
#define info_logger(p, fmt, args...)
#define msg_logger(p, fmt, args...)
-#define msg_logger_and_die(p, fmt, args...) exit(1)
+#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(1)
+#define error_logger_and_die(p, fmt, args...) exit(EXIT_FAILURE)
#endif
static void safe_memcpy(char *dest, const char *src, int len)
/* 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;
-
- /* 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");
+ sigaction_set(SIGHUP, &new_action);
+ sigaction_set(SIGUSR1, &new_action);
- printf("%s v%s started for %s\n",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);
dir_operation(SERVICE, mount_point, 0, NULL);
if (ENABLE_DEVFSD_FG_NP && no_polling)
- exit(0);
+ exit(EXIT_SUCCESS);
if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG)
logmode = LOGMODE_BOTH;
free(p);
return;
}
- fp = fopen(path, "r");
+ fp = fopen_for_read(path);
if (fp != NULL) {
while (fgets(buf, STRING_LENGTH, fp) != NULL) {
/* Skip whitespace */
} /* End Function action_permissions */
static void action_modload(const struct devfsd_notify_struct *info,
- const struct config_entry_struct *entry ATTRIBUTE_UNUSED)
+ const struct config_entry_struct *entry UNUSED_PARAM)
/* [SUMMARY] Load a module.
<info> The devfs change.
<entry> The config file entry.
msg = "group";
if (ENABLE_DEVFSD_VERBOSE)
- msg_logger(LOG_ERR,"unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]);
+ msg_logger(LOG_ERR, "unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]);
return 0;
}/* End Function get_uid_gid */
static const char *get_variable(const char *variable, void *info)
{
static char sbuf[sizeof(int)*3 + 2]; /* sign and NUL */
+ static char *hostname;
- char hostname[STRING_LENGTH];
struct get_variable_info *gv_info = info;
const char *field_names[] = {
"hostname", "mntpt", "devpath", "devname",
};
int i;
- if (gethostname(hostname, STRING_LENGTH - 1) != 0)
- /* Here on error we should do exit(RV_SYS_ERROR), instead we do exit(EXIT_FAILURE) */
- error_logger_and_die(LOG_ERR, "gethostname");
-
- hostname[STRING_LENGTH - 1] = '\0';
-
+ if (!hostname)
+ hostname = safe_gethostname();
/* index_in_str_array returns i>=0 */
i = index_in_str_array(field_names, variable);
/* from compat_name.c */
-struct translate_struct
-{
+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) */
--open_braces;
break;
case '\0':
- info_logger(LOG_INFO,"\"}\" not found in: %s", input);
+ info_logger(LOG_INFO, "\"}\" not found in: %s", input);
return NULL;
default:
break;