X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-firmware.c;h=56dc8fcaa93b3d9dec17b7020434549cbf284e4e;hb=c6eefe366470e1cf6c94f52dd923dc822eb5d027;hp=d212c64b4d83855f76c43bc5c94f4493281b726f;hpb=6df831f25ebc9f55cd939f04392dad9237706e45;p=elogind.git

diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
index d212c64b4..56dc8fcaa 100644
--- a/src/udev/udev-builtin-firmware.c
+++ b/src/udev/udev-builtin-firmware.c
@@ -33,7 +33,7 @@ static bool set_loading(struct udev *udev, char *loadpath, const char *state)
 
         ldfile = fopen(loadpath, "we");
         if (ldfile == NULL) {
-                err(udev, "error: can not open '%s'\n", loadpath);
+                log_error("error: can not open '%s'\n", loadpath);
                 return false;
         };
         fprintf(ldfile, "%s\n", state);
@@ -49,11 +49,11 @@ static bool copy_firmware(struct udev *udev, const char *source, const char *tar
 
         buf = malloc(size);
         if (buf == NULL) {
-                err(udev,"No memory available to load firmware file");
+                log_error("No memory available to load firmware file");
                 return false;
         }
 
-        info(udev, "writing '%s' (%zi) to '%s'\n", source, size, target);
+        log_debug("writing '%s' (%zi) to '%s'\n", source, size, target);
 
         fsource = fopen(source, "re");
         if (fsource == NULL)
@@ -84,7 +84,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
         char datapath[UTIL_PATH_SIZE];
         char fwpath[UTIL_PATH_SIZE];
         const char *firmware;
-        FILE *fwfile;
+        FILE *fwfile = NULL;
         struct utsname kernel;
         struct stat statbuf;
         unsigned int i;
@@ -92,38 +92,36 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
 
         firmware = udev_device_get_property_value(dev, "FIRMWARE");
         if (firmware == NULL) {
-                err(udev, "firmware parameter missing\n\n");
+                log_error("firmware parameter missing\n\n");
                 rc = EXIT_FAILURE;
                 goto exit;
         }
 
         /* lookup firmware file */
         uname(&kernel);
-        for (i = 0; i < ARRAY_SIZE(searchpath); i++) {
+        for (i = 0; i < ELEMENTSOF(searchpath); i++) {
                 util_strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL);
-                dbg(udev, "trying %s\n", fwpath);
                 fwfile = fopen(fwpath, "re");
                 if (fwfile != NULL)
                         break;
 
                 util_strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL);
-                dbg(udev, "trying %s\n", fwpath);
                 fwfile = fopen(fwpath, "re");
                 if (fwfile != NULL)
                         break;
         }
 
         util_path_encode(firmware, fwencpath, sizeof(fwencpath));
-        util_strscpyl(misspath, sizeof(misspath), udev_get_run_path(udev), "/firmware-missing/", fwencpath, NULL);
+        util_strscpyl(misspath, sizeof(misspath), "/run/udev/firmware-missing/", fwencpath, NULL);
         util_strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL);
 
         if (fwfile == NULL) {
                 int err;
 
                 /* This link indicates the missing firmware file and the associated device */
-                info(udev, "did not find firmware file '%s'\n", firmware);
+                log_debug("did not find firmware file '%s'\n", firmware);
                 do {
-                        err = util_create_path(udev, misspath);
+                        err = mkdir_parents(misspath, 0755);
                         if (err != 0 && err != -ENOENT)
                                 break;
                         err = symlink(udev_device_get_devpath(dev), misspath);
@@ -147,7 +145,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
 
         util_strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL);
         if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {
-                err(udev, "error sending firmware '%s' to device\n", firmware);
+                log_error("error sending firmware '%s' to device\n", firmware);
                 set_loading(udev, loadpath, "-1");
                 rc = EXIT_FAILURE;
                 goto exit;