[PATCH] replace fgets() with mmap() and introduce udev_lib.[hc]

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 1e424998f6a4c5df0a4970590c4cda4323c24862..8f781a66e26c60fd7e76cbf0d295b8eb72f91ed0 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -36,6 +36,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -190,6 +191,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        int i;
        char c;
        char *spos;
+       char *rest;
        int slen;
        struct sysfs_attribute *tmpattr;
 
@@ -244,7 +246,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        /* get part part of the result string */
                        i = 0;
                        if (attr != NULL)
-                               i = atoi(attr);
+                               i = strtoul(attr, &rest, 10);
                        if (i > 0) {
                                foreach_strpart(udev->program_result, " \n\r", spos, slen) {
                                        i--;
@@ -255,7 +257,10 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                        dbg("requested part of result string not found");
                                        break;
                                }
-                               strfieldcpymax(temp2, spos, slen+1);
+                               if (rest[0] == '+')
+                                       strfieldcpy(temp2, spos);
+                               else
+                                       strfieldcpymax(temp2, spos, slen+1);
                                strfieldcatmax(string, temp2, maxsize);
                                dbg("substitute part of result string '%s'", temp2);
                        } else {
@@ -370,22 +375,41 @@ static void fix_kernel_name(struct udevice *udev)
 static int execute_program(char *path, char *value, int len)
 {
        int retval;
-       int res;
+       int count;
        int status;
        int fds[2];
        pid_t pid;
-       int value_set = 0;
-       char buffer[255];
        char *pos;
-       char *args[PROGRAM_MAXARG];
+       char arg[PROGRAM_SIZE];
+       char *argv[sizeof(arg) / 2];
        int i;
 
-       dbg("executing '%s'", path);
+       i = 0;
+       if (strchr(path, ' ')) {
+               strfieldcpy(arg, path);
+               pos = arg;
+               while (pos != NULL) {
+                       if (pos[0] == '\'') {
+                               /* don't separate if in apostrophes */
+                               pos++;
+                               argv[i] = strsep(&pos, "\'");
+                               while (pos[0] == ' ')
+                                       pos++;
+               } else {
+                               argv[i] = strsep(&pos, " ");
+                       }
+                       dbg("arg[%i] '%s'", i, argv[i]);
+                       i++;
+               }
+       }
+       argv[i] =  NULL;
+
        retval = pipe(fds);
        if (retval != 0) {
                dbg("pipe failed");
                return -1;
        }
+
        pid = fork();
        switch(pid) {
        case 0:
@@ -394,28 +418,14 @@ static int execute_program(char *path, char *value, int len)
 
                /* dup write side of pipe to STDOUT */
                dup(fds[1]);
-
-               /* copy off our path to use incase we have too many args */
-               strfieldcpymax(buffer, path, sizeof(buffer));
-
-               if (strchr(path, ' ')) {
-                       /* exec with arguments */
-                       pos = path;
-                       for (i=0; i < PROGRAM_MAXARG-1; i++) {
-                               args[i] = strsep(&pos, " ");
-                               if (args[i] == NULL)
-                                       break;
-                       }
-                       if (args[i]) {
-                               dbg("too many args - %d, using subshell instead '%s'", i, buffer);
-                               retval = execl("/bin/sh", "sh", "-c", buffer, NULL);
-                       } else {
-                               dbg("execute program '%s'", path);
-                               retval = execv(args[0], args);
-                       }
+               if (argv[0] !=  NULL) {
+                       dbg("execute '%s' with given arguments", argv[0]);
+                       retval = execv(argv[0], argv);
                } else {
+                       dbg("execute '%s' with main argument", path);
                        retval = execv(path, main_argv);
                }
+
                info(FIELD_PROGRAM " execution of '%s' failed", path);
                exit(1);
        case -1:
@@ -425,34 +435,33 @@ static int execute_program(char *path, char *value, int len)
                /* parent reads from fds[0] */
                close(fds[1]);
                retval = 0;
+               i = 0;
                while (1) {
-                       res = read(fds[0], buffer, sizeof(buffer) - 1);
-                       if (res <= 0)
+                       count = read(fds[0], value + i, len - i-1);
+                       if (count <= 0)
                                break;
-                       buffer[res] = '\0';
-                       if (res > len) {
+
+                       i += count;
+                       if (i >= len-1) {
                                dbg("result len %d too short", len);
                                retval = -1;
-                       }
-                       if (value_set) {
-                               dbg("result value already set");
-                               retval = -1;
-                       } else {
-                               value_set = 1;
-                               strncpy(value, buffer, len);
-                               pos = value + strlen(value)-1;
-                               if (pos[0] == '\n')
-                                       pos[0] = '\0';
-                               dbg("result is '%s'", value);
+                               break;
                        }
                }
-               close(fds[0]);
-               res = wait(&status);
-               if (res < 0) {
-                       dbg("wait failed result %d", res);
+
+               if (count < 0) {
+                       dbg("read failed with '%s'", strerror(errno));
                        retval = -1;
                }
 
+               if (i > 0 && value[i] == '\n')
+                       i--;
+               value[i] = '\0';
+               dbg("result is '%s'", value);
+
+               close(fds[0]);
+               wait(&status);
+
                if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
                        dbg("exec program status 0x%x", status);
                        retval = -1;
@@ -730,7 +739,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        apply_format(udev, dev->program, sizeof(dev->program),
                                     class_dev, sysfs_device);
                        if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
-                               dbg(FIELD_PROGRAM " returned nozero");
+                               dbg(FIELD_PROGRAM " returned nonzero");
                                goto try_parent;
                        } else {
                                dbg(FIELD_PROGRAM " returned successful");
@@ -807,16 +816,11 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                        }
 
                        if (dev->symlink[0] != '\0') {
-                               char temp[NAME_MAX];
-
                                info("configured rule in '%s' at line %i applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
-                               /* do not clobber dev */
-                               strfieldcpy(temp, dev->symlink);
-                               apply_format(udev, temp, sizeof(temp),
-                                            class_dev, sysfs_device);
-                               strfieldcat(udev->symlink, temp);
-                               strfieldcat(udev->symlink, " ");
+                               if (udev->symlink[0] != '\0')
+                                       strfieldcat(udev->symlink, " ");
+                               strfieldcat(udev->symlink, dev->symlink);
                        }
 
                        if (dev->name[0] != '\0') {
@@ -833,8 +837,8 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        goto done;
 
 found:
-       apply_format(udev, udev->name, sizeof(udev->name),
-                    class_dev, sysfs_device);
+       apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+       apply_format(udev, udev->symlink, sizeof(udev->symlink), class_dev, sysfs_device);
        udev->partitions = dev->partitions;
 
 done: