fixed a gstep-base issue

[sope] / sope-core / NGExtensions / FdExt.subproj / NSString+misc.m

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m b/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
index 0c1963cc9909d475854cca6f5929ae96175ab453..f7a6ffa7c08b66818108692de139a62042fef00f 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -202,7 +203,7 @@
   if (r.length > 0) {
     return ([self length] > r.location)
       ? [self substringFromIndex:(r.location + r.length)]
-      : @"";
+      : (NSString *)@"";
   }
   return nil;
 }
@@ -262,7 +263,10 @@
     }
     else if ([quotes characterIsMember:c]) {
       /* skip quotes */
-      for (i++; i < len && ![quotes characterIsMember:c]; i++) {
+      i++;
+      c = [self characterAtIndex:i];
+      for (; i < len && ![quotes characterIsMember:c]; i++) {
+       c = [self characterAtIndex:i];
         if (c == _escape) {
           i++; /* skip next char (eg \') */
           continue;