X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7edb0cbc236244d996d1e2ae1d58d0e9f7d98062..2878a6afb068ee13945aec07cc73a2202e97a86a:/sbr/utils.c?ds=sidebyside diff --git a/sbr/utils.c b/sbr/utils.c index 87d368dd..4405f4c9 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. @@ -11,9 +9,14 @@ #include #include -#include #include -#include + +/* sbr/signals.c */ +extern int setup_signal_handlers(); + +/* sbr/m_mktemp.c */ +extern void remove_registered_files_atexit(); + /* * We allocate space for messages (msgs array) @@ -47,6 +50,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"); @@ -92,7 +99,7 @@ pwd(void) * -- malloc'ed memory. Then free "s1". */ char * -add (char *s2, char *s1) +add (const char *s2, char *s1) { char *cp; size_t len1 = 0, len2 = 0; @@ -120,11 +127,24 @@ add (char *s2, char *s1) return cp; } +/* + * addlist + * Append an item to a comma separated list + */ +char * +addlist (char *list, const 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) +int folder_exists(const char *folder) { struct stat st; int exists = 0; @@ -148,7 +168,7 @@ int folder_exists(char *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; @@ -198,17 +218,35 @@ num_digits (int n) /* * Append a message arg to an array of them, resizing it if necessary. - * The function is written to suit the arg parsing code it was extracted - * from, and will probably be changed when the other code is cleaned up. + * Really a simple vector-of-(char *) maintenance routine. */ void app_msgarg(struct msgs_array *msgs, char *cp) { - if(msgs->size >= msgs->max) - msgs->msgs = mh_xrealloc(msgs->msgs, (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs)); + if(msgs->size >= msgs->max) { + msgs->max += MAXMSGS; + msgs->msgs = mh_xrealloc(msgs->msgs, + msgs->max * sizeof(*msgs->msgs)); + } msgs->msgs[msgs->size++] = cp; } +/* + * Append a message number to an array of them, resizing it if necessary. + * Like app_msgarg, but with a vector-of-ints instead. + */ + +void +app_msgnum(struct msgnum_array *msgs, int msgnum) +{ + if (msgs->size >= msgs->max) { + msgs->max += MAXMSGS; + msgs->msgnums = mh_xrealloc(msgs->msgnums, + msgs->max * sizeof(*msgs->msgnums)); + } + msgs->msgnums[msgs->size++] = msgnum; +} + /* Open a form or components file */ int open_form(char **form, char *def) @@ -224,3 +262,127 @@ open_form(char **form, char *def) } return in; } + + +/* + * Finds first occurrence of str in buf. buf is not a C string but a + * byte array of length buflen. str is a null-terminated C string. + * find_str() does not modify buf but passes back a non-const char * + * pointer so that the caller can modify it. + */ +char * +find_str (const char buf[], size_t buflen, const char *str) { + const size_t len = strlen (str); + size_t i; + + for (i = 0; i + len <= buflen; ++i, ++buf) { + if (! memcmp (buf, str, len)) return (char *) buf; + } + + return NULL; +} + + +/* + * Finds last occurrence of str in buf. buf is not a C string but a + * byte array of length buflen. str is a null-terminated C string. + * find_str() does not modify buf but passes back a non-const char * + * pointer so that the caller can modify it. + */ +char * +rfind_str (const char buf[], size_t buflen, const char *str) { + const size_t len = strlen (str); + size_t i; + + for (i = 0, buf += buflen - len; i + len <= buflen; ++i, --buf) { + if (! memcmp (buf, str, len)) return (char *) buf; + } + + return NULL; +} + + +/* POSIX doesn't have strcasestr() so emulate it. */ +char * +nmh_strcasestr (const char *s1, const char *s2) { + const size_t len = strlen (s2); + + if (isupper ((unsigned char) s2[0]) || islower ((unsigned char)s2[0])) { + char first[3]; + first[0] = (char) toupper ((unsigned char) s2[0]); + first[1] = (char) tolower ((unsigned char) s2[0]); + first[2] = '\0'; + + for (s1 = strpbrk (s1, first); s1; s1 = strpbrk (++s1, first)) { + if (! strncasecmp (s1, s2, len)) return (char *) s1; + } + } else { + for (s1 = strchr (s1, s2[0]); s1; s1 = strchr (++s1, s2[0])) { + if (! strncasecmp (s1, s2, len)) return (char *) s1; + } + } + + return NULL; +} + + +int +nmh_init(const char *argv0, int read_context) { + setlocale(LC_ALL, ""); + + invo_name = r1bindex ((char *) argv0, '/'); + + if (setup_signal_handlers()) { + admonish("sigaction", "unable to set up signal handlers"); + } + + /* POSIX atexit() does not define any error conditions. */ + if (atexit(remove_registered_files_atexit)) { + admonish("atexit", "unable to register atexit function"); + } + + if (read_context) { + context_read(); + return OK; + } else { + int status = context_foil(NULL); + if (status != OK) { + advise("", "failed to create minimal profile/conext"); + } + return status; + } +} + + +/* Returns copy of argument str with all characters converted to upper + case, and trimmed whitespace (see cpytrim()) . */ +char * +upcase (const char *str) { + char *up = cpytrim (str); + char *cp; + + for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); } + + return up; +} + + +/* + * Scan for any 8-bit characters. Return 1 if they exist. + * + * Scan up until the given endpoint (but not the actual endpoint itself). + * If the endpoint is NULL, scan until a '\0' is reached. + */ + +int +contains8bit(const char *start, const char *end) +{ + if (! start) + return 0; + + while (*start != '\0' && (!end || (start < end))) + if (! isascii((unsigned char) *start++)) + return 1; + + return 0; +}