Radek Brich fc86677
--- tar-1.17/doc/tar.texi.wildcards	2007-06-28 13:23:46.000000000 +0200
Radek Brich fc86677
+++ tar-1.17/doc/tar.texi	2007-06-28 13:23:46.000000000 +0200
Radek Brich fc86677
@@ -6871,7 +6871,7 @@ The following table summarizes pattern-m
Radek Brich fc86677
 
Radek Brich fc86677
 @multitable @columnfractions .3 .7
Radek Brich fc86677
 @headitem Members @tab Default settings
Radek Brich fc86677
-@item Inclusion @tab @option{--no-wildcards --anchored --no-wildcards-match-slash}
Radek Brich fc86677
+@item Inclusion @tab @option{--wildcards --anchored --wildcards-match-slash}
Radek Brich fc86677
 @item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash}
Radek Brich fc86677
 @end multitable
Radek Brich fc86677
 
Radek Brich fc86677
@@ -10666,6 +10666,9 @@ version of this document is available at
Radek Brich fc86677
 @table @asis
Radek Brich fc86677
 @item Use of globbing patterns when listing and extracting.
Radek Brich fc86677
 
Radek Brich fc86677
+Note: Following is true for original unpatched GNU tar.
Radek Brich fc86677
+For compatibility reasons, the old behavior was preserved.
Radek Brich fc86677
+
Radek Brich fc86677
 Previous versions of GNU tar assumed shell-style globbing when
Radek Brich fc86677
 extracting from or listing an archive.  For example:
Radek Brich fc86677
 
Radek Brich fc86677
--- tar-1.17/src/tar.c.wildcards	2007-06-28 13:23:46.000000000 +0200
Radek Brich fc86677
+++ tar-1.17/src/tar.c	2007-06-28 13:23:46.000000000 +0200
Radek Brich fc86677
@@ -686,7 +686,7 @@ static struct argp_option options[] = {
Radek Brich fc86677
   {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
Radek Brich fc86677
    N_("case sensitive matching (default)"), GRID+1 },
Radek Brich fc86677
   {"wildcards", WILDCARDS_OPTION, 0, 0,
Radek Brich fc86677
-   N_("use wildcards (default for exclusion)"), GRID+1 },
Radek Brich fc86677
+   N_("use wildcards (default)"), GRID+1 },
Radek Brich fc86677
   {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
Radek Brich fc86677
    N_("verbatim string matching"), GRID+1 },
Radek Brich fc86677
   {"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
Radek Brich fc86677
@@ -780,8 +780,7 @@ ARGMATCH_VERIFY (atime_preserve_args, at
Radek Brich fc86677
 /* Wildcard matching settings */
Radek Brich fc86677
 enum wildcards
Radek Brich fc86677
   {
Radek Brich fc86677
-    default_wildcards, /* For exclusion == enable_wildcards,
Radek Brich fc86677
-			  for inclusion == disable_wildcards */
Radek Brich fc86677
+    default_wildcards, /* enable_wildcards */
Radek Brich fc86677
     disable_wildcards,
Radek Brich fc86677
     enable_wildcards
Radek Brich fc86677
   };
Radek Brich fc86677
@@ -809,7 +808,7 @@ struct tar_args        /* Variables used
Radek Brich fc86677
   | recursion_option)
Radek Brich fc86677
 
Radek Brich fc86677
 #define MAKE_INCL_OPTIONS(args) \
Radek Brich fc86677
- ((((args)->wildcards == enable_wildcards) ? EXCLUDE_WILDCARDS : 0) \
Radek Brich fc86677
+ ((((args)->wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0) \
Radek Brich fc86677
   | (args)->include_anchored \
Radek Brich fc86677
   | (args)->matching_flags \
Radek Brich fc86677
   | recursion_option)
Radek Brich fc86677
@@ -2126,7 +2125,7 @@ decode_options (int argc, char **argv)
Radek Brich fc86677
 
Radek Brich fc86677
   /* Warn about implicit use of the wildcards in command line arguments.
Radek Brich fc86677
      See TODO */
Radek Brich fc86677
-  warn_regex_usage = args.wildcards == default_wildcards;
Radek Brich fc86677
+  warn_regex_usage = 0; //args.wildcards == default_wildcards;
Radek Brich fc86677
 
Radek Brich fc86677
   /* Derive option values and check option consistency.  */
Radek Brich fc86677
 
Radek Brich fc86677
--- tar-1.17/src/names.c.wildcards	2007-04-03 14:17:13.000000000 +0200
Radek Brich fc86677
+++ tar-1.17/src/names.c	2007-06-28 13:30:48.000000000 +0200
Radek Brich fc86677
@@ -812,10 +812,7 @@ collect_and_sort_names (void)
Radek Brich fc86677
       next_name = name->next;
Radek Brich fc86677
       if (name->found_count || name->dir_contents)
Radek Brich fc86677
 	continue;
Radek Brich fc86677
-      if (name->matching_flags & EXCLUDE_WILDCARDS)
Radek Brich fc86677
-	/* NOTE: EXCLUDE_ANCHORED is not relevant here */
Radek Brich fc86677
-	/* FIXME: just skip regexps for now */
Radek Brich fc86677
-	continue;
Radek Brich fc86677
+
Radek Brich fc86677
       chdir_do (name->change_dir);
Radek Brich fc86677
       if (name->name[0] == 0)
Radek Brich fc86677
 	continue;