#include <ccan/talloc/talloc.h>
#include <ccan/grab_file/grab_file.h>
+#include <ccan/noerr/noerr.h>
+#include <ccan/read_write_all/read_write_all.h>
+#include <ccan/noerr/noerr.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
#include <errno.h>
#include <err.h>
+#include <unistd.h>
#include "tools.h"
static char *tmpdir = NULL;
static unsigned int count;
+/* Ten minutes. */
+const unsigned int default_timeout_ms = 10 * 60 * 1000;
+
char *talloc_basename(const void *ctx, const char *dir)
{
char *p = strrchr(dir, '/');
return cwd;
}
+static void killme(int sig)
+{
+ kill(-getpid(), SIGKILL);
+}
+
+char *run_with_timeout(const void *ctx, const char *cmd,
+ bool *ok, unsigned *timeout_ms)
+{
+ pid_t pid;
+ int p[2];
+ char *ret;
+ int status, ms;
+ struct timeval start, end;
+
+ *ok = false;
+ if (pipe(p) != 0)
+ return talloc_asprintf(ctx, "Failed to create pipe: %s",
+ strerror(errno));
+
+ gettimeofday(&start, NULL);
+ pid = fork();
+ if (pid == -1) {
+ close_noerr(p[0]);
+ close_noerr(p[1]);
+ return talloc_asprintf(ctx, "Failed to fork: %s",
+ strerror(errno));
+ return NULL;
+ }
+
+ if (pid == 0) {
+ struct itimerval itim;
+
+ if (dup2(p[1], STDOUT_FILENO) != STDOUT_FILENO
+ || dup2(p[1], STDERR_FILENO) != STDERR_FILENO
+ || close(p[0]) != 0
+ || close(STDIN_FILENO) != 0
+ || open("/dev/null", O_RDONLY) != STDIN_FILENO)
+ exit(128);
+
+ signal(SIGALRM, killme);
+ itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
+ itim.it_value.tv_sec = *timeout_ms / 1000;
+ itim.it_value.tv_usec = (*timeout_ms % 1000) * 1000;
+ setitimer(ITIMER_REAL, &itim, NULL);
+
+ status = system(cmd);
+ if (WIFEXITED(status))
+ exit(WEXITSTATUS(status));
+ /* Here's a hint... */
+ exit(128 + WTERMSIG(status));
+ }
+
+ close(p[1]);
+ ret = grab_fd(ctx, p[0], NULL);
+ /* This shouldn't fail... */
+ if (waitpid(pid, &status, 0) != pid)
+ err(1, "Failed to wait for child");
+
+ gettimeofday(&end, NULL);
+ if (end.tv_usec < start.tv_usec) {
+ end.tv_usec += 1000000;
+ end.tv_sec--;
+ }
+ ms = (end.tv_sec - start.tv_sec) * 1000
+ + (end.tv_usec - start.tv_usec) / 1000;
+ if (ms > *timeout_ms)
+ *timeout_ms = 0;
+ else
+ *timeout_ms -= ms;
+
+ *ok = (WIFEXITED(status) && WEXITSTATUS(status) == 0);
+ return ret;
+}
+
/* Returns output if command fails. */
-char *run_command(const void *ctx, const char *fmt, ...)
+char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
{
va_list ap;
char *cmd, *contents;
- FILE *pipe;
+ 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");
va_start(ap, fmt);
cmd = talloc_vasprintf(ctx, fmt, ap);
va_end(ap);
- /* Ensure stderr gets to us too. */
- cmd = talloc_asprintf_append(cmd, " 2>&1");
-
- pipe = popen(cmd, "r");
- if (!pipe)
- return talloc_asprintf(ctx, "Failed to run '%s'", cmd);
-
- contents = grab_fd(cmd, fileno(pipe), NULL);
- if (pclose(pipe) != 0)
- return talloc_asprintf(ctx, "Running '%s':\n%s",
- cmd, contents);
+ contents = run_with_timeout(ctx, cmd, &ok, time_ms);
+ if (ok) {
+ talloc_free(contents);
+ return NULL;
+ }
- talloc_free(cmd);
- return NULL;
+ if (!contents)
+ err(1, "Problem running child");
+ if (*time_ms == 0)
+ contents = talloc_asprintf_append(contents,
+ "\n== TIMED OUT ==\n");
+ return contents;
}
static int unlink_all(char *dir)
{
char cmd[strlen(dir) + sizeof("rm -rf ")];
sprintf(cmd, "rm -rf %s", dir);
-// system(cmd);
+ if (system(cmd) != 0)
+ warn("Could not remove temporary work in %s", dir);
return 0;
}
-char *temp_file(const void *ctx, const char *extension)
+char *temp_dir(const void *ctx)
{
/* For first call, create dir. */
while (!tmpdir) {
}
talloc_set_destructor(tmpdir, unlink_all);
}
+ return tmpdir;
+}
+
+char *temp_file(const void *ctx, const char *extension)
+{
+ return talloc_asprintf(ctx, "%s/%u%s",
+ temp_dir(ctx), count++, extension);
+}
+
+char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
+ const char *srcname)
+{
+ size_t baselen;
+
+ if (!keep)
+ return temp_file(ctx, extension);
+
+ baselen = strrchr(srcname, '.') - srcname;
+ return talloc_asprintf(ctx, "%.*s%s", baselen, srcname, extension);
+}
+
+bool move_file(const char *oldname, const char *newname)
+{
+ char *contents;
+ size_t size;
+ int fd;
+ bool ret;
+
+ /* Simple case: rename works. */
+ if (rename(oldname, newname) == 0)
+ return true;
+
+ /* Try copy and delete: not atomic! */
+ contents = grab_file(NULL, oldname, &size);
+ if (!contents)
+ return false;
+
+ fd = open(newname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ if (fd < 0) {
+ ret = false;
+ goto free;
+ }
+
+ ret = write_all(fd, contents, size);
+ if (close(fd) != 0)
+ ret = false;
+
+ if (ret)
+ unlink(oldname);
+ else
+ unlink(newname);
- return talloc_asprintf(ctx, "%s/%u%s", tmpdir, count++, extension);
+free:
+ talloc_free(contents);
+ return ret;
}
projects / ccan / blobdiff