sbase/tar.c
Xan Phung 5aa63dbe05 tar: bug fix and compatibility improvements
1. A fix for a bug in the unarchive() function (causing metadata
loss when used on large tar files).  This bug is due to existing
code continuing to check for h->type == HARDLINK and SOFTLINK
(near end of function), when the entire header block has already
been overwritten by a call to eread() prior to the h->type checks.

2. Long (>=256 byte) file name compatibility: 'L' style long file
names were extremely simple to add, requiring a (net) addition of
a handful lines of code, and this patch supports both extracting
and creating L-style tar archives. Pax 'x' style long names are
more complex to parse, and this patch only supports extracting pax
'x' tars, but not creating them.

3. Command line argument compatibility improvements: 'c', 'x', 't'
args are accepted without needing a hyphen in front.  The '-p'
flag is also accepted but is no-op (as it is the normal behaviour
of sbase tar anyway, and allows sbase tar to be used in scripts
specifying this flag).  Directory tree member extraction is also
supported by this patch.

4. Handle tar archives with "." (current directory) entries.  Some
archives contain "." or "./" entries, causing error reports when
the current code tries to remove() the current dir.  I have added a
check in unarchive() to not perform remove() on encountering these
entries.
2025-05-06 08:59:25 +02:00

659 lines
14 KiB
C

