/*
* udev_db.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
*
#include <dirent.h>
#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "logging.h"
static int get_db_filename(const char *devpath, char *filename, int len)
{
- char temp[SYSFS_PATH_MAX];
+ char temp[PATH_SIZE];
char *pos;
/* replace '/' to transform path into a filename */
- strfieldcpy(temp, devpath);
+ strlcpy(temp, devpath, sizeof(temp));
pos = strchr(&temp[1], '/');
while (pos) {
pos[0] = PATH_TO_NAME_CHAR;
int udev_db_add_device(struct udevice *udev)
{
- char filename[SYSFS_PATH_MAX];
+ char filename[PATH_SIZE];
struct name_entry *name_loop;
FILE *f;
if (udev->test_run)
return 0;
- get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
+ /* don't write anything if udev created only the node with the
+ * kernel name without any interesting data to remember
+ */
+ if (strcmp(udev->name, udev->kernel_name) == 0 &&
+ list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
+ !udev->partitions && !udev->ignore_remove) {
+ dbg("nothing interesting to store in udevdb, skip");
+ goto exit;
+ }
+ get_db_filename(udev->devpath, filename, sizeof(filename));
create_path(filename);
-
f = fopen(filename, "w");
if (f == NULL) {
- dbg("unable to create db file '%s'", filename);
+ err("unable to create db file '%s'", filename);
return -1;
}
dbg("storing data for device '%s' in '%s'", udev->devpath, filename);
list_for_each_entry(name_loop, &udev->symlink_list, node)
fprintf(f, "S:%s\n", name_loop->name);
fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
- fprintf(f, "A:%u\n", udev->partitions);
- fprintf(f, "R:%u\n", udev->ignore_remove);
-
+ if (udev->partitions)
+ fprintf(f, "A:%u\n", udev->partitions);
+ if (udev->ignore_remove)
+ fprintf(f, "R:%u\n", udev->ignore_remove);
+ list_for_each_entry(name_loop, &udev->env_list, node)
+ fprintf(f, "E:%s\n", name_loop->name);
fclose(f);
+exit:
return 0;
}
static int parse_db_file(struct udevice *udev, const char *filename)
{
- char line[NAME_SIZE];
- char temp[NAME_SIZE];
+ char line[PATH_SIZE];
unsigned int major, minor;
char *bufline;
char *buf;
size_t count;
if (file_map(filename, &buf, &bufsize) != 0) {
- dbg("unable to read db file '%s'", filename);
+ err("unable to read db file '%s'", filename);
return -1;
}
switch(bufline[0]) {
case 'P':
- if (count > DEVPATH_SIZE)
- count = DEVPATH_SIZE-1;
- strncpy(udev->devpath, &bufline[2], count-2);
+ if (count > sizeof(udev->devpath))
+ count = sizeof(udev->devpath);
+ memcpy(udev->devpath, &bufline[2], count-2);
udev->devpath[count-2] = '\0';
break;
case 'N':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(udev->name, &bufline[2], count-2);
+ if (count > sizeof(udev->name))
+ count = sizeof(udev->name);
+ memcpy(udev->name, &bufline[2], count-2);
udev->name[count-2] = '\0';
break;
case 'M':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(temp, &bufline[2], count-2);
- temp[count-2] = '\0';
- sscanf(temp, "%u:%u", &major, &minor);
+ if (count > sizeof(line))
+ count = sizeof(line);
+ memcpy(line, &bufline[2], count-2);
+ line[count-2] = '\0';
+ sscanf(line, "%u:%u", &major, &minor);
udev->devt = makedev(major, minor);
break;
case 'S':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(temp, &bufline[2], count-2);
- temp[count-2] = '\0';
- name_list_add(&udev->symlink_list, temp, 0);
+ 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 'A':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(line, &bufline[2], count-2);
+ 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 > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(line, &bufline[2], count-2);
+ 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;
}
}
file_unmap(buf, bufsize);
int udev_db_delete_device(struct udevice *udev)
{
- char filename[SYSFS_PATH_MAX];
+ char filename[PATH_SIZE];
- get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
+ get_db_filename(udev->devpath, filename, sizeof(filename));
unlink(filename);
return 0;
int udev_db_get_device(struct udevice *udev, const char *devpath)
{
- char filename[SYSFS_PATH_MAX];
+ char filename[PATH_SIZE];
- get_db_filename(devpath, filename, SYSFS_PATH_MAX);
+ get_db_filename(devpath, filename, sizeof(filename));
if (parse_db_file(udev, filename) != 0)
return -1;
dir = opendir(udev_db_path);
if (dir == NULL) {
- dbg("unable to udev db '%s'", udev_db_path);
+ err("unable to open udev_db '%s'", udev_db_path);
return -1;
}
while (1) {
struct dirent *ent;
- char filename[NAME_SIZE];
- char path[DEVPATH_SIZE];
- char nodename[NAME_SIZE];
+ char filename[PATH_SIZE];
+ char path[PATH_SIZE];
+ char nodename[PATH_SIZE];
char *bufline;
char *buf;
size_t bufsize;
if (ent->d_name[0] == '.')
continue;
- snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
- filename[NAME_SIZE-1] = '\0';
+ snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+ filename[sizeof(filename)-1] = '\0';
dbg("looking at '%s'", filename);
if (file_map(filename, &buf, &bufsize) != 0) {
- dbg("unable to read db file '%s'", filename);
+ err("unable to read db file '%s'", filename);
continue;
}
switch(bufline[0]) {
case 'P':
- if (count > DEVPATH_SIZE)
- count = DEVPATH_SIZE-1;
- strncpy(path, &bufline[2], count-2);
+ if (count > sizeof(path))
+ count = sizeof(path);
+ memcpy(path, &bufline[2], count-2);
path[count-2] = '\0';
break;
case 'N':
case 'S':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(nodename, &bufline[2], count-2);
+ if (count > sizeof(nodename))
+ count = sizeof(nodename);
+ memcpy(nodename, &bufline[2], count-2);
nodename[count-2] = '\0';
dbg("compare '%s' '%s'", nodename, name);
if (strcmp(nodename, name) == 0) {
- strncpy(devpath, path, len);
- devpath[len] = '\0';
+ strlcpy(devpath, nodename, len);
+ devpath[count-2] = '\0';
file_unmap(buf, bufsize);
closedir(dir);
return 0;
dir = opendir(udev_db_path);
if (dir == NULL) {
- dbg("unable to udev db '%s'", udev_db_path);
+ err("unable to open udev_db '%s'", udev_db_path);
return -1;
}
while (1) {
struct dirent *ent;
- char filename[NAME_SIZE];
- char path[DEVPATH_SIZE];
- char nodename[NAME_SIZE];
+ char filename[PATH_SIZE];
+ char path[PATH_SIZE];
+ char nodename[PATH_SIZE];
char *bufline;
char *buf;
size_t bufsize;
if (ent->d_name[0] == '.')
continue;
- snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
- filename[NAME_SIZE-1] = '\0';
+ snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+ filename[sizeof(filename)-1] = '\0';
dbg("looking at '%s'", filename);
if (file_map(filename, &buf, &bufsize) != 0) {
- dbg("unable to read db file '%s'", filename);
+ err("unable to read db file '%s'", filename);
continue;
}
switch(bufline[0]) {
case 'P':
- if (count > DEVPATH_SIZE)
- count = DEVPATH_SIZE-1;
- strncpy(path, &bufline[2], count-2);
+ if (count > sizeof(path))
+ count = sizeof(path);
+ memcpy(path, &bufline[2], count-2);
path[count-2] = '\0';
break;
case 'N':
- if (count > NAME_SIZE)
- count = NAME_SIZE-1;
- strncpy(nodename, &bufline[2], count-2);
+ if (count > sizeof(nodename))
+ count = sizeof(nodename);
+ memcpy(nodename, &bufline[2], count-2);
nodename[count-2] = '\0';
break;
default:
~ianmdlvl / elogind.git / blobdiff