thodg/got

diff --git a/got/Makefile b/got/Makefile
index 0044a48..810f98c 100644
--- a/got/Makefile
+++ b/got/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		got
 SRCS=		got.c delta.c diff.c diffreg.c error.c fileindex.c object.c \
-		path.c pack.c privsep.c reference.c repository.c sha1.c \
-		worktree.c zbuf.c
+		opentemp.c path.c pack.c privsep.c reference.c repository.c \
+		sha1.c worktree.c zbuf.c
 
 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib
 LDADD = -lutil -lz
diff --git a/include/got_opentemp.h b/include/got_opentemp.h
new file mode 100644
index 0000000..1820266
--- /dev/null
+++ b/include/got_opentemp.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Utilities for opening temporary files. */
+
+/* Open a file descriptor to a new temporary file for writing.
+ * The file is not visible in the filesystem. */
+int got_opentempfd(void);
+
+/* Open a new temporary file for writing.
+ * The file is not visible in the filesystem. */
+FILE *got_opentemp(void);
+
+/* Open a new temporary file for writing.
+ * The file is visible in the filesystem. */
+const struct got_error *got_opentemp_named(char **, FILE **, const char *);
diff --git a/lib/diff.c b/lib/diff.c
index 85c5386..c9ec771 100644
--- a/lib/diff.c
+++ b/lib/diff.c
@@ -28,6 +28,7 @@
 #include "got_object.h"
 #include "got_error.h"
 #include "got_diff.h"
+#include "got_opentemp.h"
 
 #include "got_lib_diff.h"
 #include "got_lib_path.h"
diff --git a/lib/got_lib_path.h b/lib/got_lib_path.h
index d1ceebb..7fcd5f6 100644
--- a/lib/got_lib_path.h
+++ b/lib/got_lib_path.h
@@ -34,18 +34,6 @@ char *got_path_get_absolute(const char *);
  */
 char *got_path_normalize(const char *);
 
-/* Open a file descriptor to a new temporary file for writing.
- * The file is not visible in the filesystem. */
-int got_opentempfd(void);
-
-/* Open a new temporary file for writing.
- * The file is not visible in the filesystem. */
-FILE *got_opentemp(void);
-
-/* Open a new temporary file for writing.
- * The file is visible in the filesystem. */
-const struct got_error *got_opentemp_named(char **, FILE **, const char *);
-
 /* Count the number of path segments separated by '/'. */
 const struct got_error *
 got_path_segment_count(int *count, const char *path);
diff --git a/lib/object.c b/lib/object.c
index c382219..45d21d4 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -36,6 +36,7 @@
 #include "got_error.h"
 #include "got_object.h"
 #include "got_repository.h"
+#include "got_opentemp.h"
 
 #include "got_lib_sha1.h"
 #include "got_lib_delta.h"
diff --git a/lib/opentemp.c b/lib/opentemp.c
new file mode 100644
index 0000000..90af269
--- /dev/null
+++ b/lib/opentemp.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "got_opentemp.h"
+#include "got_error.h"
+
+int
+got_opentempfd(void)
+{
+	char name[PATH_MAX];
+	int fd;
+
+	if (strlcpy(name, "/tmp/got.XXXXXXXX", sizeof(name)) >= sizeof(name))
+		return -1;
+
+	fd = mkstemp(name);
+	unlink(name);
+	return fd;
+}
+
+FILE *
+got_opentemp(void)
+{
+	int fd;
+	FILE *f;
+
+	fd = got_opentempfd();
+	if (fd < 0)
+		return NULL;
+
+	f = fdopen(fd, "w+");
+	if (f == NULL) {
+		close(fd);
+		return NULL;
+	}
+
+	return f;
+}
+
+const struct got_error *
+got_opentemp_named(char **path, FILE **outfile, const char *basepath)
+{
+	const struct got_error *err = NULL;
+	int fd;
+
+	if (asprintf(path, "%s-XXXXXX", basepath) == -1) {
+		*path = NULL;
+		return got_error_from_errno();
+	}
+
+	fd = mkstemp(*path);
+	if (fd == -1) {
+		err = got_error_from_errno();
+		free(*path);
+		*path = NULL;
+		return err;
+	}
+
+	*outfile = fdopen(fd, "w+");
+	if (*outfile == NULL) {
+		err = got_error_from_errno();
+		free(*path);
+		*path = NULL;
+	}
+
+	return err;
+}
diff --git a/lib/pack.c b/lib/pack.c
index 5ae9420..6ced42c 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -33,6 +33,7 @@
 #include "got_error.h"
 #include "got_object.h"
 #include "got_repository.h"
+#include "got_opentemp.h"
 
 #include "got_lib_sha1.h"
 #include "got_lib_pack.h"
diff --git a/lib/path.c b/lib/path.c
index 659eaea..30be0f8 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -81,65 +81,3 @@ got_path_segment_count(int *count, const char *path)
 
 	return NULL;
 }
-
-int
-got_opentempfd(void)
-{
-	char name[PATH_MAX];
-	int fd;
-
-	if (strlcpy(name, "/tmp/got.XXXXXXXX", sizeof(name)) >= sizeof(name))
-		return -1;
-
-	fd = mkstemp(name);
-	unlink(name);
-	return fd;
-}
-
-FILE *
-got_opentemp(void)
-{
-	int fd;
-	FILE *f;
-
-	fd = got_opentempfd();
-	if (fd < 0)
-		return NULL;
-
-	f = fdopen(fd, "w+");
-	if (f == NULL) {
-		close(fd);
-		return NULL;
-	}
-
-	return f;
-}
-
-const struct got_error *
-got_opentemp_named(char **path, FILE **outfile, const char *basepath)
-{
-	const struct got_error *err = NULL;
-	int fd;
-
-	if (asprintf(path, "%s-XXXXXX", basepath) == -1) {
-		*path = NULL;
-		return got_error_from_errno();
-	}
-
-	fd = mkstemp(*path);
-	if (fd == -1) {
-		err = got_error_from_errno();
-		free(*path);
-		*path = NULL;
-		return err;
-	}
-
-	*outfile = fdopen(fd, "w+");
-	if (*outfile == NULL) {
-		err = got_error_from_errno();
-		free(*path);
-		*path = NULL;
-	}
-
-	return err;
-}
diff --git a/lib/worktree.c b/lib/worktree.c
index 4fe01db..176d82f 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -33,6 +33,7 @@
 #include "got_reference.h"
 #include "got_object.h"
 #include "got_worktree.h"
