]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Add the device parsing logic. It allows mtree's libarchive to
authorJean-Yves Migeon <jeanyves.migeon@free.fr>
Tue, 3 Sep 2013 14:12:37 +0000 (16:12 +0200)
committerJean-Yves Migeon <jeanyves.migeon@free.fr>
Tue, 3 Sep 2013 14:12:37 +0000 (16:12 +0200)
parse device entries like NetBSD's mtree and its multiple possible
format: native, 386bsd, 4bsd, bsdos, freebsd, hpux, isc, linux, netbsd,
osf1, sco, solaris, sunos, svr3, svr4, and ultrix.

libarchive/CMakeLists.txt
libarchive/archive_pack_dev.c [new file with mode: 0644]
libarchive/archive_pack_dev.h [new file with mode: 0644]
libarchive/archive_platform.h
libarchive/archive_read_support_format_mtree.c
libarchive/mtree.5

index 23d36325fe33b2b90bdd4628ca0d9ea68be85dc5..986af97e6a904b0bd1972237660aa7d82b787fff 100644 (file)
@@ -35,6 +35,8 @@ SET(libarchive_SOURCES
   archive_match.c
   archive_options.c
   archive_options_private.h
+  archive_pack_dev.h
+  archive_pack_dev.c
   archive_pathmatch.c
   archive_pathmatch.h
   archive_platform.h
diff --git a/libarchive/archive_pack_dev.c b/libarchive/archive_pack_dev.c
new file mode 100644 (file)
index 0000000..474f962
--- /dev/null
@@ -0,0 +1,304 @@
+/*     $NetBSD: pack_dev.c,v 1.12 2013/06/14 16:28:20 tsutsui Exp $    */
+
+/*-
+ * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Originally from NetBSD's mknod(8) source. */
+
+#include "archive_platform.h"
+
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#if !defined(lint)
+__RCSID("$NetBSD$");
+#endif /* not lint */
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "archive_pack_dev.h"
+
+static pack_t  pack_netbsd;
+static pack_t  pack_freebsd;
+static pack_t  pack_8_8;
+static pack_t  pack_12_20;
+static pack_t  pack_14_18;
+static pack_t  pack_8_24;
+static pack_t  pack_bsdos;
+static int     compare_format(const void *, const void *);
+
+static const char iMajorError[] = "invalid major number";
+static const char iMinorError[] = "invalid minor number";
+static const char tooManyFields[] = "too many fields for format";
+
+       /* exported */
+dev_t
+pack_native(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev(numbers[0], numbers[1]);
+               if ((u_long)major(dev) != numbers[0])
+                       *error = iMajorError;
+               else if ((u_long)minor(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+static dev_t
+pack_netbsd(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_netbsd(numbers[0], numbers[1]);
+               if ((u_long)major_netbsd(dev) != numbers[0])
+                       *error = iMajorError;
+               else if ((u_long)minor_netbsd(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_freebsd(x)        ((int32_t)(((x) & 0x0000ff00) >> 8))
+#define        minor_freebsd(x)        ((int32_t)(((x) & 0xffff00ff) >> 0))
+#define        makedev_freebsd(x,y)    ((dev_t)((((x) << 8) & 0x0000ff00) | \
+                                        (((y) << 0) & 0xffff00ff)))
+
+static dev_t
+pack_freebsd(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_freebsd(numbers[0], numbers[1]);
+               if ((u_long)major_freebsd(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_freebsd(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_8_8(x)            ((int32_t)(((x) & 0x0000ff00) >> 8))
+#define        minor_8_8(x)            ((int32_t)(((x) & 0x000000ff) >> 0))
+#define        makedev_8_8(x,y)        ((dev_t)((((x) << 8) & 0x0000ff00) | \
+                                        (((y) << 0) & 0x000000ff)))
+
+static dev_t
+pack_8_8(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_8_8(numbers[0], numbers[1]);
+               if ((u_long)major_8_8(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_8_8(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_12_20(x)          ((int32_t)(((x) & 0xfff00000) >> 20))
+#define        minor_12_20(x)          ((int32_t)(((x) & 0x000fffff) >>  0))
+#define        makedev_12_20(x,y)      ((dev_t)((((x) << 20) & 0xfff00000) | \
+                                        (((y) <<  0) & 0x000fffff)))
+
+static dev_t
+pack_12_20(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_12_20(numbers[0], numbers[1]);
+               if ((u_long)major_12_20(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_12_20(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_14_18(x)          ((int32_t)(((x) & 0xfffc0000) >> 18))
+#define        minor_14_18(x)          ((int32_t)(((x) & 0x0003ffff) >>  0))
+#define        makedev_14_18(x,y)      ((dev_t)((((x) << 18) & 0xfffc0000) | \
+                                        (((y) <<  0) & 0x0003ffff)))
+
+static dev_t
+pack_14_18(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_14_18(numbers[0], numbers[1]);
+               if ((u_long)major_14_18(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_14_18(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_8_24(x)           ((int32_t)(((x) & 0xff000000) >> 24))
+#define        minor_8_24(x)           ((int32_t)(((x) & 0x00ffffff) >>  0))
+#define        makedev_8_24(x,y)       ((dev_t)((((x) << 24) & 0xff000000) | \
+                                        (((y) <<  0) & 0x00ffffff)))
+
+static dev_t
+pack_8_24(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_8_24(numbers[0], numbers[1]);
+               if ((u_long)major_8_24(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_8_24(dev) != numbers[1])
+                       *error = iMinorError;
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+#define        major_12_12_8(x)        ((int32_t)(((x) & 0xfff00000) >> 20))
+#define        unit_12_12_8(x)         ((int32_t)(((x) & 0x000fff00) >>  8))
+#define        subunit_12_12_8(x)      ((int32_t)(((x) & 0x000000ff) >>  0))
+#define        makedev_12_12_8(x,y,z)  ((dev_t)((((x) << 20) & 0xfff00000) | \
+                                        (((y) <<  8) & 0x000fff00) | \
+                                        (((z) <<  0) & 0x000000ff)))
+
+static dev_t
+pack_bsdos(int n, u_long numbers[], const char **error)
+{
+       dev_t dev = 0;
+
+       if (n == 2) {
+               dev = makedev_12_20(numbers[0], numbers[1]);
+               if ((u_long)major_12_20(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)minor_12_20(dev) != numbers[1])
+                       *error = iMinorError;
+       } else if (n == 3) {
+               dev = makedev_12_12_8(numbers[0], numbers[1], numbers[2]);
+               if ((u_long)major_12_12_8(dev) != numbers[0])
+                       *error = iMajorError;
+               if ((u_long)unit_12_12_8(dev) != numbers[1])
+                       *error = "invalid unit number";
+               if ((u_long)subunit_12_12_8(dev) != numbers[2])
+                       *error = "invalid subunit number";
+       } else
+               *error = tooManyFields;
+       return (dev);
+}
+
+
+               /* list of formats and pack functions */
+               /* this list must be sorted lexically */
+static struct format {
+       const char      *name;
+       pack_t          *pack;
+} formats[] = {
+       {"386bsd",  pack_8_8},
+       {"4bsd",    pack_8_8},
+       {"bsdos",   pack_bsdos},
+       {"freebsd", pack_freebsd},
+       {"hpux",    pack_8_24},
+       {"isc",     pack_8_8},
+       {"linux",   pack_8_8},
+       {"native",  pack_native},
+       {"netbsd",  pack_netbsd},
+       {"osf1",    pack_12_20},
+       {"sco",     pack_8_8},
+       {"solaris", pack_14_18},
+       {"sunos",   pack_8_8},
+       {"svr3",    pack_8_8},
+       {"svr4",    pack_14_18},
+       {"ultrix",  pack_8_8},
+};
+
+static int
+compare_format(const void *key, const void *element)
+{
+       const char              *name;
+       const struct format     *format;
+
+       name = key;
+       format = element;
+
+       return (strcmp(name, format->name));
+}
+
+
+pack_t *
+pack_find(const char *name)
+{
+       struct format   *format;
+
+       format = bsearch(name, formats,
+           sizeof(formats)/sizeof(formats[0]),
+           sizeof(formats[0]), compare_format);
+       if (format == 0)
+               return (NULL);
+       return (format->pack);
+}
diff --git a/libarchive/archive_pack_dev.h b/libarchive/archive_pack_dev.h
new file mode 100644 (file)
index 0000000..7c7b80b
--- /dev/null
@@ -0,0 +1,50 @@
+/*     $NetBSD: pack_dev.h,v 1.8 2013/06/14 16:28:20 tsutsui Exp $     */
+
+/*-
+ * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Originally from NetBSD's mknod(8) source. */
+
+#ifndef        _PACK_DEV_H
+#define        _PACK_DEV_H
+
+typedef        dev_t pack_t(int, u_long [], const char **);
+typedef unsigned long u_long;
+
+pack_t *pack_find(const char *);
+pack_t  pack_native;
+
+#define        major_netbsd(x)         ((int32_t)((((x) & 0x000fff00) >>  8)))
+#define        minor_netbsd(x)         ((int32_t)((((x) & 0xfff00000) >> 12) | \
+                                          (((x) & 0x000000ff) >>  0)))
+#define        makedev_netbsd(x,y)     ((dev_t)((((x) <<  8) & 0x000fff00) | \
+                                        (((y) << 12) & 0xfff00000) | \
+                                        (((y) <<  0) & 0x000000ff)))
+
+#endif /* _PACK_DEV_H */
index ce2f482ba042873b0f4bd26de8855b1f9e6dbb15..faeb5efcbb05fc9298ee07669abaf00392b736de 100644 (file)
  * headers as required.
  */
 
-/* Get a real definition for __FBSDID if we can */
+/* Get a real definition for __FBSDID or __RCSID if we can */
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 
-/* If not, define it so as to avoid dangling semicolons. */
+/* If not, define them so as to avoid dangling semicolons. */
 #ifndef __FBSDID
 #define        __FBSDID(a)     struct _undefined_hack
 #endif
+#ifndef __RCSID
+#define        __RCSID(a)     struct _undefined_hack
+#endif
 
 /* Try to get standard C99-style integer type definitions. */
 #if HAVE_INTTYPES_H
index c4e7021a869bbe9ce5d0ce4df6210f4763810dde..c5011b7510dd0c1ff6f9ab09069cfdd72c3814c3 100644 (file)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
 #include "archive_private.h"
 #include "archive_read_private.h"
 #include "archive_string.h"
+#include "archive_pack_dev.h"
 
 #ifndef O_BINARY
 #define        O_BINARY 0
@@ -1292,33 +1293,63 @@ parse_line(struct archive_read *a, struct archive_entry *entry,
 
 /*
  * Device entries have one of the following forms:
- * raw dev_t
- * format,major,minor[,subdevice]
- *
- * Just use major and minor, no translation etc is done
- * between formats.
+ *  - raw dev_t
+ *  - format,major,minor[,subdevice]
  */
 static int
 parse_device(struct archive *a, struct archive_entry *entry, char *val)
 {
-       char *comma1, *comma2;
-
-       comma1 = strchr(val, ',');
-       if (comma1 == NULL) {
-               archive_entry_set_dev(entry, (dev_t)mtree_atol10(&val));
-               return (ARCHIVE_OK);
-       }
-       ++comma1;
-       comma2 = strchr(comma1, ',');
-       if (comma2 == NULL) {
-               archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
-                   "Malformed device attribute");
-               return (ARCHIVE_WARN);
+#define MAX_PACK_ARGS 3
+       unsigned long numbers[MAX_PACK_ARGS];
+       char *p, *dev;
+       int argc;
+       pack_t *pack;
+       dev_t result;
+       const char *error = NULL;
+
+       if ((dev = strchr(val, ',')) != NULL) {
+               /*
+                * Device's major/minor are given in a specified format.
+                * Decode and pack it accordingly.
+                */
+               *dev++ = '\0';
+               if ((pack = pack_find(val)) == NULL) {
+                       archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
+                           "Unknown format `%s'", val);
+                       return ARCHIVE_WARN;
+               }
+               argc = 0;
+               while ((p = strsep(&dev, ",")) != NULL) {
+                       if (*p == '\0') {
+                               archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
+                                   "Missing number");
+                               return ARCHIVE_WARN;
+                       }
+                       numbers[argc++] = mtree_atol(&p);
+                       if (argc > MAX_PACK_ARGS) {
+                               archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
+                                   "Too many arguments");
+                               return ARCHIVE_WARN;
+                       }
+               }
+               if (argc < 2) {
+                       archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
+                           "Not enough arguments");
+                       return ARCHIVE_WARN;
+               }
+               result = (*pack)(argc, numbers, &error);
+               if (error != NULL) {
+                       archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
+                           "%s", error);
+                       return ARCHIVE_WARN;
+               }
+               archive_entry_set_rdev(entry, result);
+       } else {
+               /* file system raw value. */
+               archive_entry_set_rdev(entry, (dev_t)mtree_atol(&val));
        }
-       ++comma2;
-       archive_entry_set_rdevmajor(entry, (dev_t)mtree_atol(&comma1));
-       archive_entry_set_rdevminor(entry, (dev_t)mtree_atol(&comma2));
-       return (ARCHIVE_OK);
+       return ARCHIVE_OK;
+#undef MAX_PACK_ARGS
 }
 
 /*
index 51ec2f96272bbd63cfb1ac92dc83decf9c963dd1..0c0c0b029dfad285e04f020842adf00c3152f308 100644 (file)
@@ -28,7 +28,7 @@
 .\"     From: @(#)mtree.8       8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2013
+.Dd September 3, 2013
 .Dt MTREE 5
 .Os
 .Sh NAME
@@ -159,10 +159,23 @@ Opaque number (as stored on the file system).
 The following values for
 .Ar format
 are recognized:
-.Bl -tag -width xxxxxx -offset xx
-.It Sy native
-Native format as used by the operating system.
-.El
+.Sy native ,
+.Sy 386bsd ,
+.Sy 4bsd ,
+.Sy bsdos ,
+.Sy freebsd ,
+.Sy hpux ,
+.Sy isc ,
+.Sy linux ,
+.Sy netbsd ,
+.Sy osf1 ,
+.Sy sco ,
+.Sy solaris ,
+.Sy sunos ,
+.Sy svr3 ,
+.Sy svr4 ,  
+and 
+.Sy ultrix .
 .Pp
 See
 .Xr mknod 8