[PHP-CVS] cvs: php4 /ext/standard string.c

[Moshe Doron]

momo            Tue Apr  1 07:46:02 2003 EDT

  Modified files:              
    /php4/ext/standard  string.c 
  Log:
  revert last commit for now
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.366 php4/ext/standard/string.c:1.367
--- php4/ext/standard/string.c:1.366    Mon Mar 31 13:56:41 2003
+++ php4/ext/standard/string.c  Tue Apr  1 07:46:01 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.366 2003/03/31 18:56:41 momo Exp $ */
+/* $Id: string.c,v 1.367 2003/04/01 12:46:01 momo Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2331,14 +2331,9 @@
                                        l--;
                                }
                                *s++ = *t++;
-                       } else if (*t == '\\' && l > 0) {
-                               if(t[1] == '0') {
-                                       *s++='\0';
-                                       t++;
-                               } else {
-                                       *s++=*(++t);
-                               }
-                               t++;
+                       } else if (*t == '\\' && t[1] == '0' && l > 0) {
+                               *s++='\0';
+                               t+=2;
                                if (len != NULL) {
                                        (*len)--;
                                }
@@ -2632,10 +2627,6 @@
                                case '\'':
                                        *target++ = '\'';
                                        *target++ = '\'';
-                                       break;
-                               case '\\':
-                                       *target++ = '\\';
-                                       *target++ = '\\';
                                        break;
                                default:
                                        *target++ = *source;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php