Prefer some device paths in status display. (Issue 48)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@194 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index bb04327..da92ac5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-06  Milan Broz  <mbroz@redhat.com>
+       * Prefer some device paths in status display.
+
 2010-02-25  Milan Broz  <mbroz@redhat.com>
        * Do not verify unlocking passphrase in luksAddKey command.
        * Properly initialise crypto backend in header backup/restore commands.

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 16d1535..2834d33 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -75,7 +75,7 @@ void dm_exit(void)
        }
 }
 
-static char *__lookup_dev(char *path, dev_t dev)
+static char *__lookup_dev(char *path, dev_t dev, int dir_level, const int max_level)
 {
        struct dirent *entry;
        struct stat st;
@@ -84,6 +84,10 @@ static char *__lookup_dev(char *path, dev_t dev)
        DIR *dir;
        int space;
 
+       /* Ignore strange nested directories */
+       if (dir_level > max_level)
+               return NULL;
+
        path[PATH_MAX - 1] = '\0';
        ptr = path + strlen(path);
        *ptr++ = '/';
@@ -95,9 +99,8 @@ static char *__lookup_dev(char *path, dev_t dev)
                return NULL;
 
        while((entry = readdir(dir))) {
-               if (entry->d_name[0] == '.' &&
-                   (entry->d_name[1] == '\0' || (entry->d_name[1] == '.' &&
-                                                 entry->d_name[2] == '\0')))
+               if (entry->d_name[0] == '.' ||
+                   !strncmp(entry->d_name, "..", 2))
                        continue;
 
                strncpy(ptr, entry->d_name, space);
@@ -105,10 +108,13 @@ static char *__lookup_dev(char *path, dev_t dev)
                        continue;
 
                if (S_ISDIR(st.st_mode)) {
-                       result = __lookup_dev(path, dev);
+                       result = __lookup_dev(path, dev, dir_level + 1, max_level);
                        if (result)
                                break;
                } else if (S_ISBLK(st.st_mode)) {
+                       /* workaround: ignore dm-X devices, these are internal kernel names */
+                       if (dir_level == 0 && !strncmp(entry->d_name, "dm-", 3))
+                               continue;
                        if (st.st_rdev == dev) {
                                result = strdup(path);
                                break;
@@ -117,22 +123,38 @@ static char *__lookup_dev(char *path, dev_t dev)
        }
 
        closedir(dir);
-
        return result;
 }
 
-static char *lookup_dev(const char *dev)
+static char *lookup_dev(const char *dev_id)
 {
        uint32_t major, minor;
-       char buf[PATH_MAX + 1];
+       dev_t dev;
+       char *result, buf[PATH_MAX + 1];
 
-       if (sscanf(dev, "%" PRIu32 ":%" PRIu32, &major, &minor) != 2)
+       if (sscanf(dev_id, "%" PRIu32 ":%" PRIu32, &major, &minor) != 2)
                return NULL;
 
+       dev = makedev(major, minor);
        strncpy(buf, DEVICE_DIR, PATH_MAX);
        buf[PATH_MAX] = '\0';
 
-       return __lookup_dev(buf, makedev(major, minor));
+       /* First try low level device */
+       if ((result = __lookup_dev(buf, dev, 0, 0)))
+               return result;
+
+       /* If it is dm, try DM dir  */
+       if (dm_is_dm_major(major)) {
+               strncpy(buf, dm_dir(), PATH_MAX);
+               if ((result = __lookup_dev(buf, dev, 0, 0)))
+                       return result;
+       }
+
+       strncpy(buf, DEVICE_DIR, PATH_MAX);
+       result = __lookup_dev(buf, dev, 0, 4);
+
+       /* If not found, return major:minor */
+       return result ?: strdup(dev_id);
 }
 
 static int _dev_read_ahead(const char *dev, uint32_t *read_ahead)