[libcvd-members] gvars3/src GStringUtil.cc

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Edward Rosten <edrosten>        07/07/25 21:19:53

Modified files:
        src            : GStringUtil.cc 

Log message:
        Check strings from quotes so that comments can't be used from within
        strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GStringUtil.cc?cvsroot=libcvd&r1=1.2&r2=1.3

Patches:
Index: GStringUtil.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GStringUtil.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- GStringUtil.cc      22 Nov 2005 18:33:34 -0000      1.2
+++ GStringUtil.cc      25 Jul 2007 21:19:53 -0000      1.3
@@ -28,8 +28,24 @@
 
 string UncommentString(string s)
 {
-  int n = s.find("//");
-  return s.substr(0,n);
+  //int n = s.find("//");
+  //return s.substr(0,n);
+
+  int q=0;
+
+  for(int n=0; n < s.size(); n++)
+  {
+       if(s[n] == '"')
+               q = !q;
+
+       if(s[n] == '/' && !q)
+       {
+               if(n < s.size() -1 && s[n+1] == '/')
+                       return s.substr(0, n);
+       }
+  }
+
+  return s;
 };
 
 vector<string> ChopAndUnquoteString(string s)