archive/archived
Archived
1
0
Fork 0
Code Activity

common/path.c: ~ expand in normalize

Browse source
This commit is contained in:
H Hautakoski 2010-09-18 21:05:23 +02:00 • committed by Henrik Hautakoski
parent 8b0772d0f1
commit 4ca920dc01
2 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/common/path.c
View file

@ -13,11 +13,14 @@
*/
#include <string.h>
#include <stdlib.h>
#include "debug.h"
#include "strbuf.h"
#include "path.h"
static char path_null = '\0';
/*
* allocates and initilizes a path
*/
@ -118,17 +121,33 @@ size_t pathlen(const char *path) {
return size;
}
static char* expand_home() {
char *home = getenv("HOME");
if (!home)
home = &path_null;
return home;
}
char* path_normalize(const char *base, const char *name, unsigned char dir) {
strbuf_t sb = STRBUF_INIT;
if (base == NULL || !is_abspath(base) || has_delim(name))
if (base == NULL || has_delim(name))
return NULL;
strbuf_append_str(&sb, base);
if (*base == '~') {
base++;
strbuf_append_str(&sb, expand_home());
strbuf_term(&sb, '/');
}
if (sb.buf[sb.len] != '/')
strbuf_append_ch(&sb, '/');
strbuf_append_str(&sb, base);
strbuf_term(&sb, '/');
if (!is_abspath(sb.buf))
goto cleanup;
if (name) {
strbuf_append_str(&sb, name);
@ -140,4 +159,7 @@ char* path_normalize(const char *base, const char *name, unsigned char dir) {
strbuf_squeeze(&sb, '/');
return strbuf_release(&sb);
cleanup:
strbuf_free(&sb);
return NULL;
}