libudev: monitor - export filter_update()

[elogind.git] / udev / lib / libudev-device-db-write.c

diff --git a/udev/lib/libudev-device-db-write.c b/udev/lib/libudev-device-db-write.c
index 34095e5682303c08dd102ffe4287971a79e8301d..fa9f520f17f4330435e962dc07fd1837aee46903 100644 (file)
--- a/udev/lib/libudev-device-db-write.c
+++ b/udev/lib/libudev-device-db-write.c
@@ -1,18 +1,12 @@
 /*
- * Copyright (C) 2008 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, either version 2 of the License, or
- * (at your option) any later version.
+ * libudev - interface to udev device information
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdlib.h>
@@ -56,11 +50,23 @@ int udev_device_update_db(struct udev_device *udev_device)
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device))
                if (udev_list_entry_get_flag(list_entry))
                        goto file;
-       if (udev_device_get_num_fake_partitions(udev_device))
+       if (udev_device_get_num_fake_partitions(udev_device) != 0)
                goto file;
        if (udev_device_get_ignore_remove(udev_device))
                goto file;
-       /* try not to waste tmpfs memory; store values, if they fit, in a symlink target */
+       if (udev_device_get_devlink_priority(udev_device) != 0)
+               goto file;
+       if (udev_device_get_event_timeout(udev_device) >= 0)
+               goto file;
+       if (udev_device_get_watch_handle(udev_device) >= 0)
+               goto file;
+       if (udev_device_get_devnode(udev_device) == NULL)
+               goto out;
+
+       /*
+        * if we have only the node and symlinks to store, try not to waste
+        * tmpfs memory -- store values, if they fit, in a symlink target
+        */
        util_strlcpy(target, &udev_device_get_devnode(udev_device)[devlen], sizeof(target));
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device)) {
                size_t len;
@@ -86,9 +92,11 @@ file:
                }
        info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);
 
-       fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);
-       udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device))
-               fprintf(f, "S:%s\n", &udev_list_entry_get_name(list_entry)[devlen]);
+       if (udev_device_get_devnode(udev_device) != NULL) {
+               fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);
+               udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device))
+                       fprintf(f, "S:%s\n", &udev_list_entry_get_name(list_entry)[devlen]);
+       }
        if (udev_device_get_devlink_priority(udev_device) != 0)
                fprintf(f, "L:%u\n", udev_device_get_devlink_priority(udev_device));
        if (udev_device_get_event_timeout(udev_device) >= 0)
@@ -97,6 +105,8 @@ file:
                fprintf(f, "A:%u\n", udev_device_get_num_fake_partitions(udev_device));
        if (udev_device_get_ignore_remove(udev_device))
                fprintf(f, "R:%u\n", udev_device_get_ignore_remove(udev_device));
+       if (udev_device_get_watch_handle(udev_device) >= 0)
+               fprintf(f, "W:%u\n", udev_device_get_watch_handle(udev_device));
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
                if (!udev_list_entry_get_flag(list_entry))
                        continue;