Changeset 2856

Timestamp:

Feb 10, 2012 10:31:25 PM (16 months ago)

Author:

wmb

Message:

Client library - added strstr and strcasestr, and improved the implementation of some existing functions to generate better code.

File:

• clients/lib/strings.c (modified) (9 diffs)

clients/lib/strings.c

@@ -5 +5 @@
 #include "1275.h"
 
+#define ISUPPER(c) ((c) >= 'A' && (c) <= 'Z')
+#define TOLOWER(c) ((c) + 'a' - 'A')
+
 int
 strcmp(const char *s, const char *t)
 {
-        int i;
-
-        for (i = 0; s[i] == t[i]; ++i)
-                if (s[i] == '\0')
-                        return (0);
-        return((int) (s[i] - t[i]));
+        int diff = 0;
+        int i;
+
+        for (i = 0; 1; ++i) {
+                diff = s[i] - t[i];
+                if (diff || s[i] == '\0')
+                        break;
+        }
+        return(diff);
 }
 
@@ -19 +25 @@
 strncmp(const char *s, const char *t, int len)
 {
-        int i;
-
-        for (i = 0; (s[i] == t[i]) && (i != len); ++i)
-                if (s[i] == '\0')
-                        return (0);
-        if (i == len)
-                return(0);
-        return((int) (s[i] - t[i]));
+        int diff = 0;
+        int i;
+
+        for (i = 0; i != len; ++i) {
+                diff = s[i] - t[i];
+                if (diff || s[i] == '\0')
+                        break;
+        }
+
+        return(diff);
+}
+
+int
+strcasecmp(const char *s, const char *t)
+{
+        char sc, tc;
+        int diff = 0;
+        int i;
+
+        for (i = 0; 1; i++) {
+                sc = s[i];
+                tc = t[i];
+                if (ISUPPER(sc))
+                        sc = TOLOWER(sc);
+                if (ISUPPER(tc))
+                        tc = TOLOWER(tc);
+                diff = sc - tc;
+                if (diff || sc == '\0')
+                        break;
+        }
+        return diff;
+}
+
+int
+strncasecmp(const char *s, const char *t, int len)
+{
+        char sc, tc;
+        int diff = 0;
+        int i;
+
+        for (i=0; i < len; i++) {
+                sc = s[i];
+                if (ISUPPER(sc))
+                        sc = TOLOWER(sc);
+                tc = t[i];
+                if (ISUPPER(tc))
+                        tc = TOLOWER(tc);
+                diff = sc - tc;
+                if (diff || sc == '\0')
+                        break;
+        }
+        return diff;
 }
 
@@ -36 +86 @@
         for (i = 0; s[i] != '\0'; ++i)
                 ;
-        return((int) i);
+        return i;
 }
 
@@ -46 +96 @@
         for (i = 0; i < maxlen && s[i] != '\0'; ++i)
                 ;
-        return((int) i);
+        return i;
 }
 
@@ -56 +106 @@
         while (to[i] = from[i])
                 i += 1;
-        return(to);
+        return to;
 }
 
@@ -69 +119 @@
            maxlen--;
         }
-        return(to);
+        return to;
 }
 
@@ -80 +130 @@
                 to += 1;
         strcpy(to, from);
-        return (ret);
+        return ret;
 }
 
@@ -88 +138 @@
         while (*s) {
                 if (*s == c)
-                        return (s);
+                        return s;
                 ++s;
         }
-        return ((char *) 0);
+        return (char *) 0;
 }
 
@@ -112 +162 @@
         temp = saved_str;
         saved_str = s;
-        return(temp);
+        return temp;
+}
+
+char *
+strstr(const char *haystack, const char *needle)
+{
+        int len = strlen(needle);
+        char *s;
+
+        for (s = (char *)haystack; *s; s++)
+                if (strncmp(s, needle, len) == 0)
+                        return s;
+
+        return NULL;
+}
+
+char *
+strcasestr(const char *haystack, const char *needle)
+{
+        int len = strlen(needle);
+        char *s;
+
+        for (s = (char *)haystack; *s; s++)
+                if (strncasecmp(s, needle, len) == 0)
+                        return s;
+
+        return NULL;
 }