Author: bojan
Date: Mon Nov 10 00:49:22 2008
New Revision: 712628
URL: http://svn.apache.org/viewvc?rev=712628&view=rev
Log:
Backport r712627 from the trunk.
Fix apr_tokenize_to_argv parsing.
PR 46128.
Patch by Edward Rudd <eddie omegaware.com>
Modified:
apr/apr/branches/1.3.x/strings/apr_cpystrn.c
Modified: apr/apr/branches/1.3.x/strings/apr_cpystrn.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/strings/apr_cpystrn.c?rev=712628&r1=712627&r2=712628&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/strings/apr_cpystrn.c (original)
+++ apr/apr/branches/1.3.x/strings/apr_cpystrn.c Mon Nov 10 00:49:22 2008
@@ -114,8 +114,7 @@
*/
#define DETERMINE_NEXTSTRING(cp,isquoted) \
for ( ; *cp != '\0'; cp++) { \
- if ( (isquoted && (*cp == ' ' || *cp == '\t')) \
- || (*cp == '\\' && (*(cp+1) == ' ' || *(cp+1) == '\t' || \
+ if ( (*cp == '\\' && (*(cp+1) == ' ' || *(cp+1) == '\t' || \
*(cp+1) == '"' || *(cp+1) == '\''))) { \
cp++; \
continue; \
|