components/libarchive/patches/libarchive-archive_read_disk.3.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Thu, 16 Apr 2015 05:10:57 -0700
changeset 4334 e30c463e2895
parent 1316 22b5cf35a3ea
permissions -rw-r--r--
20761796 problem in UTILITY/CUPS
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1316
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch is needed to convert BSD-style section numbers to Solaris-style
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
section numbers.  It has not been fed back to the upstream community.  It
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
may need to be tweaked slightly for future releases.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
--- libarchive/libarchive/archive_read_disk.3.orig	Mon Mar 26 19:49:00 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
+++ libarchive/libarchive/archive_read_disk.3	Fri Nov  9 12:35:02 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
@@ -25,7 +25,7 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
 .\" $FreeBSD$
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 .\"
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 .Dd February 2, 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
-.Dt ARCHIVE_READ_DISK 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
+.Dt ARCHIVE_READ_DISK 3ARCHIVE
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
 .Os
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 .Sh NAME
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 .Nm archive_read_disk_new ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
@@ -138,16 +138,16 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
 This convenience function installs a standard set of user
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    18
 and group name lookup functions.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    19
 These functions use
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    20
-.Xr getpwuid 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    21
+.Xr getpwuid 3C
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    22
 and
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    23
-.Xr getgrgid 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    24
+.Xr getgrgid 3C
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    25
 to convert ids to names, defaulting to NULL if the names cannot
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    26
 be looked up.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    27
 These functions also implement a simple memory cache to reduce
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    28
 the number of calls to
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    29
-.Xr getpwuid 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    30
+.Xr getpwuid 3C
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    31
 and
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    32
-.Xr getgrgid 3 .
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    33
+.Xr getgrgid 3C .
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    34
 .It Fn archive_read_disk_entry_from_file
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    35
 Populates a
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    36
 .Tn struct archive_entry
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    37
@@ -155,7 +155,7 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    38
 The
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    39
 .Tn archive_entry
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    40
 object must have already been created with
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    41
-.Xr archive_entry_new 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    42
+.Xr archive_entry_new 3ARCHIVE
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    43
 and at least one of the source path or path fields must already be set.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    44
 (If both are set, the source path will be used.)
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    45
 .Pp
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    46
@@ -196,7 +196,7 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    47
 More information about the
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    48
 .Va struct archive
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    49
 object and the overall design of the library can be found in the
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    50
-.Xr libarchive 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    51
+.Xr libarchive 3LIB
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    52
 overview.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    53
 .Sh EXAMPLE
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    54
 The following illustrates basic usage of the library by
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    55
@@ -263,12 +263,12 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    56
 functions.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    57
 .\"
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    58
 .Sh SEE ALSO
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    59
-.Xr archive_read 3 ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    60
-.Xr archive_util 3 ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    61
-.Xr archive_write 3 ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    62
-.Xr archive_write_disk 3 ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    63
+.Xr archive_read 3ARCHIVE ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    64
+.Xr archive_util 3ARCHIVE ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    65
+.Xr archive_write 3ARCHIVE ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    66
+.Xr archive_write_disk 3ARCHIVE ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    67
 .Xr tar 1 ,
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    68
-.Xr libarchive 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    69
+.Xr libarchive 3LIB
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    70
 .Sh HISTORY
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    71
 The
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    72
 .Nm libarchive
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    73
@@ -290,9 +290,9 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    74
 The
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    75
 .Dq standard
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    76
 user name and group name lookup functions are not the defaults because
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    77
-.Xr getgrgid 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    78
+.Xr getgrgid 3C
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    79
 and
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    80
-.Xr getpwuid 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    81
+.Xr getpwuid 3C
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    82
 are sometimes too large for particular applications.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    83
 The current design allows the application author to use a more
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    84
 compact implementation when appropriate.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    85
@@ -310,7 +310,7 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    86
 .Pp
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    87
 This API should provide a set of methods for walking a directory tree.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    88
 That would make it a direct parallel of the
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    89
-.Xr archive_read 3
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    90
+.Xr archive_read 3ARCHIVE
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    91
 API.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    92
 When such methods are implemented, the
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    93
 .Dq hybrid