b6b977f63d
I've been wanting to do this for a while now, as tar(1) used to
be one of messiest and cruftiest tools.
First off, before walking through the audit, I'll talk about
what the DIRFIRST-flag for recurse() does.
It basically calls fn() on the first-level-dir before calling
it's subentries. It's necessary here, because else the order
of the tar-files would've been wrong (it would try to create
dir/file before creating dir/).
Now, to the audit:
1) Update manpage, fix mistake that compression is also available
for compressing. It's only available for extracting.
2) Define the major, minor and makedev macros from glibc by ourselves.
No need to rely on them, as they are common sense.
decomp()
3) Simple refactorization.
putoctal()
4) Add a truncation check for snprintf().
archive()
5) BUGFIX: Add checks to any checkable function, don't blindly call
them, this is harmful and there are 100 ways to exploit that.
6) Use estrlcpy() instead of snprintf() wherever possible, fix
alignment.
7) BUGFIX: Terminate the result-buffer of readlink(), check if
it even succeeded.
8) Fix sizeof()-formatting.
unarchive()
9) BUGFIX: Add checks to any checkable function, don't blindly call
them, this is harmful and there are 100 ways to exploit that.
10) BUGFIX: strtoul can happily return negative numbers. Add checks
for that and also if the full string has been processed.
11) Remove calls to perror(). We have eprintf, use it.
12) BUGFIX: "minor = strtoul(h->mode, 0, 8);". We need h->minor of
course.
13) Fix typo "usupported", remove fprintf-call.
print()
14) Check fread().
xt()
15) Get rid of snprintf-magic. Use estrlcat().
16) BUGFIX: check for ferror() on the tarfile.
usage()
17) Update it. The old usage() was like 1000 years old.
main()
18) Add DIRFIRST-flag to the recursor.
19) Don't print usage() when a mode is re-set. We allow this in
general.
20) Add function checks and fix error messages.
21) Add tarfilename-global for proper error-messages.
100 lines
2.0 KiB
C
100 lines
2.0 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include "../fs.h"
|
|
#include "../util.h"
|
|
|
|
int recurse_status = 0;
|
|
|
|
void
|
|
recurse(const char *path, void *data, struct recursor *r)
|
|
{
|
|
struct dirent *d;
|
|
struct history *new, *h;
|
|
struct stat st, dst;
|
|
DIR *dp;
|
|
int (*statf)(const char *, struct stat *);
|
|
char subpath[PATH_MAX], *statf_name;
|
|
|
|
if (r->follow == 'P' || (r->follow == 'H' && r->depth)) {
|
|
statf_name = "lstat";
|
|
statf = lstat;
|
|
} else {
|
|
statf_name = "stat";
|
|
statf = stat;
|
|
}
|
|
|
|
if (statf(path, &st) < 0) {
|
|
weprintf("%s %s:", statf_name, path);
|
|
recurse_status = 1;
|
|
return;
|
|
}
|
|
if (!S_ISDIR(st.st_mode)) {
|
|
(r->fn)(path, &st, data, r);
|
|
return;
|
|
}
|
|
|
|
new = emalloc(sizeof(struct history));
|
|
new->prev = r->hist;
|
|
r->hist = new;
|
|
new->dev = st.st_dev;
|
|
new->ino = st.st_ino;
|
|
|
|
for (h = new->prev; h; h = h->prev)
|
|
if (h->ino == st.st_ino && h->dev == st.st_dev)
|
|
return;
|
|
|
|
if (!(dp = opendir(path))) {
|
|
weprintf("opendir %s:", path);
|
|
recurse_status = 1;
|
|
return;
|
|
}
|
|
|
|
if (!r->depth && (r->flags & DIRFIRST))
|
|
(r->fn)(path, &st, data, r);
|
|
|
|
while ((d = readdir(dp))) {
|
|
if (r->follow == 'H') {
|
|
statf_name = "lstat";
|
|
statf = lstat;
|
|
}
|
|
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
|
continue;
|
|
estrlcpy(subpath, path, sizeof(subpath));
|
|
if (path[strlen(path) - 1] != '/')
|
|
estrlcat(subpath, "/", sizeof(subpath));
|
|
estrlcat(subpath, d->d_name, sizeof(subpath));
|
|
if (statf(subpath, &dst) < 0) {
|
|
weprintf("%s %s:", statf_name, subpath);
|
|
recurse_status = 1;
|
|
} else if ((r->flags & SAMEDEV) && dst.st_dev != st.st_dev) {
|
|
continue;
|
|
} else {
|
|
r->depth++;
|
|
(r->fn)(subpath, &dst, data, r);
|
|
r->depth--;
|
|
}
|
|
}
|
|
|
|
if (!r->depth) {
|
|
if (!(r->flags & DIRFIRST))
|
|
(r->fn)(path, &st, data, r);
|
|
|
|
for (; r->hist; ) {
|
|
h = r->hist;
|
|
r->hist = r->hist->prev;
|
|
free(h);
|
|
}
|
|
}
|
|
|
|
closedir(dp);
|
|
}
|