Imported Upstream version 0.6.1

[platform/upstream/multipath-tools.git] / libmultipath / callout.c

diff --git a/libmultipath/callout.c b/libmultipath/callout.c
index a0f74e9..d671b0c 100644 (file)
--- a/libmultipath/callout.c
+++ b/libmultipath/callout.c
@@ -17,17 +17,9 @@
 #include "checkers.h"
 #include "vector.h"
 #include "structs.h"
+#include "util.h"
 #include "debug.h"
 
-#define PROGRAM_SIZE   100
-#define FIELD_PROGRAM
-
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
 int execute_program(char *path, char *value, int len)
 {
        int retval;
@@ -36,16 +28,17 @@ int execute_program(char *path, char *value, int len)
        int fds[2], null_fd;
        pid_t pid;
        char *pos;
-       char arg[PROGRAM_SIZE];
-       char *argv[sizeof(arg) / 2];
+       char arg[CALLOUT_MAX_SIZE];
+       int argc = sizeof(arg) / 2;
+       char *argv[argc + 1];
        int i;
 
        i = 0;
 
        if (strchr(path, ' ')) {
-               strfieldcpy(arg, path);
+               strlcpy(arg, path, sizeof(arg));
                pos = arg;
-               while (pos != NULL) {
+               while (pos != NULL && i < argc) {
                        if (pos[0] == '\'') {
                                /* don't separate if in apostrophes */
                                pos++;
@@ -84,7 +77,7 @@ int execute_program(char *path, char *value, int len)
                null_fd = open("/dev/null", O_WRONLY);
                if (null_fd > 0) {
                        close(STDERR_FILENO);
-                       dup(null_fd);
+                       retval = dup(null_fd);
                        close(null_fd);
                }
 
@@ -132,7 +125,7 @@ int execute_program(char *path, char *value, int len)
                        if (status == 0)
                                retval = 0;
                        else
-                               condlog(0, "%s exitted with %d", argv[0], status);
+                               condlog(0, "%s exited with %d", argv[0], status);
                }
                else if (WIFSIGNALED(status))
                        condlog(0, "%s was terminated by signal %d", argv[0], WTERMSIG(status));
@@ -148,6 +141,7 @@ apply_format (char * string, char * cmd, struct path * pp)
        char * pos;
        char * dst;
        char * p;
+       char * q;
        int len;
        int myfree;
 
@@ -186,6 +180,10 @@ apply_format (char * string, char * cmd, struct path * pp)
                        return 1;
 
                snprintf(p, len, "%s", pp->dev);
+               for (q = p; q < p + len; q++) {
+                       if (q && *q == '!')
+                               *q = '/';
+               }
                p += len - 1;
                break;
        case 'd':
@@ -203,8 +201,10 @@ apply_format (char * string, char * cmd, struct path * pp)
        }
        pos++;
 
-       if (!*pos)
+       if (!*pos) {
+               condlog(3, "formatted callout = %s", dst);
                return 0;
+       }
 
        len = strlen(pos) + 1;
        myfree -= len;
@@ -213,7 +213,6 @@ apply_format (char * string, char * cmd, struct path * pp)
                return 1;
 
        snprintf(p, len, "%s", pos);
-       condlog(3, "reformated callout = %s", dst);
+       condlog(3, "reformatted callout = %s", dst);
        return 0;
 }
-