aboutsummaryrefslogtreecommitdiffstats
path: root/cpio
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2011-12-26 22:25:58 +0000
committerMartin Matuska <mm@FreeBSD.org>2011-12-26 22:25:58 +0000
commit7691a6970b48b047c4290c0837e91dcab450db90 (patch)
tree15e9d164982e84a4b77c51d3cea2c450f6ec4ad1 /cpio
parent4b16b4e80ed599fbac3f6e4427cd9fbb43d1ea1a (diff)
downloadsrc-7691a6970b48b047c4290c0837e91dcab450db90.tar.gz
src-7691a6970b48b047c4290c0837e91dcab450db90.zip
Update to vendor revision 3982
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=228905
Diffstat (limited to 'cpio')
-rw-r--r--cpio/bsdcpio.16
-rw-r--r--cpio/cmdline.c2
-rw-r--r--cpio/cpio.c18
-rw-r--r--cpio/cpio.h2
4 files changed, 21 insertions, 7 deletions
diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1
index 79b6997ef4a8..789ce74e1c48 100644
--- a/cpio/bsdcpio.1
+++ b/cpio/bsdcpio.1
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 21, 2007
+.Dd September 5, 2010
.Dt BSDCPIO 1
.Os
.Sh NAME
@@ -140,7 +140,7 @@ The POSIX.1 tar format.
The default format is
.Ar odc .
See
-.Xr libarchive_formats 5
+.Xr libarchive-formats 5
for more complete information about the
formats currently supported by the underlying
.Xr libarchive 3
@@ -295,7 +295,7 @@ for more information.
.Sh EXAMPLES
The
.Nm
-command is traditionally used to copy file heirarchies in conjunction
+command is traditionally used to copy file hierarchies in conjunction
with the
.Xr find 1
command.
diff --git a/cpio/cmdline.c b/cpio/cmdline.c
index 2223798c124d..ada549953ddf 100644
--- a/cpio/cmdline.c
+++ b/cpio/cmdline.c
@@ -285,6 +285,8 @@ cpio_getopt(struct cpio *cpio)
* A period can be used instead of the colon.
*
* Sets uid/gid return as appropriate, -1 indicates uid/gid not specified.
+ * TODO: If the spec uses uname/gname, then return those to the caller
+ * as well. If the spec provides uid/gid, just return names as NULL.
*
* Returns NULL if no error, otherwise returns error string for display.
*
diff --git a/cpio/cpio.c b/cpio/cpio.c
index 7d5031bbcd8f..29f405c091ee 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -273,15 +273,21 @@ main(int argc, char *argv[])
cpio->quiet = 1;
break;
case 'R': /* GNU cpio, also --owner */
+ /* TODO: owner_parse should return uname/gname
+ * also; use that to set [ug]name_override. */
errmsg = owner_parse(cpio->optarg, &uid, &gid);
if (errmsg) {
lafe_warnc(-1, "%s", errmsg);
usage();
}
- if (uid != -1)
+ if (uid != -1) {
cpio->uid_override = uid;
- if (gid != -1)
+ cpio->uname_override = NULL;
+ }
+ if (gid != -1) {
cpio->gid_override = gid;
+ cpio->gname_override = NULL;
+ }
break;
case 'r': /* POSIX 1997 */
cpio->option_rename = 1;
@@ -575,10 +581,14 @@ file_to_archive(struct cpio *cpio, const char *srcpath)
return (r);
}
- if (cpio->uid_override >= 0)
+ if (cpio->uid_override >= 0) {
archive_entry_set_uid(entry, cpio->uid_override);
- if (cpio->gid_override >= 0)
+ archive_entry_set_uname(entry, cpio->uname_override);
+ }
+ if (cpio->gid_override >= 0) {
archive_entry_set_gid(entry, cpio->gid_override);
+ archive_entry_set_gname(entry, cpio->gname_override);
+ }
/*
* Generate a destination path for this entry.
diff --git a/cpio/cpio.h b/cpio/cpio.h
index 3eed83494b8e..a86e924a7a77 100644
--- a/cpio/cpio.h
+++ b/cpio/cpio.h
@@ -68,7 +68,9 @@ struct cpio {
size_t pass_destpath_alloc;
char *pass_destpath;
int uid_override;
+ char *uname_override;
int gid_override;
+ char *gname_override;
int day_first; /* true if locale prefers day/mon */
/* If >= 0, then close this when done. */