rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make -d handle correctly non-absolute paths 

before the -d option only accepted absolute paths, and this wasn't
documented.  Even more, with the default value of "docs" it won't
work.  Now it transforms all relative paths to absolute paths before
going on.
This commit is contained in:
Omar Polo 2020-12-21 14:38:31 +01:00
parent dd3e110a70
commit 231bfcdc03
No known key found for this signature in database
GPG Key ID: 35F98C96A1786F0D
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gmid.c
View File

@ -25,6 +25,7 @@
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <poll.h>
#include <signal.h>
#include <stdio.h>
@ -992,6 +993,21 @@ loop(struct tls *ctx, int sock)
}
}
char *
absolutify_path(const char *path)
{
char *wd, *r;
if (*path == '/')
return strdup(path);
wd = getwd(NULL);
if (asprintf(&r, "%s/%s", wd, path) == -1)
err(1, "asprintf");
free(wd);
return r;
}
void
usage(const char *me)
{
@ -1019,7 +1035,7 @@ main(int argc, char **argv)
connected_clients = 0;
dir = "docs/";
dir = absolutify_path("docs");
cgi = NULL;
port = 1965;
foreground = 0;
@ -1031,7 +1047,9 @@ main(int argc, char **argv)
break;
case 'd':
dir = optarg;
free((char*)dir);
if ((dir = absolutify_path(optarg)) == NULL)
err(1, "absolutify_path");
break;
case 'f':