picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udevadm: info - honor --export and --export-prefix for property query

Browse source 
The output will always be quoted:
  $ udevadm info --export --export-prefix=MY_ --query=property --name=sda
  MY_UDEV_LOG='3'
  MY_DEVPATH='/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda'
  MY_MAJOR='259'
  MY_MINOR='0'
  MY_DEVNAME='sda'
  MY_DEVTYPE='disk'
  MY_SUBSYSTEM='block'
This commit is contained in:
Kay Sievers 2010-12-09 21:10:30 +01:00
parent 8ba13ec1cd
commit 88163971b9
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
udev/udevadm-info.c
View file

@ -154,7 +154,7 @@ static void print_record(struct udev_device *device)
printf("\n");
}
static int stat_device(const char *name, int export, const char *prefix)
static int stat_device(const char *name, bool export, const char *prefix)
{
struct stat statbuf;
@ -198,8 +198,8 @@ static int export_devices(struct udev *udev)
int udevadm_info(struct udev *udev, int argc, char *argv[])
{
struct udev_device *device = NULL;
int root = 0;
int export = 0;
bool root = 0;
bool export = 0;
const char *export_prefix = NULL;
char path[UTIL_PATH_SIZE];
char name[UTIL_PATH_SIZE];
@ -324,7 +324,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
case 'r':
if (action == ACTION_NONE)
action = ACTION_ROOT;
root = 1;
root = true;
break;
case 'd':
action = ACTION_DEVICE_ID_FILE;
@ -337,7 +337,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
export_devices(udev);
goto exit;
case 'x':
export = 1;
export = true;
break;
case 'P':
export_prefix = optarg;
@ -417,7 +417,17 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
case QUERY_PROPERTY:
list_entry = udev_device_get_properties_list_entry(device);
while (list_entry != NULL) {
printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
if (export) {
const char *prefix = export_prefix;
if (prefix == NULL)
prefix = "";
printf("%s%s='%s'\n", prefix,
udev_list_entry_get_name(list_entry),
udev_list_entry_get_value(list_entry));
} else {
printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
}
list_entry = udev_list_entry_get_next(list_entry);
}
break;