Improve listed incremental dumps.

[chaz/tar] / src / xheader.c

diff --git a/src/xheader.c b/src/xheader.c
index 9b291a21e62a93251cd292415d666d942e10f857..c779c0ad47c6aad23b4011e4a007879bb4e2a5e3 100644 (file)
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -1,10 +1,10 @@
 /* POSIX extended headers for tar.
 
 /* POSIX extended headers for tar.
 

-   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -25,8 +25,6 @@
 
 #include "common.h"
 
 
 #include "common.h"
 

-#include <fnmatch.h>
-

 static bool xheader_protected_pattern_p (char const *pattern);
 static bool xheader_protected_keyword_p (char const *keyword);
 static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));
 static bool xheader_protected_pattern_p (char const *pattern);
 static bool xheader_protected_keyword_p (char const *keyword);
 static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));


@@ -170,12 +168,12 @@ xheader_set_keyword_equal (char *kw, char *eq)
       global = false;
     }
 
       global = false;
     }
 

-  while (p > kw && isspace (*p))
+  while (p > kw && isspace ((unsigned char) *p))

     p--;
 
   *p = 0;
 
     p--;
 
   *p = 0;
 

-  for (p = eq + 1; *p && isspace (*p); p++)
+  for (p = eq + 1; *p && isspace ((unsigned char) *p); p++)

     ;
 
   if (strcmp (kw, "delete") == 0)
     ;
 
   if (strcmp (kw, "delete") == 0)


@@ -573,8 +571,9 @@ decx (void *data, char const *keyword, char const *value, size_t size)
   if (t)
     t->decoder (st, keyword, value, size);
   else
   if (t)
     t->decoder (st, keyword, value, size);
   else

-    ERROR((0, 0, _("Ignoring unknown extended header keyword `%s'"),
-          keyword));
+    WARNOPT (WARN_UNKNOWN_KEYWORD,
+            (0, 0, _("Ignoring unknown extended header keyword `%s'"),
+             keyword));

 }
 
 void
 }
 
 void