Rework device-path handling

[petitboot] / devices / udev-helper.c

diff --git a/devices/udev-helper.c b/devices/udev-helper.c
index f0b80b3a0c330a344ca8a21a215dc44326d812e4..a55d3780906e15d5274fec996b2bf6ce8906bd5d 100644 (file)
--- a/devices/udev-helper.c
+++ b/devices/udev-helper.c
@@ -1,4 +1,6 @@
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -17,6 +19,7 @@
 #include <sys/ioctl.h>
 
 #include "parser.h"
+#include "paths.h"
 #include "petitboot-paths.h"
 
 /* Define below to operate without the frontend */
@@ -33,7 +36,7 @@ void pb_log(const char *fmt, ...)
        va_list ap;
 
        va_start(ap, fmt);
-       fprintf(logf, fmt, ap);
+       vfprintf(logf, fmt, ap);
        va_end(ap);
 }
 
@@ -181,28 +184,29 @@ int connect_to_socket()
 #endif
 }
 
-int mount_device(const char *dev_path, char *mount_path)
+int mount_device(const char *dev_path)
 {
-       char *dir;
-       const char *basename;
+       const char *dir;
        int pid, status, rc = -1;
+       struct stat statbuf;
 
-       basename = strrchr(dev_path, '/');
-       if (basename)
-               basename++;
-       else
-               basename = dev_path;
- 
-       /* create a unique mountpoint */
-       dir = malloc(strlen(TMP_DIR) + 13 + strlen(basename));
-       sprintf(dir, "%s/mnt-%s-XXXXXX", TMP_DIR, basename);
-
-       if (!mkdtemp(dir)) {
-               pb_log("failed to create temporary directory in %s: %s",
-                               TMP_DIR, strerror(errno));
-               goto out;
+       dir = mountpoint_for_device(dev_path);
+
+       if (stat(dir, &statbuf)) {
+               if (mkdir(dir, 0755)) {
+                       pb_log("couldn't create directory %s: %s\n",
+                                       dir, strerror(errno));
+                       goto out;
+               }
+       } else {
+               if (!S_ISDIR(statbuf.st_mode)) {
+                       pb_log("mountpoint %s exists, "
+                                       "but isn't a directory\n", dir);
+                       goto out;
+               }
        }
 
+
        pid = fork();
        if (pid == -1) {
                pb_log("%s: fork failed: %s\n", __FUNCTION__, strerror(errno));
@@ -220,13 +224,10 @@ int mount_device(const char *dev_path, char *mount_path)
                goto out;
        }
 
-       if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
-               strcpy(mount_path, dir);
+       if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
                rc = 0;
-       }
 
 out:
-       free(dir);
        return rc;
 }
 
@@ -323,7 +324,7 @@ static int is_removable_device(const char *sysfs_path)
 
        sprintf(full_path, "/sys/%s/removable", sysfs_path);    
        fd = open(full_path, O_RDONLY);
-       printf(" -> removable check on %s, fd=%d\n", full_path, fd);
+       pb_log(" -> removable check on %s, fd=%d\n", full_path, fd);
        if (fd < 0)
                return 0;
        buf_len = read(fd, buf, 79);
@@ -348,9 +349,9 @@ static int is_ignored_device(const char *devname)
 
 static int found_new_device(const char *dev_path)
 {
-       char mountpoint[PATH_MAX];
+       const char *mountpoint = mountpoint_for_device(dev_path);
 
-       if (mount_device(dev_path, mountpoint)) {
+       if (mount_device(dev_path)) {
                pb_log("failed to mount %s\n", dev_path);
                return EXIT_FAILURE;
        }
@@ -394,35 +395,35 @@ static int poll_device_plug(const char *dev_path,
 
        /* Polling loop for optical drive */
        for (; (*optical) != 0; ) {
-               printf("poll for optical drive insertion ...\n");
+               pb_log("poll for optical drive insertion ...\n");
                fd = open(dev_path, O_RDONLY|O_NONBLOCK);
                if (fd < 0)
                        return EXIT_FAILURE;
                rc = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
                close(fd);
                if (rc == -1) {
-                       printf("not an optical drive, fallback...\n");
+                       pb_log("not an optical drive, fallback...\n");
                        break;
                }
                *optical = 1;
                if (rc == CDS_DISC_OK)
                        return EXIT_SUCCESS;
 
-               printf("no... waiting\n");
+               pb_log("no... waiting\n");
                detach_and_sleep(REMOVABLE_SLEEP_DELAY);
        }
 
        /* Fall back to bare open() */
        *optical = 0;
        for (;;) {
-               printf("poll for non-optical drive insertion ...\n");
+               pb_log("poll for non-optical drive insertion ...\n");
                fd = open(dev_path, O_RDONLY);
                if (fd < 0 && errno != ENOMEDIUM)
                        return EXIT_FAILURE;
                close(fd);
                if (fd >= 0)
                        return EXIT_SUCCESS;
-               printf("no... waiting\n");
+               pb_log("no... waiting\n");
                detach_and_sleep(REMOVABLE_SLEEP_DELAY);
        }
 }
@@ -432,7 +433,7 @@ static int poll_device_unplug(const char *dev_path, int optical)
        int rc, fd;
 
        for (;optical;) {
-               printf("poll for optical drive removal ...\n");
+               pb_log("poll for optical drive removal ...\n");
                fd = open(dev_path, O_RDONLY|O_NONBLOCK);
                if (fd < 0)
                        return EXIT_FAILURE;
@@ -440,20 +441,20 @@ static int poll_device_unplug(const char *dev_path, int optical)
                close(fd);
                if (rc != CDS_DISC_OK)
                        return EXIT_SUCCESS;
-               printf("no... waiting\n");
+               pb_log("no... waiting\n");
                detach_and_sleep(REMOVABLE_SLEEP_DELAY);
        }
 
        /* Fall back to bare open() */
        for (;;) {
-               printf("poll for non-optical drive removal ...\n");
+               pb_log("poll for non-optical drive removal ...\n");
                fd = open(dev_path, O_RDONLY);
                if (fd < 0 && errno != ENOMEDIUM)
                        return EXIT_FAILURE;
                close(fd);
                if (fd < 0)
                        return EXIT_SUCCESS;
-               printf("no... waiting\n");
+               pb_log("no... waiting\n");
                detach_and_sleep(REMOVABLE_SLEEP_DELAY);
        }
 }
@@ -488,7 +489,9 @@ int main(int argc, char **argv)
 
        action = getenv("ACTION");
 
-       logf = fopen("/var/tmp/petitboot-udev-helpers.log", "a");
+       logf = fopen("/var/log/petitboot-udev-helpers.log", "a");
+       if (!logf)
+               logf = stdout;
        pb_log("%d started\n", getpid());
        rc = EXIT_SUCCESS;
 
@@ -497,6 +500,8 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
+       set_mount_base(TMP_DIR);
+
        if (connect_to_socket())
                return EXIT_FAILURE;