Not everywhere has strnlen

rogerbinns · Apr 29, 2016 · 800384f · 800384f
1 parent 5f12a9e
commit 800384f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/util.c b/src/util.c
@@ -340,3 +340,15 @@ static char *apsw_strdup(const char *source)
     strcpy(res, source);
   return res;
 }
+
+/* It is 2016 - why do I have to write this? */
+static size_t apsw_strnlen(const char *s, size_t maxlen)
+{
+    size_t res=0;
+    while(*s && res<maxlen)
+      {
+        s++;
+        res++;
+      }
+    return res;
+}
diff --git a/src/vfs.c b/src/vfs.c
@@ -1254,7 +1254,7 @@ apswvfspy_xGetLastError(APSWVFS *self)
   memset(PyBytes_AS_STRING(text), 0, size);
 
   errval=self->basevfs->xGetLastError(self->basevfs, size, PyBytes_AS_STRING(text));
-  msglen=strnlen(PyBytes_AS_STRING(text), size);
+  msglen=apsw_strnlen(PyBytes_AS_STRING(text), size);
   if(msglen>0)
     _PyBytes_Resize(&text, msglen);
   else