Changeset 171 for trunk/src/sh_string.c

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

• trunk/src/sh_string.c (modified) (16 diffs)

trunk/src/sh_string.c

@@ -4 +4 @@
 #include <string.h>
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "sh_string.h"
@@ -40 +41 @@
       /* skip leading WS 
        */
-      for (s=e; *s && isspace(*s); ++s) /* nothing */;
+      for (s=e; *s && isspace((int)*s); ++s) /* nothing */;
 
       if (*s) 
@@ -65 +66 @@
           if (a != line)
             {
-              /* chop off trailing WS 
-               */
-              for (a--; isspace(*a) && a > s; a--) /* do nothing */;
-              
-              /* terminate string
-               */
-              ++a; *a = '\0';
-            }
+              if (i < (maxfields -1))
+                {
+
+                  /* chop off trailing WS 
+                   */
+                  for (a--; isspace((int)*a) && a > s; a--) /* do nothing */;
+                  
+                  /* terminate string
+                   */
+                  ++a; *a = '\0';
+                }
+              else
+                {
+                  /* If nfields < actual fields, last string 
+                   * will be remainder, therefore skip to end.
+                   */
+                  if ( *a )
+                    {
+                      do {
+                        a++;
+                      } while ( *a );
+                    }
+                }
+            }
           else
             {
@@ -127 +144 @@
       /* skip leading WS 
        */
-      if ( *s && isspace(*s) )
+      if ( *s && isspace((int)*s) )
         {
           do {
             ++s;
-          } while ( *s && isspace(*s) );
+          } while ( *s && isspace((int)*s) );
         }
 
@@ -142 +159 @@
           do {
             a++;
-          } while ( *a && (!isspace(*a)) );
+          } while ( *a && (!isspace((int)*a)) );
 
           /* next token, *a is either ws or '\0' 
@@ -152 +169 @@
           if (i < (maxfields-1))
             {
-              *a = '\0'; 
+              *a = '\0';
             }
           else
@@ -275 +292 @@
     }
   memcpy(s->str, str, (len+1));
+  s->len = len;
   return s;
 }
@@ -397 +415 @@
   sh_string * r = NULL;
   char * p;
+  long   tlen;
   size_t len;
   int    end    = 0;
@@ -403 +422 @@
   size_t newlen = 0;
   long   diff;
-  int    i;
+  int    i, curr, last;
 
 
@@ -443 +462 @@
     }
 
-  if (r && ovecnum > 0)
+
+  curr = -1;
+  last = -1;
+
+  for (i = 0; i < ovecnum; ++i)
+    {
+      if (ovector[2*i] >= 0)
+        {
+          curr = i;
+          break;
+        }
+    }
+  
+  if (r && ovecnum > 0 && ovector[curr] >= 0)
     {
       r->len = 0; r->str[0] = '\0'; p = r->str;
@@ -449 +481 @@
       /* First part, until start of first replacement 
        */
-      memcpy(p, s->str,      ovector[0]); p += ovector[0];
-      memcpy(p, replacement, rlen);       p += rlen;
-      *p = '\0'; r->len += (ovector[0] + rlen);
+      memcpy(p, s->str, (size_t)ovector[curr]); p += ovector[curr];
+      memcpy(p, replacement,    rlen);       p += rlen;
+      *p = '\0'; r->len += (ovector[curr] + rlen);
+
+      last = curr + 1;
 
       for (i = 1; i < ovecnum; ++i)
         {
+          if (ovector[2*i] < 0)
+            continue;
+
+          curr = 2*i;
+
           /* From end of last replacement to start of this */
-          len = ovector[2*i] - ovector[2*i -1];
-          memcpy(p, &(s->str[ovector[2*i -1]]), len);
-          p += len;
-
-          /* The replacement */
-          memcpy(p, replacement, rlen);       
-          p += rlen;
-
-          /* null terminate */
-          *p = '\0'; r->len += (len + rlen);
-        }
+          tlen = (long)(ovector[curr] - ovector[last]);
+          if (tlen >= 0)
+            {
+              len = (size_t) tlen;
+
+              if (tlen > 0)
+                {
+                  memcpy(p, &(s->str[ovector[last]]), (size_t)len);
+                  p += len;
+                }
+              
+              /* The replacement */
+              memcpy(p, replacement, rlen);       
+              p += rlen;
+              
+              /* null terminate */
+              *p = '\0'; r->len += (len + rlen);
+
+              last = curr + 1;
+            }
+        }
 
       /* Last part, after last replacement; includes terminating null 
        */
-      len = (s->len + 1) - ovector[2*i -1];
-      memcpy(p, &(s->str[ovector[2*i -1]]), len);
-      p += len; *p = '\0'; r->len += (len - 1);
-    }
+      if (last > 0)
+        {
+          /* If not, nothing has been replaced, and r is still a copy of s
+           */
+          tlen = (long)((s->len + 1) - ovector[last]);
+          if (tlen > 0)
+            {
+              len = (size_t)tlen;
+              memcpy(p, &(s->str[ovector[2*i -1]]), (size_t)len);
+              p += len; *p = '\0'; r->len += (len - 1);
+            }
+        }
+
+    }
+
   return r;
 }
@@ -785 +845 @@
   t = sh_string_replace(s, ovector, ovecnum, 
                         "___", 3);
+  CuAssertPtrNotNull(tc, t);
   CuAssertStrEquals(tc, "___c ___ ",   t->str);
   CuAssertIntEquals(tc, 9, (int)t->len);
@@ -792 +853 @@
   t = sh_string_replace(s, ovector, ovecnum, 
                         "___", 3);
+  CuAssertPtrNotNull(tc, t);
   CuAssertStrEquals(tc, "___c ___",   t->str);
   CuAssertIntEquals(tc, 8, (int)t->len);
@@ -806 +868 @@
                         "___", 3);
   
+  CuAssertPtrNotNull(tc, t);
   CuAssertStrEquals(tc, "______f ghi ",   t->str);
   CuAssertIntEquals(tc, 12, (int)t->len);
@@ -813 +876 @@
   t = sh_string_replace(s, ovector, ovecnum, 
                         "___", 3);
+  CuAssertPtrNotNull(tc, t);
   CuAssertStrEquals(tc, "abc ___ef ghi___",   t->str);
   CuAssertIntEquals(tc, 16, (int)t->len);
@@ -818 +882 @@
   t = sh_string_replace(s, ovector, 0, 
                         "___", 3);
+  CuAssertPtrNotNull(tc, t);
   CuAssertStrEquals(tc, s->str,   t->str);
   CuAssertIntEquals(tc, (int)s->len, (int)t->len);