From 2719471cb97c721e929c98c6bad40a381269295e Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Thu, 2 Jan 2014 21:27:40 -0500 Subject: Files can now be queued for commit --- util.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 1c663ae..cd4b838 100644 --- a/util.c +++ b/util.c @@ -13,22 +13,19 @@ char *alloc_and_combine_paths(char *p1, char *p2) { int l1, l2; -char *ret, *two; +char *ret; if(p1 == NULL || p2 == NULL) return NULL; l1 = strlen(p1); l2 = strlen(p2); - ret = (char *)malloc((l1+l2+2)*sizeof(char)); + ret = (char *)malloc((l1+l2+strlen(DIR_SEP))*sizeof(char)); if(ret == NULL) return ret; ret[0] = '\0'; strcat(ret, p1); - two = ret + l1; - two[0] = DIR_SEP; - two[1] = '\0'; - two = NULL; + strcat(ret, DIR_SEP); strcat(ret, p2); return ret; -} \ No newline at end of file +} -- cgit v1.2.3