chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use proper directory lib/lib64 for libvolume_id
[elogind.git]
/
udevinfo.c
diff --git
a/udevinfo.c
b/udevinfo.c
index a0d6cac401629d76fee701b4f6aa9f9486c8e3a6..b9ee17c4f1012651fae6ba36bf1e9e3c8eddce37 100644
(file)
--- a/
udevinfo.c
+++ b/
udevinfo.c
@@
-54,6
+54,8
@@
static void print_all_attributes(const char *devpath, const char *key)
if (strcmp(dent->d_name, "uevent") == 0)
continue;
if (strcmp(dent->d_name, "uevent") == 0)
continue;
+ if (strcmp(dent->d_name, "dev") == 0)
+ continue;
strlcpy(filename, path, sizeof(filename));
strlcat(filename, "/", sizeof(filename));
strlcpy(filename, path, sizeof(filename));
strlcat(filename, "/", sizeof(filename));
@@
-205,14
+207,22
@@
out:
return rc;
}
return rc;
}
-static int stat_device(const char *name)
+static int stat_device(const char *name
, int export, const char *prefix
)
{
struct stat statbuf;
if (stat(name, &statbuf) != 0)
return -1;
{
struct stat statbuf;
if (stat(name, &statbuf) != 0)
return -1;
- printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
+ if (export) {
+ if (prefix == NULL)
+ prefix = "INFO_";
+ printf("%sMAJOR=%d\n"
+ "%sMINOR=%d\n",
+ prefix, major(statbuf.st_dev),
+ prefix, minor(statbuf.st_dev));
+ } else
+ printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
return 0;
}
return 0;
}
@@
-221,6
+231,8
@@
int udevinfo(int argc, char *argv[], char *envp[])
int option;
struct udevice *udev;
int root = 0;
int option;
struct udevice *udev;
int root = 0;
+ int export = 0;
+ const char *export_prefix = NULL;
static const struct option options[] = {
{ "name", 1, NULL, 'n' },
static const struct option options[] = {
{ "name", 1, NULL, 'n' },
@@
-230,6
+242,8
@@
int udevinfo(int argc, char *argv[], char *envp[])
{ "export-db", 0, NULL, 'e' },
{ "root", 0, NULL, 'r' },
{ "device-id-of-file", 1, NULL, 'd' },
{ "export-db", 0, NULL, 'e' },
{ "root", 0, NULL, 'r' },
{ "device-id-of-file", 1, NULL, 'd' },
+ { "export", 0, NULL, 'x' },
+ { "export-prefix", 1, NULL, 'P' },
{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
{ "help", 0, NULL, 'h' },
{}
{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
{ "help", 0, NULL, 'h' },
{}
@@
-268,7
+282,7
@@
int udevinfo(int argc, char *argv[], char *envp[])
}
while (1) {
}
while (1) {
- option = getopt_long(argc, argv, "aed:n:p:q:rVh", options, NULL);
+ option = getopt_long(argc, argv, "aed:n:p:q:r
xP
Vh", options, NULL);
if (option == -1)
break;
if (option == -1)
break;
@@
-352,6
+366,12
@@
int udevinfo(int argc, char *argv[], char *envp[])
case 'e':
export_db();
goto exit;
case 'e':
export_db();
goto exit;
+ case 'x':
+ export = 1;
+ break;
+ case 'P':
+ export_prefix = optarg;
+ break;
case 1:
printf("%s\n", UDEV_VERSION);
goto exit;
case 1:
printf("%s\n", UDEV_VERSION);
goto exit;
@@
-460,7
+480,7
@@
int udevinfo(int argc, char *argv[], char *envp[])
}
break;
case ACTION_DEVICE_ID_FILE:
}
break;
case ACTION_DEVICE_ID_FILE:
- if (stat_device(name) != 0)
+ if (stat_device(name
, export, export_prefix
) != 0)
rc = 6;
break;
case ACTION_ROOT:
rc = 6;
break;
case ACTION_ROOT: