Changeset e30ed92 for util.c

Timestamp:

Aug 17, 2009, 10:03:53 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

14acbbd

Parents:

8bce750

git-author:

Nelson Elhage <nelhage@mit.edu> (08/17/09 22:03:45)

git-committer:

Nelson Elhage <nelhage@mit.edu> (08/17/09 22:03:53)

Message:

skiptokens: Handle quotes more correctly.

This fixes ctl's bug about not being able to bind the ' key. In
addition, add some tests for skiptokens.

File:

• util.c (modified) (1 diff)

util.c

@@ -158 +158 @@
 
 const char *skiptokens(const char *buff, int n) {
-  /* skips n tokens and returns where that would be.
-   * TODO: handle quotes more sanely. */
-  
-  int inquotes=0;
+  /* skips n tokens and returns where that would be. */
+  char quote = 0;
   while (*buff && n>0) {
       while (*buff == ' ') buff++;
-      while (*buff && (inquotes || *buff != ' ')) { 
-        if (*buff == '"' || *buff == '\'') inquotes=!inquotes;
-        buff++;
+      while (*buff && (quote || *buff != ' ')) {
+        if(quote) {
+          if(*buff == quote) quote = 0;
+        } else if(*buff == '"' || *buff == '\'') {
+          quote = *buff;
+        }
+        buff++;
       }
       while (*buff == ' ') buff++;