*
* Copyright (C) 2004 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
* Free Software Foundation version 2 of the License.
#include <errno.h>
#include "libsysfs/sysfs/libsysfs.h"
-#include "libsysfs/dlist.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev_version.h"
#include "logging.h"
-#define SYSFS_VALUE_SIZE 256
-
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
static void print_all_attributes(struct dlist *attr_list)
{
struct sysfs_attribute *attr;
- char value[SYSFS_VALUE_SIZE];
+ char value[VALUE_SIZE];
int len;
dlist_for_each_data(attr_list, attr, struct sysfs_attribute) {
if (attr->value != NULL) {
- strfieldcpy(value, attr->value);
+ strlcpy(value, attr->value, sizeof(value));
len = strlen(value);
if (len == 0)
continue;
static int print_record(struct udevice *udev)
{
+ struct name_entry *name_loop;
+
printf("P: %s\n", udev->devpath);
printf("N: %s\n", udev->name);
- printf("S: %s\n", udev->symlink);
- printf("\n");
+ list_for_each_entry(name_loop, &udev->symlink_list, node)
+ printf("S: %s\n", name_loop->name);
+
return 0;
}
NAME,
PATH,
SYMLINK,
- ALL
+ ALL,
};
static int print_device_chain(const char *path)
return retval;
}
-static int process_options(int argc, char *argv[])
+static int print_dump(const char *devpath, const char *name) {
+ printf("%s=%s/%s\n", devpath, udev_root, name);
+ return 0;
+}
+
+int main(int argc, char *argv[], char *envp[])
{
- static const char short_options[] = "an:p:q:rVh";
+ static const char short_options[] = "adn:p:q:rVh";
int option;
- int retval = 1;
struct udevice udev;
int root = 0;
int attributes = 0;
enum query_type query = NONE;
- char result[1024] = "";
- char path[NAME_SIZE] = "";
- char name[NAME_SIZE] = "";
- char temp[NAME_SIZE];
+ char path[PATH_SIZE] = "";
+ char name[PATH_SIZE] = "";
+ char temp[PATH_SIZE];
+ struct name_entry *name_loop;
char *pos;
+ int retval = 0;
+
+ logging_init("udevinfo");
+
+ udev_init_config();
+ udev_init_device(&udev, NULL, NULL);
/* get command line options */
while (1) {
switch (option) {
case 'n':
dbg("udev name: %s\n", optarg);
- strfieldcpy(name, optarg);
+ strlcpy(name, optarg, sizeof(name));
break;
case 'p':
dbg("udev path: %s\n", optarg);
- strfieldcpy(path, optarg);
+ strlcpy(path, optarg, sizeof(path));
break;
case 'q':
}
printf("unknown query type\n");
- exit(1);
+ retval = 1;
+ goto exit;
case 'r':
root = 1;
attributes = 1;
break;
+ case 'd':
+ udev_db_dump_names(print_dump);
+ goto exit;
+
case 'V':
printf("udevinfo, version %s\n", UDEV_VERSION);
- exit(0);
+ goto exit;
case 'h':
- retval = 0;
+ retval = 2;
case '?':
default:
goto help;
} else {
if (path[0] != '/') {
/* prepend '/' if missing */
- strfieldcat(temp, "/");
- strfieldcat(temp, path);
+ strcpy(temp, "/");
+ strlcpy(temp, path, sizeof(temp));
pos = temp;
} else {
pos = path;
}
}
- memset(&udev, 0x00, sizeof(struct udevice));
- retval = udev_db_get_device_by_devpath(&udev, pos);
+ retval = udev_db_get_device(&udev, pos);
if (retval != 0) {
printf("device not found in database\n");
goto exit;
}
if (name[0] != '\0') {
- /* remove udev_root if given */
- int len = strlen(udev_root);
+ char devpath[PATH_SIZE];
+ int len;
+ /* remove udev_root if given */
+ len = strlen(udev_root);
if (strncmp(name, udev_root, len) == 0) {
pos = &name[len+1];
} else
pos = name;
- memset(&udev, 0x00, sizeof(struct udevice));
- strfieldcpy(udev.name, pos);
- retval = udev_db_get_device_byname(&udev, pos);
+ retval = udev_db_search_name(devpath, sizeof(devpath), pos);
if (retval != 0) {
printf("device not found in database\n");
goto exit;
}
-
+ udev_db_get_device(&udev, devpath);
goto print;
}
printf("query needs device path(-p) or node name(-n) specified\n");
+ retval = 3;
goto exit;
print:
switch(query) {
case NAME:
- if (root) {
- snprintf(result, NAME_SIZE-1, "%s/%s", udev_root, udev.name);
- result[NAME_SIZE-1] = '\0';
- } else {
- strfieldcpy(result, udev.name);
- }
- break;
-
+ if (root)
+ printf("%s/%s\n", udev_root, udev.name);
+ else
+ printf("%s\n", udev.name);
+ goto exit;
case SYMLINK:
- if (root) {
- int slen;
- char *spos;
- char slink[NAME_SIZE];
-
- pos = result;
- foreach_strpart(udev.symlink, " \n\r", spos, slen) {
- strncpy(slink, spos, slen);
- slink[slen] = '\0';
- pos += sprintf(pos, "%s/%s ", udev_root, slink);
- }
- } else {
- strfieldcpy(result, udev.symlink);
- }
- break;
-
+ if (list_empty(&udev.symlink_list))
+ break;
+ if (root)
+ list_for_each_entry(name_loop, &udev.symlink_list, node)
+ printf("%s/%s ", udev_root, name_loop->name);
+ else
+ list_for_each_entry(name_loop, &udev.symlink_list, node)
+ printf("%s ", name_loop->name);
+ printf("\n");
+ goto exit;
case PATH:
- strfieldcpy(result, udev.devpath);
- break;
-
+ printf("%s\n", udev.devpath);
+ goto exit;
case ALL:
print_record(&udev);
goto exit;
-
default:
- goto exit;
+ goto help;
}
- printf("%s\n", result);
-
-exit:
- return retval;
}
if (attributes) {
if (path[0] == '\0') {
printf("attribute walk on device chain needs path(-p) specified\n");
- return -EINVAL;
+ retval = 4;
+ goto exit;
} else {
if (strncmp(path, sysfs_path, strlen(sysfs_path)) != 0) {
/* prepend sysfs mountpoint if not given */
- strfieldcpy(temp, path);
- strfieldcpy(path, sysfs_path);
- strfieldcat(path, temp);
+ snprintf(temp, sizeof(temp), "%s%s", sysfs_path, path);
+ temp[sizeof(temp)-1] = '\0';
+ strlcpy(path, temp, sizeof(temp));
}
print_device_chain(path);
- return 0;
+ goto exit;
}
}
if (root) {
printf("%s\n", udev_root);
- return 0;
+ goto exit;
}
help:
"\n"
" -r print udev root\n"
" -a print all SYSFS_attributes along the device chain\n"
- " -s print all sysfs devices with major/minor, physical device and bus\n"
+ " -d print the relationship of devpath and the node name for all\n"
+ " devices available in the database\n"
" -V print udev version\n"
" -h print this help text\n"
"\n");
- return retval;
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
- int rc = 0;
-
- logging_init("udevinfo");
-
- /* initialize our configuration */
- udev_init_config();
-
- rc = process_options(argc, argv);
+exit:
+ udev_cleanup_device(&udev);
logging_close();
- exit(rc);
+ return retval;
}
~ianmdlvl / elogind.git / blobdiff