#include <errno.h>
#include <ctype.h>
#include <dirent.h>
+#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/utsname.h>
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "logging.h"
#include "udev_utils.h"
#include "list.h"
-int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action)
{
char *pos;
memset(udev, 0x00, sizeof(struct udevice));
INIT_LIST_HEAD(&udev->symlink_list);
+ INIT_LIST_HEAD(&udev->run_list);
if (subsystem)
- strfieldcpy(udev->subsystem, subsystem);
+ strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
+
+ if (action)
+ strlcpy(udev->action, action, sizeof(udev->action));
if (devpath) {
- strfieldcpy(udev->devpath, devpath);
- no_trailing_slash(udev->devpath);
+ strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
+ remove_trailing_char(udev->devpath, '/');
if (strncmp(udev->devpath, "/block/", 7) == 0)
- udev->type = BLOCK;
+ udev->type = DEV_BLOCK;
else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
- udev->type = NET;
+ udev->type = DEV_NET;
else if (strncmp(udev->devpath, "/class/", 7) == 0)
- udev->type = CLASS;
+ udev->type = DEV_CLASS;
else if (strncmp(udev->devpath, "/devices/", 9) == 0)
- udev->type = PHYSDEV;
+ udev->type = DEV_DEVICE;
/* get kernel name */
pos = strrchr(udev->devpath, '/');
if (pos) {
- strfieldcpy(udev->kernel_name, &pos[1]);
+ strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));
dbg("kernel_name='%s'", udev->kernel_name);
/* Some block devices have '!' in their name, change that to '/' */
pos = &udev->kernel_name[strlen(udev->kernel_name)];
while (isdigit(pos[-1]))
pos--;
- strfieldcpy(udev->kernel_number, pos);
+ strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
dbg("kernel_number='%s'", udev->kernel_number);
}
}
int create_path(const char *path)
{
- char p[NAME_SIZE];
+ char p[PATH_SIZE];
char *pos;
struct stat stats;
return retval;
}
-int parse_get_pair(char **orig_string, char **left, char **right)
-{
- char *temp;
- char *string = *orig_string;
-
- if (!string)
- return -ENODEV;
-
- /* eat any whitespace */
- while (isspace(*string) || *string == ',')
- ++string;
-
- /* split based on '=' */
- temp = strsep(&string, "=");
- *left = temp;
- if (!string)
- return -ENODEV;
-
- /* take the right side and strip off the '"' */
- while (isspace(*string))
- ++string;
- if (*string == '"')
- ++string;
- else
- return -ENODEV;
-
- temp = strsep(&string, "\"");
- if (!string || *temp == '\0')
- return -ENODEV;
- *right = temp;
- *orig_string = string;
-
- return 0;
-}
-
int file_map(const char *filename, char **buf, size_t *bufsize)
{
struct stat stats;
return count - cur;
}
-void no_trailing_slash(char *path)
+void replace_untrusted_chars(char *string)
+{
+ size_t len;
+
+ for (len = 0; string[len] != '\0'; len++) {
+ if (strchr(";,~\\()\'", string[len])) {
+ info("replace '%c' in '%s'", string[len], string);
+ string[len] = '_';
+ }
+ }
+}
+
+void remove_trailing_char(char *path, char c)
{
size_t len;
len = strlen(path);
- while (len > 0 && path[len-1] == '/')
+ while (len > 0 && path[len-1] == c)
path[--len] = '\0';
}
return -ENOMEM;
}
- strfieldcpy(new_name->name, name);
+ strlcpy(new_name->name, name, sizeof(new_name->name));
list_add_tail(&new_name->node, &loop_name->node);
return 0;
}
/* calls function for every file found in specified directory */
-int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
- struct udevice *udev, const char *dirname, const char *suffix)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
{
struct dirent *ent;
DIR *dir;
char *ext;
- struct name_entry *loop_file;
- struct name_entry *tmp_file;
- LIST_HEAD(file_list);
+ char filename[PATH_SIZE];
dbg("open directory '%s'", dirname);
dir = opendir(dirname);
if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
continue;
- /* look for file with specified suffix */
+ /* look for file matching with specified suffix */
ext = strrchr(ent->d_name, '.');
if (ext == NULL)
continue;
continue;
dbg("put file '%s/%s' in list", dirname, ent->d_name);
- name_list_add(&file_list, ent->d_name, 1);
- }
- /* call function for every file in the list */
- list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
- char filename[NAME_SIZE];
+ snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+ filename[sizeof(filename)-1] = '\0';
+ name_list_add(name_list, filename, 1);
+ }
- snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
- filename[NAME_SIZE-1] = '\0';
+ closedir(dir);
+ return 0;
+}
- handler_function(udev, filename);
+int execute_command(const char *command, const char *subsystem)
+{
+ int retval;
+ pid_t pid;
+ char arg[PATH_SIZE];
+ char *argv[(PATH_SIZE / 2) + 1];
+ char *pos;
+ int devnull;
+ int i;
+
+ strlcpy(arg, command, sizeof(arg));
+ i = 0;
+ if (strchr(arg, ' ')) {
+ pos = arg;
+ while (pos != NULL) {
+ if (pos[0] == '\'') {
+ /* don't separate if in apostrophes */
+ pos++;
+ argv[i] = strsep(&pos, "\'");
+ while (pos && pos[0] == ' ')
+ pos++;
+ } else {
+ argv[i] = strsep(&pos, " ");
+ }
+ dbg("arg[%i] '%s'", i, argv[i]);
+ i++;
+ }
+ argv[i] = NULL;
+ dbg("execute '%s' with parsed arguments", arg);
+ } else {
+ argv[0] = arg;
+ argv[1] = (char *) subsystem;
+ argv[2] = NULL;
+ dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
+ }
- list_del(&loop_file->node);
- free(loop_file);
+ pid = fork();
+ switch (pid) {
+ case 0:
+ /* child */
+ devnull = open("/dev/null", O_RDWR);
+ if (devnull >= 0) {
+ dup2(devnull, STDIN_FILENO);
+ dup2(devnull, STDOUT_FILENO);
+ dup2(devnull, STDERR_FILENO);
+ close(devnull);
+ }
+ retval = execv(arg, argv);
+ err("exec of child failed");
+ _exit(1);
+ case -1:
+ dbg("fork of child failed");
+ break;
+ return -1;
+ default:
+ waitpid(pid, NULL, 0);
}
- closedir(dir);
return 0;
}
~ianmdlvl / elogind.git / blobdiff