Minor fix: lastdump was not the only one using fstabsearch.

Index: dump.h
===================================================================
RCS file: /cvs/src/sbin/dump/dump.h,v
retrieving revision 1.23
diff -u -p -r1.23 dump.h
--- dump.h      3 May 2015 01:44:34 -0000       1.23
+++ dump.h      6 May 2015 11:42:54 -0000
@@ -125,6 +125,7 @@ __dead void dumpabort(int signo);
 void   getfstab(void);
 
 char   *rawname(char *cp);
+char   *getrealpath(char *path);
 union  dinode *getino(ino_t inum, int *mode);
 
 /* rdump routines */
Index: main.c
===================================================================
RCS file: /cvs/src/sbin/dump/main.c,v
retrieving revision 1.55
diff -u -p -r1.55 main.c
--- main.c      3 May 2015 01:44:34 -0000       1.55
+++ main.c      6 May 2015 11:42:54 -0000
@@ -363,7 +363,13 @@ main(int argc, char *argv[])
                }
        } else if ((dt = fstabsearch(disk)) != NULL) {
                /* in fstab? */
-               disk = rawname(dt->fs_spec);
+               if (strchr(dt->fs_spec, '/')) {
+                       /* fs_spec is a /dev/something */
+                       disk = rawname(dt->fs_spec);
+               } else {
+                       /* fs_spec is a DUID */
+                       disk = rawname(disk);
+               }
                mount_point = dt->fs_file;
                (void)strlcpy(spcl.c_dev, dt->fs_spec, sizeof(spcl.c_dev));
                if (dirlist != 0) {
@@ -656,6 +662,23 @@ rawname(char *cp)
        (void)snprintf(rawbuf, sizeof(rawbuf), "%s/r%s", cp, dp + 1);
        *dp = '/';
        return (rawbuf);
+}
+
+/*
+ * Wrapper around opendev(3) to get a realpath of a device.
+ */
+char *
+getrealpath(char *path)
+{
+       int fd;
+       char *realpath;
+
+       if ((fd = opendev(path, O_RDONLY | O_NOFOLLOW, 0,
+                         &realpath)) >= 0) {
+               close(fd);
+               return (strdup(realpath));
+       }
+       return (NULL);
 }
 
 /*
Index: optr.c
===================================================================
RCS file: /cvs/src/sbin/dump/optr.c,v
retrieving revision 1.36
diff -u -p -r1.36 optr.c
--- optr.c      15 Mar 2015 00:41:27 -0000      1.36
+++ optr.c      6 May 2015 11:42:54 -0000
@@ -337,7 +337,7 @@ fstabsearch(char *key)
 {
        struct pfstab *pf;
        struct fstab *fs;
-       char *rn;
+       char *rn, *rp;
 
        for (pf = table; pf != NULL; pf = pf->pf_next) {
                fs = pf->pf_fstab;
@@ -346,6 +346,13 @@ fstabsearch(char *key)
                        return (fs);
                rn = rawname(fs->fs_spec);
                if (rn != NULL && strcmp(rn, key) == 0)
+                       return (fs);
+               rp = getrealpath(key);
+               if (rn != NULL && rp != NULL && strcmp(rn, rp) == 0)
+                       return (fs);
+               rp = getrealpath(fs->fs_spec);
+               rn = rawname(key);
+               if (rn != NULL && rp != NULL && strcmp(rn, rp) == 0)
                        return (fs);
                if (key[0] != '/') {
                        if (*fs->fs_spec == '/' &&

-- 
Manuel Giraud

Reply via email to