From a2fdf10ca129fdce0e509ed081e68c30ebbfb9c1 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Wed, 12 Nov 2003 22:35:20 +0000 Subject: [PATCH] See ChangeLog entry 2003-10-12 17:35 UTC-0500 David G. Holm --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbver/hbverfix.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a9d2b88d82..c7e3d85e65 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-10-12 17:35 UTC-0500 David G. Holm + + * utils/hbver/hbverfix.c + ! Include closing quote in string built by szReplaceQuoted. + ! Strip newline chars from end of log entry. + 2003-10-12 17:15 UTC-0500 David G. Holm * utils/hbver/hbverfix.c diff --git a/harbour/utils/hbver/hbverfix.c b/harbour/utils/hbver/hbverfix.c index 6bbaf2c26c..2d6b3897d1 100644 --- a/harbour/utils/hbver/hbverfix.c +++ b/harbour/utils/hbver/hbverfix.c @@ -96,7 +96,7 @@ char * szReplaceQuoted( char * szBuffer, const char * new_string ) char * szClosing = strchr( szOpening + 1, 34 ); /* Locate ending quote */ if( szClosing ) { - strncpy( szOldBuf, szClosing + 1, MAX_BUF_LEN ); + strncpy( szOldBuf, szClosing, MAX_BUF_LEN ); szOldBuf[ MAX_BUF_LEN - 1 ] = '\0'; strncpy( szOpening + 1, new_string, MAX_BUF_LEN - ( szOpening - szBuffer ) ); szBuffer[ MAX_BUF_LEN - 1 ] = '\0'; @@ -248,6 +248,7 @@ int main( int argc, char * argv[] ) bFoundLog = TRUE; strncpy( szNewLog, szInputBuffer, sizeof( szNewLog ) ); szNewLog[ sizeof( szNewLog ) - 1 ] = '\0'; + szNewLog[ strcspn( szNewLog, "\r\n" ) ] = '\0'; /* Strip newline chars */ if( iDebugLevel >= 0 ) fprintf( stderr, "\nLOG: %s\n", szInputBuffer ); } else if( iDebugLevel > 0 ) fprintf( stderr, " ===> %c %c %c %c <===", szInputBuffer[ 4 ], szInputBuffer[ 7 ], szInputBuffer[ 10 ], szInputBuffer[ 13 ] );