X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=cce73785d73cc6be1df381e635aa3830f912648c;hb=cbaaccc109298129f33411909d68e772d138bb1b;hp=64df443b22455688012af8890d7190d104783515;hpb=b439ec143c4d2e2daf4b0a9c332123f24500cd9a;p=mmh diff --git a/sbr/utils.c b/sbr/utils.c index 64df443..cce7378 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -2,8 +2,6 @@ /* * utils.c -- various utility routines * - * $Id$ - * * This code is Copyright (c) 2006, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. @@ -47,6 +45,10 @@ mh_xrealloc(void *ptr, size_t size) { void *memory; + /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */ + if (!ptr) + return mh_xmalloc(size); + if (size == 0) adios(NULL, "Tried to realloc 0bytes"); @@ -121,11 +123,47 @@ add (char *s2, char *s1) } /* + * addlist + * Append an item to a comma separated list + */ +char * +addlist (char *list, char *item) +{ + if (list) + list = add (", ", list); + + return add (item, list); +} + +/* + * folder_exists + * Check to see if a folder exists. + */ +int folder_exists(char *folder) +{ + struct stat st; + int exists = 0; + + if (stat (folder, &st) == -1) { + /* The folder either doesn't exist, or we hit an error. Either way + * return a failure. + */ + exists = 0; + } else { + /* We can see a folder with the right name */ + exists = 1; + } + + return exists; +} + + +/* * create_folder * Check to see if a folder exists, if not, prompt the user to create * it. */ -void create_folder(char *folder, int autocreate, void (*done_callback)()) +void create_folder(char *folder, int autocreate, void (*done_callback)(int)) { struct stat st; extern int errno;