X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=b78702d03a6d1ff26df2a1d412f3bb2965d40b67;hp=0a29ddf8e64cce7875a8a9d8c8fe37a0c6d90a13;hb=6aa2f4e347e5d66a392b879fe901bc582099a552;hpb=2bce880a453a64d2d1dfc2e48184553ff4f2550b diff --git a/tools/tools.c b/tools/tools.c index 0a29ddf8..b78702d0 100644 --- a/tools/tools.c +++ b/tools/tools.c @@ -1,9 +1,12 @@ -#include -#include +#include +#include #include +#include #include #include #include +#include +#include #include #include #include @@ -13,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -25,42 +27,6 @@ bool tools_verbose = false; /* Ten minutes. */ const unsigned int default_timeout_ms = 10 * 60 * 1000; -char *talloc_basename(const void *ctx, const char *dir) -{ - char *p = strrchr(dir, '/'); - - if (!p) - return talloc_strdup(ctx, dir); - return talloc_strdup(ctx, p+1); -} - -char *talloc_dirname(const void *ctx, const char *dir) -{ - char *p = strrchr(dir, '/'); - - if (!p) - return talloc_strdup(ctx, "."); - return talloc_strndup(ctx, dir, p - dir); -} - -char *talloc_getcwd(const void *ctx) -{ - unsigned int len; - char *cwd; - - /* *This* is why people hate C. */ - len = 32; - cwd = talloc_array(ctx, char, len); - while (!getcwd(cwd, len)) { - if (errno != ERANGE) { - talloc_free(cwd); - return NULL; - } - cwd = talloc_realloc(ctx, cwd, char, len *= 2); - } - return cwd; -} - static void killme(int sig) { kill(-getpid(), SIGKILL); @@ -71,14 +37,14 @@ char *run_with_timeout(const void *ctx, const char *cmd, { pid_t pid; int p[2]; - char *ret; + struct rbuf in; int status, ms; - struct timeval start; + struct timeabs start; *ok = false; if (pipe(p) != 0) - return talloc_asprintf(ctx, "Failed to create pipe: %s", - strerror(errno)); + return tal_fmt(ctx, "Failed to create pipe: %s", + strerror(errno)); if (tools_verbose) printf("Running: %s\n", cmd); @@ -90,9 +56,7 @@ char *run_with_timeout(const void *ctx, const char *cmd, if (pid == -1) { close_noerr(p[0]); close_noerr(p[1]); - return talloc_asprintf(ctx, "Failed to fork: %s", - strerror(errno)); - return NULL; + return tal_fmt(ctx, "Failed to fork: %s", strerror(errno)); } if (pid == 0) { @@ -107,7 +71,7 @@ char *run_with_timeout(const void *ctx, const char *cmd, signal(SIGALRM, killme); itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0; - itim.it_value = time_from_msec(*timeout_ms); + itim.it_value = timespec_to_timeval(time_from_msec(*timeout_ms).ts); setitimer(ITIMER_REAL, &itim, NULL); status = system(cmd); @@ -118,29 +82,32 @@ char *run_with_timeout(const void *ctx, const char *cmd, } close(p[1]); - ret = grab_fd(ctx, p[0], NULL); + rbuf_init(&in, p[0], tal_arr(ctx, char, 4096), 4096); + if (!rbuf_read_str(&in, 0, do_tal_realloc) && errno) + in.buf = tal_free(in.buf); + /* This shouldn't fail... */ if (waitpid(pid, &status, 0) != pid) err(1, "Failed to wait for child"); - ms = time_to_msec(time_sub(time_now(), start)); + ms = time_to_msec(time_between(time_now(), start)); if (ms > *timeout_ms) *timeout_ms = 0; else *timeout_ms -= ms; close(p[0]); if (tools_verbose) { - printf("%s", ret); + printf("%s", in.buf); printf("Finished: %u ms, %s %u\n", ms, WIFEXITED(status) ? "exit status" : "killed by signal", WIFEXITED(status) ? WEXITSTATUS(status) : WTERMSIG(status)); } *ok = (WIFEXITED(status) && WEXITSTATUS(status) == 0); - return ret; + return in.buf; } -/* Tallocs *output off ctx; return false if command fails. */ +/* Tals *output off ctx; return false if command fails. */ bool run_command(const void *ctx, unsigned int *time_ms, char **output, const char *fmt, ...) { @@ -152,12 +119,12 @@ bool run_command(const void *ctx, unsigned int *time_ms, char **output, if (!time_ms) time_ms = &default_time; else if (*time_ms == 0) { - *output = talloc_strdup(ctx, "\n== TIMED OUT ==\n"); + *output = tal_strdup(ctx, "\n== TIMED OUT ==\n"); return false; } va_start(ap, fmt); - cmd = talloc_vasprintf(ctx, fmt, ap); + cmd = tal_vfmt(ctx, fmt, ap); va_end(ap); *output = run_with_timeout(ctx, cmd, &ok, time_ms); @@ -166,12 +133,11 @@ bool run_command(const void *ctx, unsigned int *time_ms, char **output, if (!*output) err(1, "Problem running child"); if (*time_ms == 0) - *output = talloc_asprintf_append(*output, - "\n== TIMED OUT ==\n"); + *output = tal_strcat(ctx, take(*output), "\n== TIMED OUT ==\n"); return false; } -static int unlink_all(const char *dir) +static void unlink_all(const char *dir) { char cmd[strlen(dir) + sizeof("rm -rf ")]; sprintf(cmd, "rm -rf %s", dir); @@ -179,77 +145,80 @@ static int unlink_all(const char *dir) printf("Running: %s\n", cmd); if (system(cmd) != 0) warn("Could not remove temporary work in %s", dir); - return 0; } -const char *temp_dir(const void *ctx) +static pid_t *afree; +static void free_autofree(void) +{ + if (*afree == getpid()) + tal_free(afree); +} + +tal_t *autofree(void) +{ + if (!afree) { + afree = tal(NULL, pid_t); + *afree = getpid(); + atexit(free_autofree); + } + return afree; +} + +const char *temp_dir(void) { /* For first call, create dir. */ while (!tmpdir) { tmpdir = getenv("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; - tmpdir = talloc_asprintf(talloc_autofree_context(), - "%s/ccanlint-%u.%lu", - tmpdir, getpid(), random()); + tmpdir = tal_fmt(autofree(), "%s/ccanlint-%u.%lu", + tmpdir, getpid(), random()); if (mkdir(tmpdir, 0700) != 0) { if (errno == EEXIST) { - talloc_free(tmpdir); + tal_free(tmpdir); tmpdir = NULL; continue; } err(1, "mkdir %s failed", tmpdir); } - talloc_set_destructor(tmpdir, unlink_all); + tal_add_destructor(tmpdir, unlink_all); if (tools_verbose) printf("Created temporary directory %s\n", tmpdir); } return tmpdir; } -int unlink_file_destructor(char *filename) +void keep_temp_dir(void) { - unlink(filename); - return 0; + tal_del_destructor(temp_dir(), unlink_all); } -char *maybe_temp_file(const void *ctx, const char *extension, bool keep, - const char *srcname) +char *temp_file(const void *ctx, const char *extension, const char *srcname) { - unsigned baselen; - char *f, *suffix = talloc_strdup(ctx, ""); + char *f, *base, *suffix; struct stat st; unsigned int count = 0; - srcname = talloc_basename(ctx, srcname); - if (strrchr(srcname, '.')) - baselen = strrchr(srcname, '.') - srcname; - else - baselen = strlen(srcname); + base = path_join(ctx, temp_dir(), take(path_basename(ctx, srcname))); + /* Trim extension. */ + base[path_ext_off(base)] = '\0'; + suffix = tal_strdup(ctx, extension); do { - f = talloc_asprintf(ctx, "%s/%.*s%s%s", - temp_dir(ctx), - baselen, srcname, - suffix, extension); - talloc_free(suffix); - suffix = talloc_asprintf(ctx, "-%u", ++count); + f = tal_strcat(ctx, base, suffix); + suffix = tal_fmt(base, "-%u%s", ++count, extension); } while (lstat(f, &st) == 0); if (tools_verbose) - printf("Creating %sfile %s\n", keep ? "" : "temporary ", f); - - if (!keep) - talloc_set_destructor(f, unlink_file_destructor); + printf("Creating file %s\n", f); - talloc_free(suffix); + tal_free(base); return f; } bool move_file(const char *oldname, const char *newname) { char *contents; - size_t size; int fd; bool ret; @@ -264,7 +233,7 @@ bool move_file(const char *oldname, const char *newname) } /* Try copy and delete: not atomic! */ - contents = grab_file(NULL, oldname, &size); + contents = grab_file(NULL, oldname); if (!contents) { if (tools_verbose) printf("read failed: %s\n", strerror(errno)); @@ -279,7 +248,7 @@ bool move_file(const char *oldname, const char *newname) goto free; } - ret = write_all(fd, contents, size); + ret = write_all(fd, contents, tal_count(contents)-1); if (close(fd) != 0) ret = false; @@ -294,6 +263,12 @@ bool move_file(const char *oldname, const char *newname) } free: - talloc_free(contents); + tal_free(contents); return ret; } + +void *do_tal_realloc(void *p, size_t size) +{ + tal_resize((char **)&p, size); + return p; +}