Bugfixes.

* doc/tar.1: Fix typo in font spec.
* src/tar.c (sort_mode_arg, sort_mode_flag): Protect "inode"
(SAVEDIR_SORT_INODE) with D_INO_IN_DIRENT

diff --git a/doc/tar.1 b/doc/tar.1
index 900062789c0cd1791a1a0eaae5d6fbd47f14c6ea..b91de63ccbefe170e05191c5c6dd2f3eb9a80bc9 100644 (file)
--- a/doc/tar.1
+++ b/doc/tar.1
@@ -879,7 +879,7 @@ Exclude files matching patterns listed in FILE.
 \fB\-\-strip\-components\fR=\fINUMBER\fR
 Strip \fINUMBER\fR leading components from file names on extraction.
 .TP
 \fB\-\-strip\-components\fR=\fINUMBER\fR
 Strip \fINUMBER\fR leading components from file names on extraction.
 .TP

-\fB\-\-transform\fR=\fIEXPRESSION\dR, \fB\-\-xform\fR=\fIEXPRESSION\fR
+\fB\-\-transform\fR=\fIEXPRESSION\fR, \fB\-\-xform\fR=\fIEXPRESSION\fR

 Use sed replace \fIEXPRESSION\fR to transform file names.
 .SS File name matching options
 These options affect both exclude and include patterns.
 Use sed replace \fIEXPRESSION\fR to transform file names.
 .SS File name matching options
 These options affect both exclude and include patterns.

diff --git a/src/tar.c b/src/tar.c
index 225c6243c7024c55e9e124265913789b61bb894f..f8102e0aaef34b303664f331679a2ec328c72b49 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1341,14 +1341,18 @@ static char filename_terminator;
 static char const *const sort_mode_arg[] = {
   "none",
   "name",
 static char const *const sort_mode_arg[] = {
   "none",
   "name",

+#if D_INO_IN_DIRENT

   "inode",
   "inode",

+#endif

   NULL
 };
 
 static int sort_mode_flag[] = {
     SAVEDIR_SORT_NONE,
     SAVEDIR_SORT_NAME,
   NULL
 };
 
 static int sort_mode_flag[] = {
     SAVEDIR_SORT_NONE,
     SAVEDIR_SORT_NAME,

+#if D_INO_IN_DIRENT

     SAVEDIR_SORT_INODE
     SAVEDIR_SORT_INODE

+#endif

 };
 
 ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
 };
 
 ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);