#include <sys/ioctl.h>
#include <fnmatch.h>
+#include "agedu.h"
#include "du.h"
#include "trie.h"
#include "index.h"
-#include "malloc.h"
+#include "alloc.h"
#include "html.h"
#include "httpd.h"
#include "fgetline.h"
-#define PNAME "agedu"
-
-#define lenof(x) (sizeof((x))/sizeof(*(x)))
-
/*
* Path separator. This global variable affects the behaviour of
* various parts of the code when they need to deal with path
struct inclusion_exclusion *inex;
int ninex;
int crossfs;
+ int fakeatimes;
};
static void dump_line(const char *pathname, const struct trie_file *tf)
return 0;
file.size = (unsigned long long)512 * st->st_blocks;
- file.atime = st->st_atime;
+ if (ctx->fakeatimes && S_ISDIR(st->st_mode))
+ file.atime = st->st_mtime;
+ else
+ file.atime = st->st_atime;
/*
* Filter based on wildcards.
xi1 = trie_before(mappedfile, querydir);
xi2 = trie_before(mappedfile, pathbuf);
+ if (xi2 - xi1 == 1)
+ return; /* file, or empty dir => no display */
+
/*
* Now do the lookups in the age index.
*/
if (s1 == s2)
return; /* no space taken up => no display */
- /* Display in units of 1Kb */
- printf("%-11llu %s\n", (s2 - s1) / 1024, querydir);
-
if (depth > 0) {
/*
* Now scan for first-level subdirectories and report
xi1 = trie_before(mappedfile, pathbuf);
}
}
+
+ /* Display in units of 1Kb */
+ printf("%-11llu %s\n", (s2 - s1) / 1024, querydir);
}
/*
* not bother defining logical identifiers for them at all - those
* would be automatically generated, since I wouldn't have any
* need to specify them manually in another part of the code.)
+ *
+ * One other helpful consequence of the enum-based structure here
+ * is that it causes a compiler error if I accidentally try to
+ * define the same option (short or long) twice.
*/
#define OPTHELP(NOVAL, VAL, SHORT, LONG, HELPPFX, HELPARG, HELPLINE, HELPOPT) \
- HELPPFX("usage") HELPLINE("agedu [options] action [action...]") \
+ HELPPFX("usage") HELPLINE(PNAME " [options] action [action...]") \
HELPPFX("actions") \
VAL(SCAN) SHORT(s) LONG(scan) \
HELPARG("directory") HELPOPT("scan and index a directory") \
- NOVAL(DUMP) SHORT(d) LONG(dump) HELPOPT("dump the index file on stdout") \
+ NOVAL(DUMP) SHORT(D) LONG(dump) HELPOPT("dump the index file on stdout") \
VAL(SCANDUMP) SHORT(S) LONG(scan_dump) \
HELPARG("directory") HELPOPT("scan only, generating a dump") \
- NOVAL(LOAD) SHORT(l) LONG(load) \
+ NOVAL(LOAD) SHORT(L) LONG(load) \
HELPOPT("load and index a dump file") \
VAL(TEXT) SHORT(t) LONG(text) \
HELPARG("subdir") HELPOPT("print a plain text report on a subdirectory") \
HELPARG("subdir") HELPOPT("print an HTML report on a subdirectory") \
NOVAL(HTTPD) SHORT(w) LONG(web) LONG(server) LONG(httpd) \
HELPOPT("serve HTML reports from a temporary web server") \
+ NOVAL(REMOVE) SHORT(R) LONG(remove) LONG(delete) LONG(unlink) \
+ HELPOPT("remove the index file") \
HELPPFX("options") \
VAL(DATAFILE) SHORT(f) LONG(file) \
- HELPARG("filename") HELPOPT("[all modes] specify index file") \
+ HELPARG("filename") HELPOPT("[most modes] specify index file") \
NOVAL(PROGRESS) LONG(progress) LONG(scan_progress) \
HELPOPT("[--scan] report progress on stderr") \
NOVAL(NOPROGRESS) LONG(no_progress) LONG(no_scan_progress) \
HELPARG("wildcard") HELPOPT("[--scan] prune files matching pattern") \
VAL(PRUNEPATH) LONG(prune_path) \
HELPARG("wildcard") HELPOPT("[--scan] prune pathnames matching pattern") \
+ NOVAL(DIRATIME) LONG(dir_atime) LONG(dir_atimes) \
+ HELPOPT("[--scan] keep real atimes on directories") \
+ NOVAL(NODIRATIME) LONG(no_dir_atime) LONG(no_dir_atimes) \
+ HELPOPT("[--scan] fake atimes on directories") \
+ VAL(TQDEPTH) SHORT(d) LONG(depth) LONG(max_depth) LONG(maximum_depth) \
+ HELPARG("levels") HELPOPT("[--text] recurse to this many levels") \
VAL(MINAGE) SHORT(a) LONG(age) LONG(min_age) LONG(minimum_age) \
HELPARG("age") HELPOPT("[--text] include only files older than this") \
VAL(AGERANGE) SHORT(r) LONG(age_range) LONG(range) LONG(ages) \
triewalk *tw;
indexbuild *ib;
const struct trie_file *tf;
- char *filename = "agedu.dat";
+ char *filename = PNAME ".dat";
int doing_opts = 1;
- enum { TEXT, HTML, SCAN, DUMP, SCANDUMP, LOAD, HTTPD };
+ enum { TEXT, HTML, SCAN, DUMP, SCANDUMP, LOAD, HTTPD, REMOVE };
struct action {
int mode;
char *arg;
struct inclusion_exclusion *inex = NULL;
int ninex = 0, inexsize = 0;
int crossfs = 0;
+ int tqdepth = 1;
+ int fakediratimes = 1;
#ifdef DEBUG_MAD_OPTION_PARSING_MACROS
{
printf("FIXME: version();\n");
return 0;
case OPT_LICENCE:
- printf("FIXME: licence();\n");
+ {
+ extern const char *const licence[];
+ int i;
+
+ for (i = 0; licence[i]; i++)
+ fputs(licence[i], stdout);
+
+ return 0;
+ }
return 0;
case OPT_SCAN:
if (nactions >= actionsize) {
actions[nactions].arg = NULL;
nactions++;
break;
+ case OPT_REMOVE:
+ if (nactions >= actionsize) {
+ actionsize = nactions * 3 / 2 + 16;
+ actions = sresize(actions, actionsize, struct action);
+ }
+ actions[nactions].mode = REMOVE;
+ actions[nactions].arg = NULL;
+ nactions++;
+ break;
case OPT_PROGRESS:
progress = 2;
break;
case OPT_NOCROSSFS:
crossfs = 0;
break;
+ case OPT_DIRATIME:
+ fakediratimes = 0;
+ break;
+ case OPT_NODIRATIME:
+ fakediratimes = 1;
+ break;
case OPT_DATAFILE:
filename = optval;
break;
+ case OPT_TQDEPTH:
+ tqdepth = atoi(optval);
+ break;
case OPT_MINAGE:
textcutoff = parse_age(now, optval);
break;
auth = HTTPD_AUTH_MAGIC | HTTPD_AUTH_BASIC;
else if (!strcmp(optval, "help") ||
!strcmp(optval, "list")) {
- printf("agedu: supported HTTP authentication types"
+ printf(PNAME ": supported HTTP authentication types"
" are:\n"
" magic use Linux /proc/net/tcp to"
" determine owner of peer socket\n"
char *buf = fgetline(stdin);
unsigned newpathsep;
buf[strcspn(buf, "\r\n")] = '\0';
- if (1 != sscanf(buf, "agedu dump file. pathsep=%x",
+ if (1 != sscanf(buf, DUMPHDR "%x",
&newpathsep)) {
fprintf(stderr, "%s: header in dump file not recognised\n",
PNAME);
return 1;
}
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
ctx->datafile_dev = st.st_dev;
ctx->inex = inex;
ctx->ninex = ninex;
ctx->crossfs = crossfs;
+ ctx->fakeatimes = fakediratimes;
ctx->last_output_update = time(NULL);
}
if (mode == SCANDUMP)
- printf("agedu dump file. pathsep=%02x\n", (unsigned char)pathsep);
+ printf(DUMPHDR "%02x\n", (unsigned char)pathsep);
/*
* Scan the directory tree, and write out the trie component
p++;
c = 0;
for (i = 0; i < 2; i++) {
+ c *= 16;
if (*p >= '0' && *p <= '9')
c += *p - '0';
else if (*p >= 'A' && *p <= 'F')
*q = '\0';
triebuild_add(ctx->tb, buf, &tf);
sfree(buf);
+ line++;
}
} else {
du(scandir, gotdata, ctx);
* will take; enlarge the file, and memory-map it.
*/
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
totalsize = index_compute_size(st.st_size, count);
if (lseek(fd, totalsize-1, SEEK_SET) < 0) {
- perror("agedu: lseek");
+ perror(PNAME ": lseek");
return 1;
}
if (write(fd, "\0", 1) < 1) {
- perror("agedu: write");
+ perror(PNAME ": write");
return 1;
}
mappedfile = mmap(NULL, totalsize, PROT_READ|PROT_WRITE,MAP_SHARED, fd, 0);
if (!mappedfile) {
- perror("agedu: mmap");
+ perror(PNAME ": mmap");
return 1;
}
+ if (fakediratimes) {
+ printf("Faking directory atimes\n");
+ trie_fake_dir_atimes(mappedfile);
+ }
+
+ printf("Building index\n");
ib = indexbuild_new(mappedfile, st.st_size, count);
tw = triewalk_new(mappedfile);
while ((tf = triewalk_next(tw, NULL)) != NULL)
return 1;
}
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
totalsize = st.st_size;
mappedfile = mmap(NULL, totalsize, PROT_READ, MAP_SHARED, fd, 0);
if (!mappedfile) {
- perror("agedu: mmap");
+ perror(PNAME ": mmap");
return 1;
}
pathsep = trie_pathsep(mappedfile);
if (pathlen > 0 && querydir[pathlen-1] == pathsep)
querydir[--pathlen] = '\0';
- text_query(mappedfile, querydir, textcutoff, 1);
+ text_query(mappedfile, querydir, textcutoff, tqdepth);
} else if (mode == HTML) {
char *querydir = actions[action].arg;
size_t pathlen;
return 1;
}
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
totalsize = st.st_size;
mappedfile = mmap(NULL, totalsize, PROT_READ, MAP_SHARED, fd, 0);
if (!mappedfile) {
- perror("agedu: mmap");
+ perror(PNAME ": mmap");
return 1;
}
pathsep = trie_pathsep(mappedfile);
return 1;
}
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
totalsize = st.st_size;
mappedfile = mmap(NULL, totalsize, PROT_READ, MAP_SHARED, fd, 0);
if (!mappedfile) {
- perror("agedu: mmap");
+ perror(PNAME ": mmap");
return 1;
}
pathsep = trie_pathsep(mappedfile);
maxpathlen = trie_maxpathlen(mappedfile);
buf = snewn(maxpathlen, char);
- printf("agedu dump file. pathsep=%02x\n", (unsigned char)pathsep);
+ printf(DUMPHDR "%02x\n", (unsigned char)pathsep);
tw = triewalk_new(mappedfile);
while ((tf = triewalk_next(tw, buf)) != NULL)
dump_line(buf, tf);
return 1;
}
if (fstat(fd, &st) < 0) {
- perror("agedu: fstat");
+ perror(PNAME ": fstat");
return 1;
}
totalsize = st.st_size;
mappedfile = mmap(NULL, totalsize, PROT_READ, MAP_SHARED, fd, 0);
if (!mappedfile) {
- perror("agedu: mmap");
+ perror(PNAME ": mmap");
return 1;
}
pathsep = trie_pathsep(mappedfile);
pcfg.oldest = htmloldest;
pcfg.newest = htmlnewest;
run_httpd(mappedfile, auth, &dcfg, &pcfg);
+ } else if (mode == REMOVE) {
+ if (remove(filename) < 0) {
+ fprintf(stderr, "%s: %s: remove: %s\n", PNAME, filename,
+ strerror(errno));
+ return 1;
+ }
}
}