dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] cleanup db functions

Browse Source
This commit is contained in:
kay.sievers@vrfy.org
2005-02-21 13:48:10 +01:00
committed by Greg KH
parent 311a2b0a1d
commit 8f2f6e426f
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
namedev.c
View File

@@ -299,6 +299,8 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
}
break;
case 'P':
if (!class_dev)
break;
class_dev_parent = sysfs_get_classdev_parent(class_dev);
if (class_dev_parent != NULL) {
struct udevice udev_parent;
@@ -306,8 +308,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
dbg("found parent '%s', get the node name", class_dev_parent->path);
memset(&udev_parent, 0x00, sizeof(struct udevice));
/* lookup the name in the udev_db with the DEVPATH of the parent */
strfieldcpy(udev_parent.devpath, &class_dev_parent->path[strlen(sysfs_path)]);
if (udev_db_get_device(&udev_parent) == 0) {
if (udev_db_get_device_by_devpath(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
strfieldcatmax(string, udev_parent.name, maxsize);
dbg("substitute parent node name'%s'", udev_parent.name);
} else

36
udev_db.c
View File

@@ -4,7 +4,7 @@
* Userspace devfs
*
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -39,19 +39,19 @@
#define PATH_TO_NAME_CHAR '@'
static int get_db_filename(struct udevice *udev, char *filename, int len)
static int get_db_filename(const char *devpath, char *filename, int len)
{
char devpath[SYSFS_PATH_MAX];
char temp[SYSFS_PATH_MAX];
char *pos;
/* replace '/' to transform path into a filename */
strfieldcpy(devpath, udev->devpath);
pos = strchr(&devpath[1], '/');
strfieldcpy(temp, devpath);
pos = strchr(&temp[1], '/');
while (pos) {
pos[0] = PATH_TO_NAME_CHAR;
pos = strchr(&pos[1], '/');
}
snprintf(filename, len, "%s%s", udev_db_path, devpath);
snprintf(filename, len, "%s%s", udev_db_path, temp);
filename[len-1] = '\0';
return 0;
@@ -65,7 +65,7 @@ int udev_db_add_device(struct udevice *udev)
if (udev->test_run)
return 0;
get_db_filename(udev, filename, SYSFS_PATH_MAX);
get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
create_path(filename);
@@ -160,25 +160,25 @@ static int parse_db_file(struct udevice *udev, const char *filename)
return 0;
}
int udev_db_get_device(struct udevice *udev)
{
char filename[SYSFS_PATH_MAX];
get_db_filename(udev, filename, SYSFS_PATH_MAX);
return parse_db_file(udev, filename);
}
int udev_db_delete_device(struct udevice *udev)
{
char filename[SYSFS_PATH_MAX];
get_db_filename(udev, filename, SYSFS_PATH_MAX);
get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
unlink(filename);
return 0;
}
int udev_db_get_device_by_devpath(struct udevice *udev, const char *devpath)
{
char filename[SYSFS_PATH_MAX];
get_db_filename(devpath, filename, SYSFS_PATH_MAX);
return parse_db_file(udev, filename);
}
int udev_db_get_device_byname(struct udevice *udev, const char *name)
{
struct dirent *ent;
@@ -234,6 +234,8 @@ found:
strfieldcpy(udev->name, db_udev.name);
strfieldcpy(udev->symlink, db_udev.symlink);
udev->partitions = db_udev.partitions;
udev->ignore_remove = db_udev.ignore_remove;
udev->devt = db_udev.devt;
return 0;
}

2
udev_db.h
View File

@@ -26,9 +26,9 @@
extern int udev_db_add_device(struct udevice *dev);
extern int udev_db_get_device(struct udevice *dev);
extern int udev_db_delete_device(struct udevice *dev);
extern int udev_db_get_device_by_devpath(struct udevice *dev, const char *devpath);
extern int udev_db_get_device_byname(struct udevice *udev, const char *name);
#endif /* _UDEV_DB_H_ */

2
udev_remove.c
View File

@@ -150,7 +150,7 @@ int udev_remove_device(struct udevice *udev)
if (udev->type != BLOCK && udev->type != CLASS)
return 0;
retval = udev_db_get_device(udev);
retval = udev_db_get_device_by_devpath(udev, udev->devpath);
if (retval) {
/* fall back to kernel name */
temp = strrchr(udev->devpath, '/');

3
udevinfo.c
View File

@@ -341,8 +341,7 @@ static int process_options(int argc, char *argv[])
}
}
memset(&udev, 0x00, sizeof(struct udevice));
strfieldcpy(udev.devpath, pos);
retval = udev_db_get_device(&udev);
retval = udev_db_get_device_by_devpath(&udev, pos);
if (retval != 0) {
printf("device not found in database\n");
goto exit;