chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] 053 release
[elogind.git]
/
udevinfo.c
diff --git
a/udevinfo.c
b/udevinfo.c
index 013068541e82eba50ebd62fdd5c479ab8f5b8085..a80ca82e124ebb45550717bae4b4b469405970a4 100644
(file)
--- a/
udevinfo.c
+++ b/
udevinfo.c
@@
-30,7
+30,7
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "libsysfs/dlist.h"
#include "udev.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "libsysfs/dlist.h"
#include "udev.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "udev_version.h"
#include "udev_db.h"
#include "logging.h"
#include "udev_version.h"
#include "udev_db.h"
#include "logging.h"
@@
-39,7
+39,6
@@
#define SYSFS_VALUE_SIZE 256
#ifdef LOG
#define SYSFS_VALUE_SIZE 256
#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
void log_message (int level, const char *format, ...)
{
va_list args;
void log_message (int level, const char *format, ...)
{
va_list args;
@@
-142,7
+141,7
@@
static int print_device_chain(const char *path)
/* look for the 'dev' file */
attr = sysfs_get_classdev_attr(class_dev, "dev");
/* look for the 'dev' file */
attr = sysfs_get_classdev_attr(class_dev, "dev");
- if (attr
=
= NULL)
+ if (attr
!
= NULL)
printf("device '%s' has major:minor %s", class_dev->path, attr->value);
/* open sysfs class device directory and print all attributes */
printf("device '%s' has major:minor %s", class_dev->path, attr->value);
/* open sysfs class device directory and print all attributes */
@@
-219,8
+218,8
@@
static int print_sysfs_devices(void)
attr = sysfs_get_classdev_attr(class_dev, "dev");
if (attr) {
sscanf(attr->value, "%u:%u", &major, &minor);
attr = sysfs_get_classdev_attr(class_dev, "dev");
if (attr) {
sscanf(attr->value, "%u:%u", &major, &minor);
- printf("MAJOR %u\n", m
in
or);
- printf("MINOR %u\n", m
aj
or);
+ printf("MAJOR %u\n", m
aj
or);
+ printf("MINOR %u\n", m
in
or);
}
phys_dev = sysfs_get_classdev_device(class_dev);
}
phys_dev = sysfs_get_classdev_device(class_dev);
@@
-242,7
+241,7
@@
static int print_sysfs_devices(void)
static int process_options(int argc, char *argv[])
{
static int process_options(int argc, char *argv[])
{
- static const char short_options[] = "a
d
n:p:q:rsVh";
+ static const char short_options[] = "an:p:q:rsVh";
int option;
int retval = 1;
struct udevice udev;
int option;
int retval = 1;
struct udevice udev;
@@
-401,7
+400,7
@@
print:
break;
case PATH:
break;
case PATH:
- strfieldcpy(result, path);
+ strfieldcpy(result,
udev.dev
path);
break;
case ALL:
break;
case ALL:
@@
-439,7
+438,7
@@
exit:
}
help:
}
help:
- printf("Usage:
[-anpqrd
Vh]\n"
+ printf("Usage:
udevinfo [-anpqr
Vh]\n"
" -q TYPE query database for the specified value:\n"
" 'name' name of device node\n"
" 'symlink' pointing to node\n"
" -q TYPE query database for the specified value:\n"
" 'name' name of device node\n"
" 'symlink' pointing to node\n"