/* cpio.c - a basic cpio
*
- * Written 2013 AD by Isaac Dunham; this code is placed under the
+ * Written 2013 AD by Isaac Dunham; this code is placed under the
* same license as toybox or as CC0, at your option.
*
+ * Portions Copyright 2015 by Frontier Silicon Ltd.
+ *
* http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/cpio.html
* and http://pubs.opengroup.org/onlinepubs/7908799/xcu/cpio.html
*
* Modern cpio expanded header to 110 bytes (first field 6 bytes, rest are 8).
* In order: magic ino mode uid gid nlink mtime filesize devmajor devminor
* rdevmajor rdevminor namesize check
+ * This is the equiavlent of mode -H newc when using GNU CPIO.
-USE_CPIO(NEWTOY(cpio, "duH:i|t|F:o|v(verbose)[!io][!ot]", TOYFLAG_BIN))
+USE_CPIO(NEWTOY(cpio, "(no-preserve-owner)(trailer)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]", TOYFLAG_BIN))
config CPIO
bool "cpio"
default y
help
- usage: cpio -{o|t|i} [-v] [--verbose] [-F FILE] [ignored: -du -H newc]
+ usage: cpio -{o|t|i|p DEST} [-v] [--verbose] [-F FILE] [--no-preserve-owner]
+ [ignored: -mdu -H newc]
copy files into and out of a "newc" format cpio archive
-F FILE use archive FILE instead of stdin/stdout
+ -p DEST copy-pass mode, copy stdin file list to directory DEST
-i extract from archive into file system (stdin=archive)
-o create archive (stdin=list of files, stdout=archive)
-t test files (list only, stdin=archive, stdout=list of files)
-v verbose (list files during create/extract)
+ --no-preserve-owner (don't set ownership during extract)
+ --trailer Add legacy trailer (prevents concatenation).
*/
#define FOR_cpio
GLOBALS(
char *archive;
+ char *pass;
char *fmt;
)
// Read strings, tail padded to 4 byte alignment. Argument "align" is amount
-// by which start of string isn't aligned (usually 0).
+// by which start of string isn't aligned (usually 0, but header is 110 bytes
+// which is 2 bytes off because the first field wasn't expanded from 6 to 8).
static char *strpad(int fd, unsigned len, unsigned align)
{
char *str;
align = (align + len) & 3;
if (align) len += (4-align);
-
xreadall(fd, str = xmalloc(len+1), len);
str[len]=0; // redundant, in case archive is bad
}
//convert hex to uint; mostly to allow using bits of non-terminated strings
-unsigned x8u(char *hex)
+static unsigned x8u(char *hex)
{
unsigned val, inpos = 8, outpos;
char pattern[6];
void cpio_main(void)
{
- int afd;
-
// Subtle bit: FLAG_o is 1 so we can just use it to select stdin/stdout.
+ int pipe, afd = toys.optflags & FLAG_o;
+ pid_t pid = 0;
+
+ // In passthrough mode, parent stays in original dir and generates archive
+ // to pipe, child does chdir to new dir and reads archive from stdin (pipe).
+ if (TT.pass) {
+ if (toys.stacktop) {
+ // xpopen() doesn't return from child due to vfork(), instead restarts
+ // with !toys.stacktop
+ pid = xpopen(0, &pipe, 0);
+ afd = pipe;
+ } else {
+ // child
+ toys.optflags |= FLAG_i;
+ xchdir(TT.pass);
+ }
+ }
- afd = toys.optflags & FLAG_o;
if (TT.archive) {
int perm = (toys.optflags & FLAG_o) ? O_CREAT|O_WRONLY|O_TRUNC : O_RDONLY;
if (toys.optflags & (FLAG_i|FLAG_t)) for (;;) {
char *name, *tofree, *data;
- unsigned size, mode;
+ unsigned size, mode, uid, gid, timestamp;
int test = toys.optflags & FLAG_t, err = 0;
// Read header and name.
- xreadall(afd, toybuf, 110);
+ if (!(size =readall(afd, toybuf, 110))) break;
+ if (size != 110 || memcmp(toybuf, "070701", 6)) error_exit("bad header");
tofree = name = strpad(afd, x8u(toybuf+94), 110);
- if (!strcmp("TRAILER!!!", name)) break;
+ if (!strcmp("TRAILER!!!", name)) {
+ if (CFG_TOYBOX_FREE) free(tofree);
+ break;
+ }
// If you want to extract absolute paths, "cd /" and run cpio.
while (*name == '/') name++;
-
- // Align to 4 bytes. Note header is 110 bytes which is 2 bytes over.
+ // TODO: remove .. entries
size = x8u(toybuf+54);
mode = x8u(toybuf+14);
+ uid = x8u(toybuf+22);
+ gid = x8u(toybuf+30);
+ timestamp = x8u(toybuf+46); // unsigned 32 bit, so year 2100 problem
if (toys.optflags & (FLAG_t|FLAG_v)) puts(name);
} else if (S_ISLNK(mode)) {
data = strpad(afd, size, 0);
if (!test) err = symlink(data, name);
+ free(data);
+ // Can't get a filehandle to a symlink, so do special chown
+ if (!err && !geteuid() && !(toys.optflags & FLAG_no_preserve_owner))
+ err = lchown(name, uid, gid);
} else if (S_ISREG(mode)) {
- int fd;
+ int fd = test ? 0 : open(name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, mode);
// If write fails, we still need to read/discard data to continue with
// archive. Since doing so overwrites errno, report error now
- fd = test ? 0 : open(name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, mode);
if (fd < 0) {
perror_msg("create %s", name);
test++;
}
size -= sizeof(toybuf);
}
- close(fd);
+
+ if (!test) {
+ // set owner, restore dropped suid bit
+ if (!geteuid() && !(toys.optflags & FLAG_no_preserve_owner)) {
+ err = fchown(fd, uid, gid);
+ if (!err) err = fchmod(fd, mode);
+ }
+ close(fd);
+ }
} else if (!test)
- err = mknod(name, mode, makedev(x8u(toybuf+62), x8u(toybuf+70)));
+ err = mknod(name, mode, dev_makedev(x8u(toybuf+78), x8u(toybuf+86)));
+
+ // Set ownership and timestamp.
+ if (!test && !err) {
+ // Creading dir/dev doesn't give us a filehandle, we have to refer to it
+ // by name to chown/utime, but how do we know it's the same item?
+ // Check that we at least have the right type of entity open, and do
+ // NOT restore dropped suid bit in this case.
+ if (!S_ISREG(mode) && !S_ISLNK(mode) && !geteuid()
+ && !(toys.optflags & FLAG_no_preserve_owner))
+ {
+ int fd = open(name, O_RDONLY|O_NOFOLLOW);
+ struct stat st;
+
+ if (fd != -1 && !fstat(fd, &st) && (st.st_mode&S_IFMT) == (mode&S_IFMT))
+ err = fchown(fd, uid, gid);
+ else err = 1;
+
+ close(fd);
+ }
+
+ // set timestamp
+ if (!err) {
+ struct timespec times[2];
- if (err<0) perror_msg("create '%s'", name);
+ memset(times, 0, sizeof(struct timespec)*2);
+ times[0].tv_sec = times[1].tv_sec = timestamp;
+ err = utimensat(AT_FDCWD, name, times, AT_SYMLINK_NOFOLLOW);
+ }
+ }
+
+ if (err) perror_msg_raw(name);
free(tofree);
// Output cpio archive
for (;;) {
struct stat st;
- unsigned nlen = strlen(name)+1, error = 0, zero = 0;
+ unsigned nlen, error = 0, zero = 0;
int len, fd = -1;
ssize_t llen;
len = getline(&name, &size, stdin);
if (len<1) break;
if (name[len-1] == '\n') name[--len] = 0;
- if (lstat(name, &st)
- || (S_ISREG(st.st_mode) && (fd = open(name, O_RDONLY))<0))
+ nlen = len+1;
+ if (lstat(name, &st) || (S_ISREG(st.st_mode)
+ && st.st_size && (fd = open(name, O_RDONLY))<0))
{
- perror_msg("%s", name);
+ perror_msg_raw(name);
continue;
}
llen = sprintf(toybuf,
"070701%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X",
(int)st.st_ino, st.st_mode, st.st_uid, st.st_gid, (int)st.st_nlink,
- (int)st.st_mtime, (int)st.st_size, major(st.st_dev),
- minor(st.st_dev), major(st.st_rdev), minor(st.st_rdev), nlen, 0);
+ (int)st.st_mtime, (int)st.st_size, dev_major(st.st_dev),
+ dev_minor(st.st_dev), dev_major(st.st_rdev), dev_minor(st.st_rdev),
+ nlen, 0);
xwrite(afd, toybuf, llen);
xwrite(afd, name, nlen);
// NUL Pad header up to 4 multiple bytes.
llen = (llen + nlen) & 3;
- if (llen) xwrite(afd, &zero, 4-llen);
+ if (llen) xwrite(afd, &zero, 4-llen);
// Write out body for symlink or regular file
llen = st.st_size;
xwrite(afd, toybuf, nlen);
}
llen = st.st_size & 3;
- if (llen) write(afd, &zero, 4-llen);
+ if (llen) xwrite(afd, &zero, 4-llen);
}
close(fd);
}
free(name);
- xwrite(afd, toybuf,
- sprintf(toybuf, "070701%040X%056X%08XTRAILER!!!%c%c%c",
- 1, 0x0b, 0, 0, 0, 0));
+ if (FLAG_trailer) {
+ memset(toybuf, 0, sizeof(toybuf));
+ xwrite(afd, toybuf,
+ sprintf(toybuf, "070701%040X%056X%08XTRAILER!!!", 1, 0x0b, 0)+4);
+ }
}
+ if (TT.archive) xclose(afd);
+
+ if (TT.pass) toys.exitval |= xpclose(pid, pipe);
}
OSDN Git Service
