Changeset 0290b2a

Timestamp:

Feb 4, 2011, 3:49:44 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

c6b1782

Parents:

df3a1f4

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 23:31:49)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Use GString instead of allocating a giant buffer in owl_parseline

File:

• util.c (modified) (5 diffs)

util.c

@@ -112 +112 @@
   GPtrArray *argv;
   int i, len, between=1;
-  char *curarg;
+  GString *curarg;
   char quote;
 
   argv = g_ptr_array_new_with_free_func(owl_free);
   len=strlen(line);
-  curarg=owl_malloc(len+10);
-  strcpy(curarg, "");
+  curarg = g_string_new("");
   quote='\0';
   *argc=0;
@@ -148 +147 @@
 
       /* if another type of quote is open then treat this as a literal */
-      curarg[strlen(curarg)+1]='\0';
-      curarg[strlen(curarg)]=line[i];
+      g_string_append_c(curarg, line[i]);
       continue;
     }
@@ -155 +153 @@
     /* if it's not a space or end of command, then use it */
     if (line[i]!=' ' && line[i]!='\t' && line[i]!='\n' && line[i]!='\0') {
-      curarg[strlen(curarg)+1]='\0';
-      curarg[strlen(curarg)]=line[i];
+      g_string_append_c(curarg, line[i]);
       continue;
     }
@@ -163 +160 @@
     if (quote=='\0') {
       /* add the argument */
-      g_ptr_array_add(argv, owl_strdup(curarg));
-      strcpy(curarg, "");
+      g_ptr_array_add(argv, g_string_free(curarg, false));
+      curarg = g_string_new("");
       between=1;
       continue;
@@ -170 +167 @@
 
     /* if it is a space and we're in quotes, then use it */
-    curarg[strlen(curarg)+1]='\0';
-    curarg[strlen(curarg)]=line[i];
+    g_string_append_c(curarg, line[i]);
   }
 
   *argc = argv->len;
   g_ptr_array_add(argv, NULL);
-  owl_free(curarg);
+  g_string_free(curarg, true);
 
   /* check for unbalanced quotes */