ensure absolute paths in config-less mode

2 files changed, 25 insertions, 3 deletions

diff --git a/gmid.c b/gmid.c
index d3ff036..4fbcbbb 100644
--- a/gmid.c
+++ b/gmid.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <limits.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <signal.h>
@@ -544,11 +545,14 @@ main(int argc, char **argv)
 		hosts[0].locations[0].match = "*";
 
                 switch (argc) {
-		case 0:
-			hosts[0].dir = ".";
+		case 0: {
+			char path[PATH_MAX];
+
+			hosts[0].dir = getcwd(path, sizeof(path));
 			break;
+		}
 		case 1:
-			hosts[0].dir = argv[0];
+			hosts[0].dir = absolutify_path(argv[0]);
 			break;
 		default:
 			usage(getprogname());
diff --git a/utils.c b/utils.c
index a87c927..c32ecb8 100644
--- a/utils.c
+++ b/utils.c
@@ -62,3 +62,21 @@ filesize(int fd)
 		return -1;
 	return len;
 }
+
+char *
+absolutify_path(const char *path)
+{
+	char *wd, *r;
+
+	if (*path == '/') {
+		if ((r = strdup(path)) == NULL)
+			err(1, "strdup");
+		return r;
+	}
+
+	wd = getcwd(NULL, 0);
+	if (asprintf(&r, "%s/%s", wd, path) == -1)
+		err(1, "asprintf");
+	free(wd);
+	return r;
+}