#include <errno.h>
#include <err.h>
#include <unistd.h>
+#include <assert.h>
#include "tools.h"
static char *tmpdir = NULL;
-static unsigned int count;
bool tools_verbose = false;
/* Ten minutes. */
*timeout_ms = 0;
else
*timeout_ms -= ms;
-
+ close(p[0]);
if (tools_verbose) {
printf("%s", ret);
printf("Finished: %u ms, %s %u\n", ms,
return ret;
}
-/* Returns output if command fails. */
-char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
+/* Tallocs *output off ctx; return false if command fails. */
+bool run_command(const void *ctx, unsigned int *time_ms, char **output,
+ const char *fmt, ...)
{
va_list ap;
- char *cmd, *contents;
+ char *cmd;
bool ok;
unsigned int default_time = default_timeout_ms;
if (!time_ms)
time_ms = &default_time;
- else if (*time_ms == 0)
- return talloc_strdup(ctx, "\n== TIMED OUT ==\n");
+ else if (*time_ms == 0) {
+ *output = talloc_strdup(ctx, "\n== TIMED OUT ==\n");
+ return false;
+ }
va_start(ap, fmt);
cmd = talloc_vasprintf(ctx, fmt, ap);
va_end(ap);
- contents = run_with_timeout(ctx, cmd, &ok, time_ms);
- if (ok) {
- talloc_free(contents);
- return NULL;
- }
-
- if (!contents)
+ *output = run_with_timeout(ctx, cmd, &ok, time_ms);
+ if (ok)
+ return true;
+ if (!*output)
err(1, "Problem running child");
if (*time_ms == 0)
- contents = talloc_asprintf_append(contents,
- "\n== TIMED OUT ==\n");
- return contents;
+ *output = talloc_asprintf_append(*output,
+ "\n== TIMED OUT ==\n");
+ return false;
}
static int unlink_all(char *dir)
return tmpdir;
}
-char *temp_file(const void *ctx, const char *extension)
-{
- char *f = talloc_asprintf(ctx, "%s/%u%s",
- temp_dir(ctx), count++, extension);
- if (tools_verbose)
- printf("Created temporary file %s\n", f);
- return f;
-}
-
char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
const char *srcname)
{
- size_t baselen;
- char *f;
+ unsigned baselen;
+ char *f, *suffix = talloc_strdup(ctx, "");
+ struct stat st;
+ unsigned int count = 0;
if (!keep)
- return temp_file(ctx, extension);
+ srcname = talloc_basename(ctx, srcname);
+ else
+ assert(srcname[0] == '/');
+
+ if (strrchr(srcname, '.'))
+ baselen = strrchr(srcname, '.') - srcname;
+ else
+ baselen = strlen(srcname);
+
+ do {
+ f = talloc_asprintf(ctx, "%s/%.*s%s%s",
+ keep ? "" : temp_dir(ctx),
+ baselen, srcname,
+ suffix, extension);
+ talloc_free(suffix);
+ suffix = talloc_asprintf(ctx, "-%u", ++count);
+ } while (lstat(f, &st) == 0);
- baselen = strrchr(srcname, '.') - srcname;
- f = talloc_asprintf(ctx, "%.*s%s", baselen, srcname, extension);
if (tools_verbose)
printf("Creating file %s\n", f);
+
+ talloc_free(suffix);
return f;
}