X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=3348c9a02c76d5cf89fa893e367d2837b9a8953c;hp=1feab7d63f961c995748af74cc45733f82e13cd7;hb=53ba69a0c2c48ad87cc597518f529812c9a6a69e;hpb=4278ab015d76876f61821b293df07e0c3746bfd5 diff --git a/udev_db.c b/udev_db.c index 1feab7d63..3348c9a02 100644 --- a/udev_db.c +++ b/udev_db.c @@ -65,13 +65,13 @@ static int name_index(const char *devpath, const char *name, int add) strlcat(filename, device, sizeof(filename)); if (add) { - info("creating index: '%s'", filename); + info("creating index: '%s'\n", filename); create_path(filename); fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); if (fd > 0) close(fd); } else { - info("removing index: '%s'", filename); + info("removing index: '%s'\n", filename); unlink(filename); delete_path(filename); } @@ -92,12 +92,12 @@ int udev_db_get_devices_by_name(const char *name, struct list_head *name_list) dir = opendir(dirname); if (dir == NULL) { - info("no index directory '%s': %s", dirname, strerror(errno)); + info("no index directory '%s': %s\n", dirname, strerror(errno)); rc = -1; goto out; } - info("found index directory '%s'", dirname); + info("found index directory '%s'\n", dirname); while (1) { struct dirent *ent; char device[PATH_SIZE]; @@ -146,12 +146,12 @@ int udev_db_add_device(struct udevice *udev) if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && !udev->partitions && !udev->ignore_remove) { int ret; - dbg("nothing interesting to store, create symlink"); + dbg("nothing interesting to store, create symlink\n"); selinux_setfscreatecon(filename, NULL, S_IFLNK); ret = symlink(udev->name, filename); selinux_resetfscreatecon(); if (ret != 0) { - err("unable to create db link '%s': %s", filename, strerror(errno)); + err("unable to create db link '%s': %s\n", filename, strerror(errno)); return -1; } } else { @@ -160,10 +160,10 @@ int udev_db_add_device(struct udevice *udev) f = fopen(filename, "w"); if (f == NULL) { - err("unable to create db file '%s': %s", filename, strerror(errno)); + err("unable to create db file '%s': %s\n", filename, strerror(errno)); return -1; } - dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename); + dbg("storing data for device '%s' in '%s'\n", udev->dev->devpath, filename); fprintf(f, "N:%s\n", udev->name); list_for_each_entry(name_loop, &udev->symlink_list, node) { @@ -174,6 +174,8 @@ int udev_db_add_device(struct udevice *udev) fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt)); if (udev->link_priority != 0) fprintf(f, "L:%u\n", udev->link_priority); + if (udev->event_timeout >= 0) + fprintf(f, "T:%u\n", udev->event_timeout); if (udev->partitions != 0) fprintf(f, "A:%u\n", udev->partitions); if (udev->ignore_remove) @@ -205,28 +207,28 @@ int udev_db_get_device(struct udevice *udev, const char *devpath) devpath_to_db_path(devpath, filename, sizeof(filename)); if (lstat(filename, &stats) != 0) { - info("no db file to read %s: %s", filename, strerror(errno)); + info("no db file to read %s: %s\n", filename, strerror(errno)); return -1; } if ((stats.st_mode & S_IFMT) == S_IFLNK) { char target[NAME_SIZE]; int target_len; - info("found a symlink as db file"); + info("found a symlink as db file\n"); target_len = readlink(filename, target, sizeof(target)); if (target_len > 0) target[target_len] = '\0'; else { - info("error reading db link %s: %s", filename, strerror(errno)); + info("error reading db link %s: %s\n", filename, strerror(errno)); return -1; } - dbg("db link points to '%s'", target); + dbg("db link points to '%s'\n", target); strlcpy(udev->name, target, sizeof(udev->name)); return 0; } if (file_map(filename, &buf, &bufsize) != 0) { - info("error reading db file %s: %s", filename, strerror(errno)); + info("error reading db file %s: %s\n", filename, strerror(errno)); return -1; } @@ -236,54 +238,35 @@ int udev_db_get_device(struct udevice *udev, const char *devpath) bufline = &buf[cur]; cur += count+1; + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); + line[count-2] = '\0'; + switch(bufline[0]) { case 'N': - if (count > sizeof(udev->name)) - count = sizeof(udev->name); - memcpy(udev->name, &bufline[2], count-2); - udev->name[count-2] = '\0'; + strlcpy(udev->name, line, sizeof(udev->name)); break; case 'M': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; sscanf(line, "%u:%u", &maj, &min); udev->devt = makedev(maj, min); break; case 'S': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; name_list_add(&udev->symlink_list, line, 0); break; case 'L': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; udev->link_priority = atoi(line); break; + case 'T': + udev->event_timeout = atoi(line); + break; case 'A': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; udev->partitions = atoi(line); break; case 'R': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; udev->ignore_remove = atoi(line); break; case 'E': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; name_list_add(&udev->env_list, line, 0); break; } @@ -323,7 +306,7 @@ int udev_db_get_all_entries(struct list_head *name_list) strlcat(dbpath, "/"DB_DIR, sizeof(dbpath)); dir = opendir(dbpath); if (dir == NULL) { - info("no udev_db available '%s': %s", dbpath, strerror(errno)); + info("no udev_db available '%s': %s\n", dbpath, strerror(errno)); return -1; } @@ -340,7 +323,7 @@ int udev_db_get_all_entries(struct list_head *name_list) strlcpy(device, ent->d_name, sizeof(device)); path_decode(device); name_list_add(name_list, device, 1); - dbg("added '%s'", device); + dbg("added '%s'\n", device); } closedir(dir);