[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-418-gfa8115f

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  fa8115f32bfd37f75c284ff0f6906dbc2af0f40c (commit)
      from  09e01a47164702f67403e61bc478d1cb54f0508e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit fa8115f32bfd37f75c284ff0f6906dbc2af0f40c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 30 14:15:34 2007 -0800

    Fix restart after length count.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util_str.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 886ae2a..a0ca03a 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -92,6 +92,7 @@ static bool next_token_internal_talloc(TALLOC_CTX *ctx,
                                 bool ltrim)
 {
 	char *s;
+	char *saved_s;
 	char *pbuf;
 	bool quoted;
 	size_t len=1;
@@ -116,9 +117,12 @@ static bool next_token_internal_talloc(TALLOC_CTX *ctx,
 
 	/* nothing left? */
 	if (!*s) {
-		return(false);
+		return false;
 	}
 
+	/* When restarting we need to go from here. */
+	saved_s = s;
+
 	/* Work out the length needed. */
 	for (quoted = false; *s &&
 			(quoted || !strchr_m(sep,*s)); s++) {
@@ -137,6 +141,7 @@ static bool next_token_internal_talloc(TALLOC_CTX *ctx,
 
 	/* copy over the token */
 	pbuf = *pp_buff;
+	s = saved_s;
 	for (quoted = false; *s &&
 			(quoted || !strchr_m(sep,*s)); s++) {
 		if ( *s == '\"' ) {


-- 
Samba Shared Repository