Added cpytrim() function. Unlike trimcpy(), it does not modify

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index a279a327d16f70cf6b60e3500419d77362c4af97..87fedd584946bad98974f1b0cbdeecc204421b90 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -94,7 +94,7 @@ pwd(void)
  *       -- malloc'ed memory.  Then free "s1".
  */
 char *
  *       -- 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;
 {
     char *cp;
     size_t len1 = 0, len2 = 0;


@@ -127,7 +127,7 @@ add (char *s2, char *s1)
  *     Append an item to a comma separated list
  */
 char *
  *     Append an item to a comma separated list
  */
 char *

-addlist (char *list, char *item)
+addlist (char *list, const char *item)

 {
     if (list)
        list = add (", ", list);
 {
     if (list)
        list = add (", ", list);


@@ -139,7 +139,7 @@ addlist (char *list, char *item)
  * folder_exists
  *      Check to see if a folder exists.
  */
  * 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;
 {
     struct stat st;
     int exists = 0;


@@ -241,3 +241,41 @@ open_form(char **form, char *def)
        }
        return in;
 }
        }
        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;
+}