X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=297ad45c2ac5b3fcfa9367860805e362e1f028ac;hb=dfecfa4b4b77983ddf8253b1b8effaf5c1a0ce80;hp=1cd3dc93f6a1879a3ed9ca7b5b66b51d51c6154e;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh diff --git a/sbr/utils.c b/sbr/utils.c index 1cd3dc9..297ad45 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -45,11 +45,12 @@ mh_xrealloc(void *ptr, size_t size) void *memory; /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */ - if (!ptr) + if (!ptr) { return mh_xmalloc(size); + } if (size == 0) - adios(NULL, "Tried to realloc 0bytes"); + adios(NULL, "Tried to realloc 0 bytes"); memory = realloc(ptr, size); if (!memory) @@ -124,30 +125,6 @@ add(char *s2, char *s1) return cp; } -/* -** 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 @@ -215,19 +192,3 @@ app_msgarg(struct msgs_array *msgs, char *cp) (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs)); msgs->msgs[msgs->size++] = cp; } - -/* Open a form or components file */ -int -open_form(char **form, char *def) -{ - int in; - if (*form) { - if ((in = open(etcpath(*form), O_RDONLY)) == NOTOK) - adios(*form, "unable to open form file"); - } else { - if ((in = open(etcpath(def), O_RDONLY)) == NOTOK) - adios(def, "unable to open default components file"); - *form = def; - } - return in; -}