/* See LICENSE file for copyright and license details. */
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#ifndef major
#include <sys/sysmacros.h>
#endif
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
#include <libgen.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "fs.h"
#include "util.h"
#define BLKSIZ (sizeof (struct header)) /* must equal 512 bytes */
enum Type {
REG = '0',
AREG = '\0',
HARDLINK = '1',
SYMLINK = '2',
CHARDEV = '3',
BLOCKDEV = '4',
DIRECTORY = '5',
FIFO = '6',
RESERVED = '7'
};
struct header {
char name[100];
char mode[8];
char uid[8];
char gid[8];
char size[12];
char mtime[12];
char chksum[8];
char type;
char linkname[100];
char magic[6];
char version[2];
char uname[32];
char gname[32];
char major[8];
char minor[8];
char prefix[155];
char padding[12];
};
static struct dirtime {
char *name;
time_t mtime;
} *dirtimes;
static size_t dirtimeslen;
static int tarfd;
static ino_t tarinode;
static dev_t tardev;
static int mflag, vflag;
static int filtermode;
static const char *filtertool;
static const char *filtertools[] = {
['J'] = "xz",
['Z'] = "compress",
['a'] = "lzma",
['j'] = "bzip2",
['z'] = "gzip",
};
static void
pushdirtime(char *name, time_t mtime)
{
dirtimes = ereallocarray(dirtimes, dirtimeslen + 1, sizeof(*dirtimes));
dirtimes[dirtimeslen].name = estrdup(name);
dirtimes[dirtimeslen].mtime = mtime;
dirtimeslen++;
}
static struct dirtime *
popdirtime(void)
{
if (dirtimeslen) {
dirtimeslen--;
return &dirtimes[dirtimeslen];
}
return NULL;
}
static int
comp(int fd, const char *tool, const char *flags)
{
int fds[2];
if (pipe(fds) < 0)
eprintf("pipe:");
switch (fork()) {
case -1:
eprintf("fork:");
case 0:
dup2(fd, 1);
dup2(fds[0], 0);
close(fds[0]);
close(fds[1]);
execlp(tool, tool, flags, NULL);
weprintf("execlp %s:", tool);
_exit(1);
}
close(fds[0]);
return fds[1];
}
static int
decomp(int fd, const char *tool, const char *flags)
{
int fds[2];
if (pipe(fds) < 0)
eprintf("pipe:");
switch (fork()) {
case -1:
eprintf("fork:");
case 0:
dup2(fd, 0);
dup2(fds[1], 1);
close(fds[0]);
close(fds[1]);
execlp(tool, tool, flags, NULL);
weprintf("execlp %s:", tool);
_exit(1);
}
close(fds[1]);
return fds[0];
}
static ssize_t
eread(int fd, void *buf, size_t n)
{
ssize_t r;
again:
r = read(fd, buf, n);
if (r < 0) {
if (errno == EINTR)
goto again;
eprintf("read:");
}
return r;
}
static ssize_t
ewrite(int fd, const void *buf, size_t n)
{
ssize_t r;
if ((r = write(fd, buf, n)) != n)
eprintf("write:");
return r;
}
static unsigned
chksum(struct header *h)
{
unsigned sum, i;
memset(h->chksum, ' ', sizeof(h->chksum));
for (i = 0, sum = 0, assert(BLKSIZ == 512); i < BLKSIZ; i++)
sum += *((unsigned char *)h + i);
return sum;
}
static void
putoctal(char *dst, unsigned num, int size)
{
if (snprintf(dst, size, "%.*o", size - 1, num) >= size)
eprintf("snprintf: input number too large\n");
}
static int
archive(const char *path)
{
static const struct header blank = {
"././@LongLink", "0000000" , "0000000", "0000000", "00000000000",
"00000000000" , " ", AREG , "" , "ustar", "00",
};
char b[BLKSIZ + BLKSIZ], *p;
struct header *h = (struct header *)b;
struct group *gr;
struct passwd *pw;
struct stat st;
ssize_t l, n, r;
int fd = -1;
if (lstat(path, &st) < 0) {
weprintf("lstat %s:", path);
return 0;
} else if (st.st_ino == tarinode && st.st_dev == tardev) {
weprintf("ignoring %s\n", path);
return 0;
}
pw = getpwuid(st.st_uid);
gr = getgrgid(st.st_gid);
*h = blank;
n = strlcpy(h->name, path, sizeof(h->name));
if (n >= sizeof(h->name)) {
*++h = blank;
h->type = 'L';
putoctal(h->size, n, sizeof(h->size));
putoctal(h->chksum, chksum(h), sizeof(h->chksum));
ewrite(tarfd, (char *)h, BLKSIZ);
for (p = (char *)path; n > 0; n -= BLKSIZ, p += BLKSIZ) {
if (n < BLKSIZ) {
p = memcpy(h--, p, n);
memset(p + n, 0, BLKSIZ - n);
}
ewrite(tarfd, p, BLKSIZ);
}
}
putoctal(h->mode, (unsigned)st.st_mode & 0777, sizeof(h->mode));
putoctal(h->uid, (unsigned)st.st_uid, sizeof(h->uid));
putoctal(h->gid, (unsigned)st.st_gid, sizeof(h->gid));
putoctal(h->mtime, (unsigned)st.st_mtime, sizeof(h->mtime));
estrlcpy(h->uname, pw ? pw->pw_name : "", sizeof(h->uname));
estrlcpy(h->gname, gr ? gr->gr_name : "", sizeof(h->gname));
if (S_ISREG(st.st_mode)) {
h->type = REG;
putoctal(h->size, st.st_size, sizeof(h->size));
fd = open(path, O_RDONLY);
if (fd < 0)
eprintf("open %s:", path);
} else if (S_ISDIR(st.st_mode)) {
h->type = DIRECTORY;
} else if (S_ISLNK(st.st_mode)) {
h->type = SYMLINK;
if ((r = readlink(path, h->linkname, sizeof(h->linkname) - 1)) < 0)
eprintf("readlink %s:", path);
h->linkname[r] = '\0';
} else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
h->type = S_ISCHR(st.st_mode) ? CHARDEV : BLOCKDEV;
putoctal(h->major, (unsigned)major(st.st_dev), sizeof(h->major));
putoctal(h->minor, (unsigned)minor(st.st_dev), sizeof(h->minor));
} else if (S_ISFIFO(st.st_mode)) {
h->type = FIFO;
}
putoctal(h->chksum, chksum(h), sizeof(h->chksum));
ewrite(tarfd, b, BLKSIZ);
if (fd != -1) {
while ((l = eread(fd, b, BLKSIZ)) > 0) {
if (l < BLKSIZ)
memset(b + l, 0, BLKSIZ - l);
ewrite(tarfd, b, BLKSIZ);
}
close(fd);
}
return 0;
}
static int
unarchive(char *fname, ssize_t l, char b[BLKSIZ])
{
struct header *h = (struct header *)b;
struct timespec times[2];
char lname[101], *tmp, *p;
long mode, major, minor, type, mtime, uid, gid;
int fd = -1, lnk = h->type == SYMLINK;
if (!mflag && ((mtime = strtol(h->mtime, &p, 8)) < 0 || *p != '\0'))
eprintf("strtol %s: invalid number\n", h->mtime);
if (strcmp(fname, ".") && strcmp(fname, "./") && remove(fname) < 0)
if (errno != ENOENT) weprintf("remove %s:", fname);
tmp = estrdup(fname);
mkdirp(dirname(tmp), 0777, 0777);
free(tmp);
switch (h->type) {
case REG:
case AREG:
case RESERVED:
if ((mode = strtol(h->mode, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->mode);
fd = open(fname, O_WRONLY | O_TRUNC | O_CREAT, 0600);
if (fd < 0)
eprintf("open %s:", fname);
break;
case HARDLINK:
case SYMLINK:
snprintf(lname, sizeof(lname), "%.*s", (int)sizeof(h->linkname),
h->linkname);
if ((lnk ? symlink:link)(lname, fname) < 0)
eprintf("%s %s -> %s:", lnk ? "symlink":"link", fname, lname);
lnk++;
break;
case DIRECTORY:
if ((mode = strtol(h->mode, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->mode);
if (mkdir(fname, (mode_t)mode) < 0 && errno != EEXIST)
eprintf("mkdir %s:", fname);
pushdirtime(fname, mtime);
break;
case CHARDEV:
case BLOCKDEV:
if ((mode = strtol(h->mode, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->mode);
if ((major = strtol(h->major, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->major);
if ((minor = strtol(h->minor, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->minor);
type = (h->type == CHARDEV) ? S_IFCHR : S_IFBLK;
if (mknod(fname, type | mode, makedev(major, minor)) < 0)
eprintf("mknod %s:", fname);
break;
case FIFO:
if ((mode = strtol(h->mode, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->mode);
if (mknod(fname, S_IFIFO | mode, 0) < 0)
eprintf("mknod %s:", fname);
break;
default:
eprintf("unsupported tar-filetype %c\n", h->type);
}
if ((uid = strtol(h->uid, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->uid);
if ((gid = strtol(h->gid, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid number\n", h->gid);
if (fd != -1) {
for (; l > 0; l -= BLKSIZ)
if (eread(tarfd, b, BLKSIZ) > 0)
ewrite(fd, b, MIN(l, BLKSIZ));
close(fd);
}
if (lnk == 1)
return 0;
times[0].tv_sec = times[1].tv_sec = mtime;
times[0].tv_nsec = times[1].tv_nsec = 0;
if (!mflag && utimensat(AT_FDCWD, fname, times, AT_SYMLINK_NOFOLLOW) < 0)
weprintf("utimensat %s:", fname);
if (lnk) {
if (!getuid() && lchown(fname, uid, gid))
weprintf("lchown %s:", fname);
} else {
if (!getuid() && chown(fname, uid, gid))
weprintf("chown %s:", fname);
if (chmod(fname, mode) < 0)
eprintf("fchmod %s:", fname);
}
return 0;
}
static void
skipblk(ssize_t l)
{
char b[BLKSIZ];
for (; l > 0; l -= BLKSIZ)
if (!eread(tarfd, b, BLKSIZ))
break;
}
static int
print(char *fname, ssize_t l, char b[BLKSIZ])
{
puts(fname);
skipblk(l);
return 0;
}
static void
c(int dirfd, const char *name, struct stat *st, void *data, struct recursor *r)
{
archive(r->path);
if (vflag)
puts(r->path);
if (S_ISDIR(st->st_mode))
recurse(dirfd, name, NULL, r);
}
static void
sanitize(struct header *h)
{
size_t i, j;
struct {
char *f;
size_t l;
} fields[] = {
{ h->mode, sizeof(h->mode) },
{ h->uid, sizeof(h->uid) },
{ h->gid, sizeof(h->gid) },
{ h->size, sizeof(h->size) },
{ h->mtime, sizeof(h->mtime) },
{ h->chksum, sizeof(h->chksum) },
{ h->major, sizeof(h->major) },
{ h->minor, sizeof(h->minor) }
};
/* Numeric fields can be terminated with spaces instead of
* NULs as per the ustar specification. Patch all of them to
* use NULs so we can perform string operations on them. */
for (i = 0; i < LEN(fields); i++){
for (j = 0; j < fields[i].l && fields[i].f[j] == ' '; j++);
for (; j < fields[i].l; j++)
if (fields[i].f[j] == ' ')
fields[i].f[j] = '\0';
}
}
static void
chktar(struct header *h)
{
const char *reason;
char tmp[sizeof h->chksum], *err = "";
long sum, i;
if (h->prefix[0] == '\0' && h->name[0] == '\0') {
reason = "empty filename";
goto bad;
}
if (h->magic[0] && strncmp("ustar", h->magic, 5)) {
reason = "not ustar format";
goto bad;
}
memcpy(tmp, h->chksum, sizeof(tmp));
for (i = sizeof(tmp)-1; i > 0 && tmp[i] == ' '; i--) {
tmp[i] = '\0';
}
sum = strtol(tmp, &err, 8);
if (sum < 0 || sum >= BLKSIZ*256 || *err != '\0') {
reason = "invalid checksum";
goto bad;
}
if (sum != chksum(h)) {
reason = "incorrect checksum";
goto bad;
}
memcpy(h->chksum, tmp, sizeof(tmp));
return;
bad:
eprintf("malformed tar archive: %s\n", reason);
}
static void
xt(int argc, char *argv[], int mode)
{
long size, l;
char b[BLKSIZ], fname[l = PATH_MAX + 1], *p, *q = NULL;
int i, m, n;
int (*fn)(char *, ssize_t, char[BLKSIZ]) = (mode == 'x') ? unarchive : print;
struct timespec times[2];
struct header *h = (struct header *)b;
struct dirtime *dirtime;
while (eread(tarfd, b, BLKSIZ) > 0 && (h->name[0] || h->prefix[0])) {
chktar(h);
sanitize(h);
if ((size = strtol(h->size, &p, 8)) < 0 || *p != '\0')
eprintf("strtol %s: invalid size\n", h->size);
/* Long file path is read direcly into fname*/
if (h->type == 'L' || h->type == 'x' || h->type == 'g') {
/* Read header only up to size of fname buffer */
for (q = fname; q < fname+size; q += BLKSIZ) {
if (q + BLKSIZ >= fname + l)
eprintf("name exceeds buffer: %s\n", fname);
eread(tarfd, q, BLKSIZ);
}
/* Convert pax x header with 'path=' field into L header */
if (h->type == 'x') for (q = fname; q < fname+size-16; q += n) {
if ((n = strtol(q, &p, 10)) < 0 || *p != ' ')
eprintf("strtol %.*s: invalid number\n", p+1-q, q);
if (n && strncmp(p+1, "path=", 5) == 0) {
memmove(fname, p+6, size = q+n - p-6 - 1);
h->type = 'L';
break;
}
}
fname[size] = '\0';
/* Non L-like header (eg. pax 'g') is skipped by setting q=null */
if (h->type != 'L')
q = NULL;
continue;
}
/* Ustar path is copied into fname if no L header (ie: q is NULL) */
if (!q) {
m = sizeof h->prefix, n = sizeof h->name;
p = "/" + !h->prefix[0];
snprintf(fname, l, "%.*s%s%.*s", m, h->prefix, p, n, h->name);
}
q = NULL;
/* If argc > 0 then only extract the given files/dirs */
if (argc) {
for (i = 0; i < argc; i++) {
if (strncmp(argv[i], fname, n = strlen(argv[i])) == 0)
if (strchr("/", fname[n]) || argv[i][n-1] == '/')
break;
}
if (i == argc) {
skipblk(size);
continue;
}
}
fn(fname, size, b);
if (vflag && mode != 't')
puts(fname);
}
if (mode == 'x' && !mflag) {
while ((dirtime = popdirtime())) {
times[0].tv_sec = times[1].tv_sec = dirtime->mtime;
times[0].tv_nsec = times[1].tv_nsec = 0;
if (utimensat(AT_FDCWD, dirtime->name, times, 0) < 0)
eprintf("utimensat %s:", fname);
free(dirtime->name);
}
free(dirtimes);
dirtimes = NULL;
}
}
char **args;
int argn;
static void
usage(void)
{
eprintf("usage: %s [x | t | -x | -t] [-C dir] [-J | -Z | -a | -j | -z] [-m] [-p] "
"[-f file] [file ...]\n"
" %s [c | -c] [-C dir] [-J | -Z | -a | -j | -z] [-h] path ... "
"[-f file]\n", argv0, argv0);
}
int
main(int argc, char *argv[])
{
struct recursor r = { .fn = c, .follow = 'P', .flags = DIRFIRST };
struct stat st;
char *file = NULL, *dir = ".", mode = '\0';
int fd;
argv0 = argv[0];
if (argc > 1 && strchr("cxt", mode = *argv[1]))
*(argv[1]+1) ? *argv[1] = '-' : (*++argv = argv0, --argc);
ARGBEGIN {
case 'x':
case 'c':
case 't':
mode = ARGC();
break;
case 'C':
dir = EARGF(usage());
break;
case 'f':
file = EARGF(usage());
break;
case 'm':
mflag = 1;
break;
case 'J':
case 'Z':
case 'a':
case 'j':
case 'z':
filtermode = ARGC();
filtertool = filtertools[filtermode];
break;
case 'h':
r.follow = 'L';
break;
case 'v':
vflag = 1;
break;
case 'p':
break; /* Do nothing as already default behaviour */
default:
usage();
} ARGEND
switch (mode) {
case 'c':
if (!argc)
usage();
tarfd = 1;
if (file && *file != '-') {
tarfd = open(file, O_WRONLY | O_TRUNC | O_CREAT, 0644);
if (tarfd < 0)
eprintf("open %s:", file);
if (lstat(file, &st) < 0)
eprintf("lstat %s:", file);
tarinode = st.st_ino;
tardev = st.st_dev;
}
if (filtertool)
tarfd = comp(tarfd, filtertool, "-cf");
if (chdir(dir) < 0)
eprintf("chdir %s:", dir);
for (; *argv; argc--, argv++)
recurse(AT_FDCWD, *argv, NULL, &r);
break;
case 't':
case 'x':
tarfd = 0;
if (file && *file != '-') {
tarfd = open(file, O_RDONLY);
if (tarfd < 0)
eprintf("open %s:", file);
}
if (filtertool) {
fd = tarfd;
tarfd = decomp(tarfd, filtertool, "-cdf");
close(fd);
}
if (chdir(dir) < 0)
eprintf("chdir %s:", dir);
xt(argc, argv, mode);
break;
default:
usage();
}
return recurse_status;
}