diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/ls.c | 18 | ||||
| -rwxr-xr-x | tests/ls/dangle | 8 |
3 files changed, 24 insertions, 5 deletions
@@ -18,6 +18,9 @@ GNU coreutils NEWS -*- outline -*- ls -LR exits with status 2, not 0, when it encounters a cycle + ls -Li is now consistent with ls -Lil in printing "?", not "0" as the + inode of a dangling symlink. + ** Portability On Solaris 9, many commands would mistakenly treat file/ the same as @@ -3556,9 +3556,19 @@ format_group_width (gid_t g) return format_user_or_group_width (numeric_ids ? NULL : getgroup (g), g); } +/* Return a pointer to a formatted version of F->stat.st_ino, + possibly using buffer, BUF, of length BUFLEN, which must be at least + INT_BUFSIZE_BOUND (uintmax_t) bytes. */ +static char * +format_inode (char *buf, size_t buflen, const struct fileinfo *f) +{ + assert (INT_BUFSIZE_BOUND (uintmax_t) <= buflen); + return (f->stat.st_ino == NOT_AN_INODE_NUMBER + ? (char *) "?" + : umaxtostr (f->stat.st_ino, buf)); +} /* Print information about F in long format. */ - static void print_long_format (const struct fileinfo *f) { @@ -3615,9 +3625,7 @@ print_long_format (const struct fileinfo *f) { char hbuf[INT_BUFSIZE_BOUND (uintmax_t)]; sprintf (p, "%*s ", inode_number_width, - (f->stat.st_ino == NOT_AN_INODE_NUMBER - ? "?" - : umaxtostr (f->stat.st_ino, hbuf))); + format_inode (hbuf, sizeof hbuf, f)); /* Increment by strlen (p) here, rather than by inode_number_width + 1. The latter is wrong when inode_number_width is zero. */ p += strlen (p); @@ -4004,7 +4012,7 @@ print_file_name_and_frills (const struct fileinfo *f, size_t start_col) if (print_inode) printf ("%*s ", format == with_commas ? 0 : inode_number_width, - umaxtostr (f->stat.st_ino, buf)); + format_inode (buf, sizeof buf, f)); if (print_block_size) printf ("%*s ", format == with_commas ? 0 : block_size_width, diff --git a/tests/ls/dangle b/tests/ls/dangle index b2f8539b8..6abad9213 100755 --- a/tests/ls/dangle +++ b/tests/ls/dangle @@ -26,6 +26,9 @@ fi ln -s no-such-file dangle || framework_failure mkdir -p dir/sub || framework_failure ln -s dir slink-to-dir || framework_failure +mkdir d || framework_failure +ln -s no-such d/dangle || framework_failure +echo '? dangle' > subdir_exp || framework_failure fail=0 @@ -50,4 +53,9 @@ EOF compare out exp || fail=1 +# Ensure that ls -Li prints "?" as the inode of a dangling symlink. +rm -f out +ls -Li d > out 2>/dev/null && fail=1 +compare out subdir_exp || fail=1 + Exit $fail |