[src/run.c] Move creatfile, mktempdir, rmtree to util/fs.c

1 files changed, 1 insertions, 111 deletions

diff --git a/src/run.c b/src/run.c
index a0a58ea..ff5d3db 100644
--- a/src/run.c
+++ b/src/run.c
@@ -10,119 +10,16 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <limits.h>
-#include <ftw.h>
-#include <fcntl.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
 
-#ifndef P_tmpdir
-#define P_tmpdir "/tmp"
-#endif
-
-#if HAVE_MKDTEMP && !HAVE_DECL_MKDTEMP
-extern char *mkdtemp(char *);
-#endif
-#if HAVE_MKTEMP && !HAVE_DECL_MKTEMP
-extern char *mktemp(char *);
-#endif
-#if HAVE_TEMPNAM && !HAVE_DECL_TEMPNAM
-extern char *tempnam(const char *, const char *);
-#endif
-
-#ifndef P_tmpdir
-/* fallback */
-#define P_tmpdir "/tmp"
-#endif
-
 /* as per mktemp(3p) the last 6 characters of object_marker_tmpl must be Xs */
 static char *object_marker_tmpl = ".skonfig-XXXXXX";
 
 
 /**
- * mktempdir:
- * creates a temporary directory in a suitable location.
- *
- * @param dest: must be a pointer to a buffer of a least PATH_MAX+1 length.
- * @return dest if a directory was created successfully, NULL otherwise.
- */
-char *mktempdir(char *dest) {
-	static const char *pfx = "tmp";
-
-	for (size_t try = 1; try < TMP_MAX; ++try) {
-#if HAVE_MKDTEMP || HAVE_MKTEMP
-		if (PATH_MAX < snprintf(
-			    dest, PATH_MAX+1, "%s/%sXXXXXX",
-			    (getenv("TMPDIR") ? getenv("TMPDIR") : P_tmpdir),
-			    pfx)) {
-			goto fail;
-		}
-
-#if HAVE_MKDTEMP
-		if (NULL != mkdtemp(dest)) {
-			return dest;
-		}
-#elif HAVE_MKTEMP
-		if (0 < strlen(mktemp(dest))) {
-			if (0 > mkdir(dest, S_IRWXU)) {
-				continue;
-			}
-			return dest;
-		} else if (errno = EINVAL) {
-			goto fail;
-		}
-#endif  /* HAVE_MKTEMP */
-
-#elif HAVE_TEMPNAM
-		char *name = tempnam(NULL, pfx);
-		if (NULL == name) {
-			continue;
-		}
-
-		dest[PATH_MAX] = '\0';
-		(void)strncpy(dest, name, PATH_MAX);
-		free(name);
-
-		if (dest[PATH_MAX]) {
-			continue;
-		}
-
-		if (0 == mkdir(dest, S_IRWXU)) {
-			return dest;
-		}
-#else
-#error no implementation to create temporary directories
-#endif
-	}
-
-	goto fail;  /* hack around error: label defined but not used */
-  fail:
-	sk_error("mktempdir failed: %s", dest);
-	return NULL;
-}
-
-/**
- * rmtree:
- * delete a directory on the file system and all its descendants.
- *
- * @param dir: the path to the directory to delete.
- * @return 0 on success, -1 otherwise.
- */
-static int __rmtree_fn(
-	const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf) {
-	sk_trace("removing %s", fpath);
-	if (-1 == remove(fpath)) {
-		sk_error("failed to remove %s: %s", fpath, strerror(errno));
-	}
-
-	return 0 /* FTW_CONTINUE */;
-}
-int rmtree(const char *dir) {
-	return nftw(dir, __rmtree_fn, 16, FTW_DEPTH | FTW_PHYS);
-}
-
-/**
  * sk_run_gen_workdir_path:
  * determine the path to use for the local workdir and create it if necessary.
  *
@@ -155,13 +52,6 @@ char *sk_run_gen_workdir_path(struct sk_config *config, char *dest) {
 	return NULL;
 }
 
-int creatfile(const char *path, mode_t mode) {
-	int fd = creat(path, mode);
-	if (0 < fd)
-		(void)close(fd);
-	return fd;
-}
-
 sk_run_error sk_run_prepare_local_hostdir(const char *local_hostdir) {
 	static const char *subdirs[] = {
 		"bin", "conf", "explorer", "object", "stdout", "stderr"