namei: align missing files with rest of the print out

This change should make namei output more readable when multiple
arguments are supplied.

The old:

$ namei -l /usr/foo
f: /usr/foo
drwxr-xr-x root root /
drwxr-xr-x root root usr
foo - No such file or directory

The new:

$ namei -l /usr/foo
f: /usr/foo
drwxr-xr-x root root /
drwxr-xr-x root root usr
                     foo - No such file or directory

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index a9c83011fabcfd91669c5c0d32a69bf40d590cfa..1152ea76420887ce88f3c9968d6733a4f8eedcb9 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -367,6 +367,15 @@ print_namei(struct namei *nm, char *path)
                char md[11];
 
                if (nm->noent) {
+                       int blanks = 1;
+                       if (flags & NAMEI_MODES)
+                               blanks += 9;
+                       if (flags & NAMEI_OWNERS)
+                               blanks += uwidth + gwidth + 2;
+                       if (!(flags & NAMEI_VERTICAL))
+                               blanks += 1;
+                       blanks += nm->level * 2;
+                       printf("%*s ", blanks, "");
                        printf(_("%s - No such file or directory\n"), nm->name);
                        return -1;
                }

diff --git a/tests/expected/namei/logic b/tests/expected/namei/logic
index 9632db0a9a746bc18aac15a5dd9df2c82357ee68..8e217d973a81cecd5bab16ffc7907d4b26172612 100644 (file)
--- a/tests/expected/namei/logic
+++ b/tests/expected/namei/logic
@@ -10,4 +10,4 @@ f: namei1/namei2/a/b
  d namei1
  d namei2
  - a
-b - No such file or directory
+   b - No such file or directory