From 89ef9acad7e938d52727e0b9f7bb8c63e8bd5daa Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Tue, 26 Feb 2002 19:11:47 +0000 Subject: [PATCH] See ChangeLog entry 2002-02-26 14:15 UTC-0500 David G. Holm --- harbour/ChangeLog | 8 ++++++++ harbour/source/common/hbstr.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 565afe0a93..afebb577f0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,14 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + ; Changes thanks to Alexander's feedback + +2002-02-26 17:20 UTC-0500 David G. Holm + * .cvsignore + + Added freebsd and freebsd/* to the CVS ignore list. + + +2002-02-27 16:30 UTC-0500 David G. Holm * contrib/Makefile - Removed apollo from the w32 build path, because it now requires the use of third-party (Apollo) include files. diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c index 8c99111556..8fa47ac923 100644 --- a/harbour/source/common/hbstr.c +++ b/harbour/source/common/hbstr.c @@ -83,7 +83,12 @@ ULONG hb_strAt( const char * szSub, ULONG ulSubLen, const char * szText, ULONG u ulPos++; } else if( ulSubPos ) + { + /* Go back to the first character after the first match, + or else tests like "22345" $ "012223456789" will fail. */ + ulPos -= ( ulSubPos - 1 ); ulSubPos = 0; + } else ulPos++; }