static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size)
{
char *buf;
- FILE *fsource, *ftarget;
+ FILE *fsource = NULL, *ftarget = NULL;
bool ret = false;
buf = malloc(size);
if (fwrite(buf, size, 1, ftarget) == 1)
ret = true;
exit:
- fclose(ftarget);
- fclose(fsource);
+ if (ftarget != NULL)
+ fclose(ftarget);
+ if (fsource != NULL)
+ fclose(fsource);
free(buf);
return ret;
}
{ "help", no_argument, NULL, 'h' },
{}
};
- static const char *searchpath[] = {
- "/lib/firmware/updates/",
- "/lib/firmware/"
- };
+ static const char *searchpath[] = { FIRMWARE_PATH };
char fwencpath[UTIL_PATH_SIZE];
char misspath[UTIL_PATH_SIZE];
char loadpath[UTIL_PATH_SIZE];
break;
case 'h':
printf("Usage: firmware --firmware=<fwfile> --devpath=<path> [--help]\n\n");
- default:
- rc = 1;
goto exit;
}
}
}
util_path_encode(firmware, fwencpath, sizeof(fwencpath));
- util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
+ util_strscpyl(misspath, sizeof(misspath), udev_get_run_path(udev), "/firmware-missing/", fwencpath, NULL);
util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
if (fwfile == NULL) {
err = util_create_path(udev, misspath);
if (err != 0 && err != -ENOENT)
break;
- udev_selinux_setfscreatecon(udev, misspath, S_IFLNK);
err = symlink(devpath, misspath);
if (err != 0)
err = -errno;
- udev_selinux_resetfscreatecon(udev);
} while (err == -ENOENT);
rc = 2;
set_loading(udev, loadpath, "-1");
if (unlink(misspath) == 0)
util_delete_path(udev, misspath);
- set_loading(udev, loadpath, "1");
+ if (!set_loading(udev, loadpath, "1"))
+ goto exit;
util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {