Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/pax Recognize extended attribute headers and warn about ...



details:   https://anonhg.NetBSD.org/src/rev/bf26bc4b9537
branches:  trunk
changeset: 784305:bf26bc4b9537
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 24 17:43:44 2013 +0000

description:
Recognize extended attribute headers and warn about them since we are not
currently handling them.

diffstat:

 bin/pax/tar.c |  11 +++++++++--
 bin/pax/tar.h |   4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r a4b16d707eb3 -r bf26bc4b9537 bin/pax/tar.c
--- a/bin/pax/tar.c     Thu Jan 24 14:23:45 2013 +0000
+++ b/bin/pax/tar.c     Thu Jan 24 17:43:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tar.c,v 1.70 2012/08/09 08:09:22 christos Exp $        */
+/*     $NetBSD: tar.c,v 1.71 2013/01/24 17:43:44 christos Exp $        */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tar.c      8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: tar.c,v 1.70 2012/08/09 08:09:22 christos Exp $");
+__RCSID("$NetBSD: tar.c,v 1.71 2013/01/24 17:43:44 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -948,6 +948,13 @@
                            hd->typeflag == LONGLINKTYPE ? "Link" : "File");
                }
                break;
+       case FILEXTYPE:
+       case GLOBXTYPE:
+                   tty_warn(0, "%s extended headers posix ustar archive."
+                   " Extracting as plain files. Following files might be"
+                   " in the wrong directory or have wrong attributes.",
+                       hd->typeflag == FILEXTYPE ? "File" : "Global");
+                   /*FALLTHROUGH*/
        case CONTTYPE:
        case AREGTYPE:
        case REGTYPE:
diff -r a4b16d707eb3 -r bf26bc4b9537 bin/pax/tar.h
--- a/bin/pax/tar.h     Thu Jan 24 14:23:45 2013 +0000
+++ b/bin/pax/tar.h     Thu Jan 24 17:43:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tar.h,v 1.9 2004/05/11 17:12:26 christos Exp $ */
+/*     $NetBSD: tar.h,v 1.10 2013/01/24 17:43:44 christos Exp $        */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -59,6 +59,8 @@
 #define        DIRTYPE         '5'             /* Directory */
 #define        FIFOTYPE        '6'             /* FIFO */
 #define        CONTTYPE        '7'             /* high perf file */
+#define GLOBXTYPE      'g'             /* global extended header */
+#define FILEXTYPE      'x'             /* file extended header */
 
 /*
  * GNU tar compatibility;



Home | Main Index | Thread Index | Old Index