[MPlayer-dev-eng] [PATCH] SAMI subtitle files (subreader.c)

[Bruno Lecointre]

Hi,
I apologize for the first patch, I just noticed a slight bug in the
implementation of stristr. Pretend you didn't see the first patch, I am
ashamed ;)
Here is a correct implementation with a slight improvment..

Bruno
-------------- next part --------------
--- subreader.c	2003-08-23 18:46:34.000000000 -0700
+++ subreader.c.new	2003-08-23 22:02:33.000000000 -0700
@@ -74,6 +74,20 @@
 	while (i > 0 && isspace(s[i])) s[i--] = '\0';
 }
 
+static char *stristr(const char *haystack, const char *needle) {
+    int len = 0;
+    const char *p = haystack;
+
+    if (!(haystack && needle)) return NULL;
+
+    len=strlen(needle);
+    while (*p != '\0' && *(p+len) != '\0') {
+	if (strncasecmp(p, needle, len) == 0) return (char*)p;
+	p++;
+    }
+
+    return NULL;
+}
 
 subtitle *sub_read_line_sami(FILE *fd, subtitle *current) {
     static char line[LINE_LEN+1];
@@ -92,11 +106,11 @@
 	switch (state) {
 
 	case 0: /* find "START=" or "Slacktime:" */
-	    slacktime_s = strstr (s, "Slacktime:");
+	    slacktime_s = stristr (s, "Slacktime:");
 	    if (slacktime_s) 
                 sub_slacktime = strtol (slacktime_s+10, NULL, 0) / 10;
 
-	    s = strstr (s, "Start=");
+	    s = stristr (s, "Start=");
 	    if (s) {
 		current->start = strtol (s + 6, &s, 0) / 10;
 		state = 1; continue;
@@ -104,7 +118,7 @@
 	    break;
  
 	case 1: /* find "<P" */
-	    if ((s = strstr (s, "<P"))) { s += 2; state = 2; continue; }
+	    if ((s = stristr (s, "<P"))) { s += 2; state = 2; continue; }
 	    break;
  
 	case 2: /* find ">" */
@@ -131,7 +145,7 @@
 	    continue;
 
 	case 4: /* get current->end or skip <TAG> */
-	    q = strstr (s, "Start=");
+	    q = stristr (s, "Start=");
 	    if (q) {
 		current->end = strtol (q + 6, &q, 0) / 10 - 1;
 		*p = '\0'; trail_space (text);