xfnw/stagit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix dirname for glibc

Browse source
This commit is contained in:
Hiltjo Posthuma 2015-12-26 12:56:23 +01:00
parent 1778cba979
commit 9c7e2c5678
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
urmoms.c
View file

@ -140,6 +140,27 @@ xmlencode(FILE *fp, const char *s, size_t len)
}
}
/* Some implementations of dirname(3) return a pointer to a static
* internal buffer (OpenBSD). Others modify the contents of `path` (POSIX).
* This is a wrapper function that is compatible with both versions.
* The program will error out if dirname(3) failed, this can only happen
* with the OpenBSD version. */
char *
xdirname(const char *path)
{
char *p, *b;
if (!(p = strdup(path)))
err(1, "strdup");
if (!(b = dirname(p)))
err(1, "basename");
if (!(b = strdup(b)))
err(1, "strdup");
free(p);
return b;
}
/* Some implementations of basename(3) return a pointer to a static
* internal buffer (OpenBSD). Others modify the contents of `path` (POSIX).
* This is a wrapper function that is compatible with both versions.
@ -571,12 +592,16 @@ writeblob(git_object *obj, const char *filename, git_off_t filesize)
{
char fpath[PATH_MAX];
char tmp[PATH_MAX] = "";
char *p;
char *d, *p;
FILE *fp;
snprintf(fpath, sizeof(fpath), "file/%s.html", filename);
if (mkdirp(dirname(fpath)))
d = xdirname(fpath);
if (mkdirp(d)) {
free(d);
return 1;
}
free(d);
p = fpath;
while (*p) {