thodg/got

diff --git a/include/got_path.h b/include/got_path.h
new file mode 100644
index 0000000..d796646
--- /dev/null
+++ b/include/got_path.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, 2019 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 dealing with filesystem paths. */
+
+#define GOT_DEFAULT_FILE_MODE	(S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
+#define GOT_DEFAULT_DIR_MODE	(S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
+
+/* Determine whether a path is an absolute path. */
+int got_path_is_absolute(const char *);
+
+/*
+ * Return an absolute version of a relative path.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_get_absolute(const char *);
+
+/* 
+ * Normalize a path for internal processing.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_normalize(const char *);
+
+/*
+ * Canonicalize absolute paths by removing redundant path separators
+ * and resolving references to parent directories ("/../").
+ * Relative paths are copied from input to buf as-is.
+ */
+const struct got_error *got_canonpath(const char *, char *, size_t);
+
+/*
+ * Get child part of two absolute paths. The second path must equal the first
+ * path up to some path component, and must be longer than the first path.
+ * The result is allocated with malloc(3).
+ */
+const struct got_error *got_path_skip_common_ancestor(char **, const char *,
+    const char *);
+
+/* Determine whether a path points to the root directory "/" . */
+int got_path_is_root_dir(const char *);
+
+/* Determine whether a path is a path-wise child of another path. */
+int got_path_is_child(const char *, const char *, size_t);
+
+/*
+ * Like strcmp() but orders children in subdirectories directly after
+ * their parents.
+ */
+int got_path_cmp(const char *, const char *);
+
+/*
+ * Path lists allow for predictable concurrent iteration over multiple lists
+ * of paths obtained from disparate sources which don't all provide the same
+ * ordering guarantees (e.g. git trees, file index, and on-disk directories).
+ */
+struct got_pathlist_entry {
+	TAILQ_ENTRY(got_pathlist_entry) entry;
+	const char *path;
+	void *data; /* data pointer provided to got_pathlist_insert() */
+};
+TAILQ_HEAD(got_pathlist_head, got_pathlist_entry);
+
+/*
+ * Insert a path into the list of paths in a predictable order.
+ * The caller should already have initialized the list head. This list stores
+ * the pointer to the path as-is, i.e. the path is not copied internally and
+ * must remain available until the list is freed with got_pathlist_free().
+ * If the first argument is not NULL, set it to a pointer to the newly inserted
+ * element, or to a NULL pointer in case the path was already on the list.
+ */
+const struct got_error *got_pathlist_insert(struct got_pathlist_entry **,
+    struct got_pathlist_head *, const char *, void *);
+
+/* Free resources allocated for a path list. */
+void got_pathlist_free(struct got_pathlist_head *);
+
+/* Attempt to create a directory at a given path. */
+const struct got_error *got_path_mkdir(const char *);
+
+/* dirname(3) with error handling and dynamically allocated result. */
+const struct got_error *got_path_dirname(char **, const char *);
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index 02c170d..ebce7f7 100644
--- a/lib/commit_graph.c
+++ b/lib/commit_graph.c
@@ -29,12 +29,12 @@
 #include "got_error.h"
 #include "got_object.h"
 #include "got_commit_graph.h"
+#include "got_path.h"
 
 #include "got_lib_delta.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
 #include "got_lib_object_idset.h"
