Fix bug with strsep(&string, ""). Optimize case of 1 delimiter.

1 files changed, 16 insertions, 9 deletions

diff --git a/lib/strsep.c b/lib/strsep.c
index 1a86852b8d..9f2fdd2b57 100644
--- a/lib/strsep.c
+++ b/lib/strsep.c
@@ -29,19 +29,26 @@ strsep (char **stringp, const char *delim)
   char *start = *stringp;
   char *ptr;
 
-  if (!start)
+  if (start == NULL)
     return NULL;
 
-  if (!*delim)
-    ptr = start + strlen (start);
+  /* Optimize the case of no delimiters.  */
+  if (delim[0] == '\0')
+    {
+      *stringp = NULL;
+      return start;
+    }
+
+  /* Optimize the case of one delimiter.  */
+  if (delim[1] == '\0')
+    ptr = strchr (start, delim[0]);
   else
+    /* The general case.  */
+    ptr = strpbrk (start, delim);
+  if (ptr == NULL)
     {
-      ptr = strpbrk (start, delim);
-      if (!ptr)
-	{
-	  *stringp = NULL;
-	  return start;
-	}
+      *stringp = NULL;
+      return start;
     }
 
   *ptr = '\0';