[or-cvs] r17187: {tor} Add a new memcmpstart to use instead of strcmpstart when the (tor/trunk/src/common)

[nickm at seul.org]

Author: nickm
Date: 2008-11-03 11:35:48 -0500 (Mon, 03 Nov 2008)
New Revision: 17187

Modified:
   tor/trunk/src/common/util.c
   tor/trunk/src/common/util.h
Log:
Add a new memcmpstart to use instead of strcmpstart when the thing we are comparing is not nul-terminated.

Modified: tor/trunk/src/common/util.c
===================================================================
--- tor/trunk/src/common/util.c	2008-11-03 15:46:05 UTC (rev 17186)
+++ tor/trunk/src/common/util.c	2008-11-03 16:35:48 UTC (rev 17187)
@@ -484,6 +484,22 @@
     return strncasecmp(s1+(n1-n2), s2, n2);
 }
 
+/** Compare the value of the string <b>prefix</b> with the start of the
+ * <b>memlen</b>-byte memory chunk at <b>mem</b>.  Return as for strcmp.
+ *
+ * [As memcmp(mem, prefix, strlen(prefix)) but returns -1 if memlen is less
+ * than strlen(prefix).]
+ */
+int
+memcmpstart(const void *mem, size_t memlen,
+                const char *prefix)
+{
+  size_t plen = strlen(prefix);
+  if (memlen < plen)
+    return -1;
+  return memcmp(mem, prefix, plen);
+}
+
 /** Return a pointer to the first char of s that is not whitespace and
  * not a comment, or to the terminating NUL if no such character exists.
  */

Modified: tor/trunk/src/common/util.h
===================================================================
--- tor/trunk/src/common/util.h	2008-11-03 15:46:05 UTC (rev 17186)
+++ tor/trunk/src/common/util.h	2008-11-03 16:35:48 UTC (rev 17187)
@@ -181,6 +181,9 @@
 int strcmpend(const char *s1, const char *s2) ATTR_PURE ATTR_NONNULL((1,2));
 int strcasecmpend(const char *s1, const char *s2)
   ATTR_PURE ATTR_NONNULL((1,2));
+int memcmpstart(const void *mem, size_t memlen,
+                const char *prefix) ATTR_PURE;
+
 void tor_strstrip(char *s, const char *strip) ATTR_NONNULL((1,2));
 long tor_parse_long(const char *s, int base, long min,
                     long max, int *ok, char **next);