-#include "got_lib_path.h"
 
 struct got_commit_graph_node {
 	struct got_object_id id;
diff --git a/lib/deflate.c b/lib/deflate.c
index bb2a535..dc7337a 100644
--- a/lib/deflate.c
+++ b/lib/deflate.c
@@ -26,8 +26,8 @@
 
 #include "got_error.h"
 #include "got_object.h"
+#include "got_path.h"
 
-#include "got_lib_path.h"
 #include "got_lib_deflate.h"
 
 #ifndef MIN
diff --git a/lib/delta.c b/lib/delta.c
index 730bb4f..c4bed18 100644
--- a/lib/delta.c
+++ b/lib/delta.c
@@ -28,9 +28,9 @@
 #include "got_error.h"
 #include "got_repository.h"
 #include "got_object.h"
+#include "got_path.h"
 
 #include "got_lib_delta.h"
-#include "got_lib_path.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
 
diff --git a/lib/diff.c b/lib/diff.c
index 8f10487..8563f78 100644
--- a/lib/diff.c
+++ b/lib/diff.c
@@ -29,9 +29,9 @@
 #include "got_error.h"
 #include "got_diff.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_diff.h"
-#include "got_lib_path.h"
 #include "got_lib_delta.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
diff --git a/lib/fileindex.c b/lib/fileindex.c
index 155c46e..a30b4cf 100644
--- a/lib/fileindex.c
+++ b/lib/fileindex.c
@@ -29,8 +29,8 @@
 
 #include "got_error.h"
 #include "got_object.h"
+#include "got_path.h"
 
-#include "got_lib_path.h"
 #include "got_lib_fileindex.h"
 #include "got_lib_worktree.h"
 
diff --git a/lib/got_lib_path.h b/lib/got_lib_path.h
deleted file mode 100644
index d796646..0000000
--- a/lib/got_lib_path.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2018, 2019 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 dealing with filesystem paths. */
-
-#define GOT_DEFAULT_FILE_MODE	(S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
-#define GOT_DEFAULT_DIR_MODE	(S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
-
-/* Determine whether a path is an absolute path. */
-int got_path_is_absolute(const char *);
-
-/*
- * Return an absolute version of a relative path.
- * The result is allocated with malloc(3).
- */
-char *got_path_get_absolute(const char *);
-
-/* 
- * Normalize a path for internal processing.
- * The result is allocated with malloc(3).
- */
-char *got_path_normalize(const char *);
-
-/*
- * Canonicalize absolute paths by removing redundant path separators
- * and resolving references to parent directories ("/../").
- * Relative paths are copied from input to buf as-is.
- */
-const struct got_error *got_canonpath(const char *, char *, size_t);
-
-/*
- * Get child part of two absolute paths. The second path must equal the first
- * path up to some path component, and must be longer than the first path.
- * The result is allocated with malloc(3).
- */
-const struct got_error *got_path_skip_common_ancestor(char **, const char *,
-    const char *);
-
-/* Determine whether a path points to the root directory "/" . */
-int got_path_is_root_dir(const char *);
-
-/* Determine whether a path is a path-wise child of another path. */
-int got_path_is_child(const char *, const char *, size_t);
-
-/*
- * Like strcmp() but orders children in subdirectories directly after
- * their parents.
- */
-int got_path_cmp(const char *, const char *);
-
-/*
- * Path lists allow for predictable concurrent iteration over multiple lists
- * of paths obtained from disparate sources which don't all provide the same
- * ordering guarantees (e.g. git trees, file index, and on-disk directories).
- */
-struct got_pathlist_entry {
-	TAILQ_ENTRY(got_pathlist_entry) entry;
-	const char *path;
-	void *data; /* data pointer provided to got_pathlist_insert() */
-};
-TAILQ_HEAD(got_pathlist_head, got_pathlist_entry);
-
-/*
- * Insert a path into the list of paths in a predictable order.
- * The caller should already have initialized the list head. This list stores
- * the pointer to the path as-is, i.e. the path is not copied internally and
- * must remain available until the list is freed with got_pathlist_free().
- * If the first argument is not NULL, set it to a pointer to the newly inserted
- * element, or to a NULL pointer in case the path was already on the list.
- */
-const struct got_error *got_pathlist_insert(struct got_pathlist_entry **,
-    struct got_pathlist_head *, const char *, void *);
-
-/* Free resources allocated for a path list. */
-void got_pathlist_free(struct got_pathlist_head *);
-
-/* Attempt to create a directory at a given path. */
-const struct got_error *got_path_mkdir(const char *);
-
-/* dirname(3) with error handling and dynamically allocated result. */
-const struct got_error *got_path_dirname(char **, const char *);
diff --git a/lib/inflate.c b/lib/inflate.c
index d5a41ac..bd40396 100644
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -26,8 +26,8 @@
 
 #include "got_error.h"
 #include "got_object.h"
+#include "got_path.h"
 
-#include "got_lib_path.h"
 #include "got_lib_inflate.h"
 
 #ifndef MIN
diff --git a/lib/lockfile.c b/lib/lockfile.c
index dc493f7..0426e42 100644
--- a/lib/lockfile.c
+++ b/lib/lockfile.c
@@ -26,9 +26,9 @@
 #include <time.h>
 
 #include "got_error.h"
+#include "got_path.h"
 
 #include "got_lib_lockfile.h"
-#include "got_lib_path.h"
 
 const struct got_error *
 got_lockfile_lock(struct got_lockfile **lf, const char *path)
diff --git a/lib/object.c b/lib/object.c
index a2abc10..8356628 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -39,10 +39,10 @@
 #include "got_object.h"
 #include "got_repository.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_sha1.h"
 #include "got_lib_delta.h"
-#include "got_lib_path.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
 #include "got_lib_privsep.h"
diff --git a/lib/object_create.c b/lib/object_create.c
index 6e0d389..a3dbc82 100644
--- a/lib/object_create.c
+++ b/lib/object_create.c
@@ -32,13 +32,13 @@
 #include "got_object.h"
 #include "got_repository.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_sha1.h"
 #include "got_lib_deflate.h"
 #include "got_lib_delta.h"
 #include "got_lib_object.h"
 #include "got_lib_lockfile.h"
-#include "got_lib_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/lib/object_parse.c b/lib/object_parse.c
index 2f081c6..8840c62 100644
--- a/lib/object_parse.c
+++ b/lib/object_parse.c
@@ -39,6 +39,7 @@
 #include "got_object.h"
 #include "got_repository.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_sha1.h"
 #include "got_lib_delta.h"
@@ -48,7 +49,6 @@
 #include "got_lib_pack.h"
 #include "got_lib_privsep.h"
 #include "got_lib_repository.h"
-#include "got_lib_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/lib/pack.c b/lib/pack.c
index 5de6375..11d1e50 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -35,9 +35,9 @@
 #include "got_error.h"
 #include "got_object.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_sha1.h"
-#include "got_lib_path.h"
 #include "got_lib_delta.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
diff --git a/lib/path.c b/lib/path.c
index d122320..253851f 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -27,8 +27,7 @@
 #include <string.h>
 
 #include "got_error.h"
-
-#include "got_lib_path.h"
+#include "got_path.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
diff --git a/lib/reference.c b/lib/reference.c
index 168ef0c..a33e604 100644
--- a/lib/reference.c
+++ b/lib/reference.c
@@ -35,9 +35,9 @@
 #include "got_repository.h"
 #include "got_reference.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_sha1.h"
-#include "got_lib_path.h"
 #include "got_lib_delta.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
diff --git a/lib/repository.c b/lib/repository.c
index ad65519..97763cc 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -40,8 +40,8 @@
 #include "got_repository.h"
 #include "got_worktree.h"
 #include "got_object.h"
+#include "got_path.h"
 
-#include "got_lib_path.h"
 #include "got_lib_delta.h"
 #include "got_lib_inflate.h"
 #include "got_lib_object.h"
diff --git a/lib/worktree.c b/lib/worktree.c
index 343a0f8..14285e5 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -40,9 +40,9 @@
 #include "got_object.h"
 #include "got_worktree.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_worktree.h"
-#include "got_lib_path.h"
 #include "got_lib_sha1.h"
 #include "got_lib_fileindex.h"
 #include "got_lib_inflate.h"
diff --git a/regress/delta/delta_test.c b/regress/delta/delta_test.c
index 490fa9c..4a49027 100644
--- a/regress/delta/delta_test.c
+++ b/regress/delta/delta_test.c
@@ -24,9 +24,9 @@
 
 #include "got_error.h"
 #include "got_opentemp.h"
+#include "got_path.h"
 
 #include "got_lib_delta.h"
-#include "got_lib_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/regress/path/path_test.c b/regress/path/path_test.c
index 4514dde..951b0e5 100644
--- a/regress/path/path_test.c
+++ b/regress/path/path_test.c
@@ -24,8 +24,7 @@
 #include <err.h>
 
 #include "got_error.h"
-
-#include "got_lib_path.h"
+#include "got_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/regress/repository/repository_test.c b/regress/repository/repository_test.c
index db57150..8eb2dae 100644
--- a/regress/repository/repository_test.c
+++ b/regress/repository/repository_test.c
@@ -33,8 +33,8 @@
 #include "got_diff.h"
 #include "got_opentemp.h"
 #include "got_privsep.h"
+#include "got_path.h"
 
-#include "got_lib_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index 1755d39..473f50c 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -37,9 +37,9 @@
 #include "got_worktree.h"
 #include "got_opentemp.h"
 #include "got_privsep.h"
+#include "got_path.h"
 
 #include "got_lib_worktree.h"
-#include "got_lib_path.h"
 
 #define GOT_REPO_PATH "../../../"