From ed0ca64e75c2c03e99cf08ab29fb6cfcb3c2f57e Mon Sep 17 00:00:00 2001 From: Ben LeMasurier Date: Fri, 27 Jan 2012 16:13:59 -0700 Subject: [PATCH] use glib for strndup (osx < lion missing strndup) --- src/curl.c | 4 ++-- src/stormfs.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/curl.c b/src/curl.c index ffd6cd3..56d9415 100644 --- a/src/curl.c +++ b/src/curl.c @@ -449,7 +449,7 @@ get_upload_id(char *xml) start_p = strstr(xml, start_marker) + strlen(start_marker); end_p = strstr(xml, end_marker); - return strndup(start_p, end_p - start_p); + return g_strndup(start_p, end_p - start_p); } static char * @@ -463,7 +463,7 @@ get_etag_from_xml(char *xml) start_p = strstr(xml, start_marker) + strlen(start_marker); end_p = strstr(xml, end_marker); - tmp = strndup(start_p, end_p - start_p); + tmp = g_strndup(start_p, end_p - start_p); if(asprintf(&etag, "\"%s\"", tmp) == -1) { fprintf(stderr, "unable to allocate memory\n"); exit(EXIT_FAILURE); diff --git a/src/stormfs.c b/src/stormfs.c index 020154b..bc6afa0 100644 --- a/src/stormfs.c +++ b/src/stormfs.c @@ -389,7 +389,7 @@ cache_invalidate_dir(const char *path) if(s == path) g_hash_table_remove(cache.files, "/"); else { - char *parent = strndup(path, s - path); + char *parent = g_strndup(path, s - path); cache_invalidate(parent); free(parent); } @@ -1125,7 +1125,7 @@ xml_to_files(const char *path, char *xml) char *fullpath; char *end_p = strstr(start_p, ""); - name = strndup(start_p, end_p - start_p); + name = g_strndup(start_p, end_p - start_p); fullpath = get_path(path, name); files = add_file_to_list(files, fullpath, NULL); free(name); @@ -1363,7 +1363,7 @@ stormfs_rename_directory(const char *from, const char *to) char *end_p = strstr(start_p, ""); struct stat st; - tmp = strndup(start_p, end_p - start_p); + tmp = g_strndup(start_p, end_p - start_p); name = basename(tmp); file_from = get_path(from, name); file_to = get_path(to, name);