Use $option instead of $1 so all options will be parsed. Bugfix by Marco Gerards

[chaz/tar] / src / create.c

diff --git a/src/create.c b/src/create.c
index b6a4f52624291baf03cb996a39b3b2d3d8471536..5292f82c6ed1224a6bfabe9f1401af5012651954 100644 (file)
--- a/src/create.c
+++ b/src/create.c
@@ -981,9 +981,11 @@ dump_dir0 (char *directory,
          return;
        }
     }
-  else if (!recursion_option)
+
+  if (!recursion_option)
     return;
-  else if (one_file_system_option
+
+  if (one_file_system_option
           && !top_level
           && parent_device != stat->stat.st_dev)
     {
@@ -1179,7 +1181,7 @@ dump_hard_link (struct tar_stat_info *stat)
       if ((dup = hash_lookup (link_table, &lp)))
        {
          /* We found a link.  */
-         char const *link_name = safer_name_suffix (dup->name, 1);
+         char const *link_name = safer_name_suffix (dup->name, true);
 
          dup->nlink--;
              
@@ -1275,7 +1277,7 @@ dump_file0 (struct tar_stat_info *stat, char *p,
     return;
 
   assign_string (&stat->orig_file_name, p);
-  assign_string (&stat->file_name, safer_name_suffix (p, 0));
+  assign_string (&stat->file_name, safer_name_suffix (p, false));
 
   if (deref_stat (dereference_option, p, &stat->stat) != 0)
     {