X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fincremen.c;h=d4ef30a1add3af2cb526d79f52026f45528a4320;hb=5e01ba7dbe35dca6c68415c5d9e9d6fb516fc560;hp=e4645fa1f16a5b007b3603672f220e9531c34e96;hpb=ae00dc0d37baef4504408c9ce03997781b735d41;p=chaz%2Ftar

diff --git a/src/incremen.c b/src/incremen.c
index e4645fa..d4ef30a 100644
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -150,6 +150,7 @@ procdir (char *name_buffer, struct stat *stat_data,
 { 
   struct directory *directory;
   bool nfs = NFS_FILE_STAT (*stat_data);
+  struct name *np;
   
   if ((directory = find_directory (name_buffer)) != NULL)
     {
@@ -202,8 +203,12 @@ procdir (char *name_buffer, struct stat *stat_data,
 	? ALL_CHILDREN
 	: CHANGED_CHILDREN;
     }
-  
-  if (one_file_system_option && device != stat_data->st_dev)
+
+  /* If the directory is on another device and --one-file-system was given,
+     omit it... */
+  if (one_file_system_option && device != stat_data->st_dev
+      /* ... except if it was explicitely given in the command line */
+      && !((np = name_scan (name_buffer, true)) && np->explicit))
     directory->children = NO_CHILDREN;
   else if (children == ALL_CHILDREN)
     directory->children = ALL_CHILDREN;
@@ -454,7 +459,7 @@ read_directory_file (void)
 	incremental_version = 0;
 
       if (incremental_version > TAR_INCREMENTAL_VERSION)
-	ERROR((1, 0, _("Unsupported incremental format version: %s"),
+	ERROR((1, 0, _("Unsupported incremental format version: %d"),
 	       incremental_version));
       
       t = u = (errno = 0, strtoumax (buf, &ebuf, 10));