Merge pull request #3539 from keszybz/udevadm-man-fix

Udevadm man fix
2016-06-14 23:41:00 +02:00
parent 1d7100298c bd8420c518
commit 8dd57192bc
2 changed files with 5 additions and 9 deletions
@@ -380,7 +380,7 @@
      <para>Modify the internal state of the running udev daemon.</para>
      <variablelist>
        <varlistentry>
-          <term><option>-x</option></term>
+          <term><option>-e</option></term>
          <term><option>--exit</option></term>
          <listitem>
            <para>Signal and wait for systemd-udevd to exit.</para>
@@ -433,17 +433,13 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) {
                case QUERY_PROPERTY:
                        list_entry = udev_device_get_properties_list_entry(device);
                        while (list_entry != NULL) {
-                                if (export) {
-                                        const char *prefix = export_prefix;
-
-                                        if (prefix == NULL)
-                                                prefix = "";
-                                        printf("%s%s='%s'\n", prefix,
+                                if (export)
+                                        printf("%s%s='%s'\n", strempty(export_prefix),
                                               udev_list_entry_get_name(list_entry),
                                               udev_list_entry_get_value(list_entry));
-                                } else {
+                                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;