+#include "got_opentemp.h"
 
 #include "got_lib_worktree.h"
 #include "got_lib_path.h"
diff --git a/regress/delta/Makefile b/regress/delta/Makefile
index 20d6513..3c421aa 100644
--- a/regress/delta/Makefile
+++ b/regress/delta/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG = delta_test
-SRCS = delta.c error.c path.c zbuf.c delta_test.c
+SRCS = delta.c error.c opentemp.c path.c zbuf.c delta_test.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
 LDADD = -lz
diff --git a/regress/delta/delta_test.c b/regress/delta/delta_test.c
index b4272d3..f8b0bfa 100644
--- a/regress/delta/delta_test.c
+++ b/regress/delta/delta_test.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 
 #include "got_error.h"
+#include "got_opentemp.h"
 
 #include "got_lib_delta.h"
 #include "got_lib_path.h"
diff --git a/regress/repository/Makefile b/regress/repository/Makefile
index 605897b..18bd527 100644
--- a/regress/repository/Makefile
+++ b/regress/repository/Makefile
@@ -1,9 +1,9 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG = repository_test
-SRCS = path.c repository.c error.c reference.c object.c sha1.c diff.c \
-	diffreg.c pack.c privsep.c delta.c fileindex.c worktree.c \
-	zbuf.c repository_test.c
+SRCS = path.c repository.c error.c reference.c object.c opentemp.c \
+	sha1.c diff.c diffreg.c pack.c privsep.c delta.c fileindex.c \
+	worktree.c zbuf.c repository_test.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
 LDADD = -lutil -lz
diff --git a/regress/repository/repository_test.c b/regress/repository/repository_test.c
index 67c3239..6c9a268 100644
--- a/regress/repository/repository_test.c
+++ b/regress/repository/repository_test.c
@@ -31,6 +31,7 @@
 #include "got_reference.h"
 #include "got_repository.h"
 #include "got_diff.h"
+#include "got_opentemp.h"
 
 #include "got_lib_path.h"
 
diff --git a/regress/worktree/Makefile b/regress/worktree/Makefile
index 7d7df3b..bdce9e6 100644
--- a/regress/worktree/Makefile
+++ b/regress/worktree/Makefile
@@ -1,8 +1,9 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG = worktree_test
-SRCS = worktree.c repository.c object.c path.c error.c reference.c sha1.c \
-	pack.c privsep.c delta.c zbuf.c fileindex.c worktree_test.c
+SRCS = worktree.c repository.c object.c opentemp.c path.c error.c \
+	reference.c sha1.c pack.c privsep.c delta.c zbuf.c \
+	fileindex.c worktree_test.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
 LDADD = -lutil -lz
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index eb723d0..a1d1e49 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -34,6 +34,7 @@
 #include "got_reference.h"
 #include "got_repository.h"
 #include "got_worktree.h"
+#include "got_opentemp.h"
 
 #include "got_lib_worktree.h"
 #include "got_lib_path.h"
diff --git a/tog/Makefile b/tog/Makefile
index 965c0cd..4fd5ba1 100644
--- a/tog/Makefile
+++ b/tog/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		tog
 SRCS=		tog.c delta.c diff.c diffreg.c error.c fileindex.c object.c \
-		path.c pack.c privsep.c reference.c repository.c sha1.c \
-		worktree.c zbuf.c
+		opentemp.c path.c pack.c privsep.c reference.c repository.c \
+		sha1.c worktree.c zbuf.c
 
 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib
 LDADD = -lpanel -lcurses -lutil -lz
diff --git a/tog/tog.c b/tog/tog.c
index 1eeab3c..db5f5fc 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -34,6 +34,7 @@
 #include "got_reference.h"
 #include "got_repository.h"
 #include "got_diff.h"
+#include "got_opentemp.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
@@ -87,39 +88,6 @@ static struct tog_diff_view {
 	PANEL *panel;
 } tog_diff_view;
 
-int
-tog_opentempfd(void)
-{
-	char name[PATH_MAX];
-	int fd;
-
-	if (strlcpy(name, "/tmp/tog.XXXXXXXX", sizeof(name)) >= sizeof(name))
-		return -1;
-
-	fd = mkstemp(name);
-	unlink(name);
-	return fd;
-}
-
-FILE *
-tog_opentemp(void)
-{
-	int fd;
-	FILE *f;
-
-	fd = tog_opentempfd();
-	if (fd < 0)
-		return NULL;
-
-	f = fdopen(fd, "w+");
-	if (f == NULL) {
-		close(fd);
-		return NULL;
-	}
-
-	return f;
-}
-
 __dead void
 usage_log(void)
 {
@@ -832,7 +800,7 @@ show_diff_view(struct got_object *obj1, struct got_object *obj2,
 	if (got_object_get_type(obj1) != got_object_get_type(obj2))
 		return got_error(GOT_ERR_OBJ_TYPE);
 
-	f = tog_opentemp();
+	f = got_opentemp();
 	if (f == NULL)
 		return got_error_from_errno();