chiark / gitweb /
man: add note about parent matching behavior
[elogind.git] / udev_utils.c
index 87e7979c684dea1e31fd44ece56c773026318ba0..e892012132eff8678c5a7fdd139a5a6356fc28ab 100644 (file)
@@ -126,7 +126,6 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 {
        struct dirent *ent;
        DIR *dir;
-       char *ext;
        char filename[PATH_SIZE];
 
        dbg("open directory '%s'", dirname);
@@ -145,14 +144,16 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
                        continue;
 
                /* look for file matching with specified suffix */
-               ext = strrchr(ent->d_name, '.');
-               if (ext == NULL)
-                       continue;
-
-               if (strcmp(ext, suffix) != 0)
-                       continue;
-
-               dbg("put file '%s/%s' in list", dirname, ent->d_name);
+               if (suffix != NULL) {
+                       const char *ext;
+
+                       ext = strrchr(ent->d_name, '.');
+                       if (ext == NULL)
+                               continue;
+                       if (strcmp(ext, suffix) != 0)
+                               continue;
+               }
+               dbg("put file '%s/%s' into list", dirname, ent->d_name);
 
                snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
                filename[sizeof(filename)-1] = '\0';
@@ -172,7 +173,7 @@ uid_t lookup_user(const char *user)
        pw = getpwnam(user);
        if (pw == NULL) {
                if (errno == 0 || errno == ENOENT || errno == ESRCH)
-                       err("specified user unknown '%s'", user);
+                       err("specified user '%s' unknown", user);
                else
                        err("error resolving user '%s': %s", user, strerror(errno));
        } else
@@ -190,7 +191,7 @@ extern gid_t lookup_group(const char *group)
        gr = getgrnam(group);
        if (gr == NULL) {
                if (errno == 0 || errno == ENOENT || errno == ESRCH)
-                       err("specified group unknown '%s'", group);
+                       err("specified group '%s' unknown", group);
                else
                        err("error resolving group '%s': %s", group, strerror(errno));
        } else