From 1834ead8102008b98cacdba05d10490928bfb064 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 26 Nov 2007 08:47:09 +0000 Subject: [PATCH] 2007-11-26 09:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh ! fixed typo * harbour/contrib/gtwvg/gtwvt.c * use hb_strncpy() instead of strcpy() --- harbour/ChangeLog | 7 +++++++ harbour/bin/hb-func.sh | 4 ++-- harbour/contrib/gtwvg/gtwvt.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 75fe1e7f75..1145bcc035 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-26 09:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + ! fixed typo + + * harbour/contrib/gtwvg/gtwvt.c + * use hb_strncpy() instead of strcpy() + 2007-11-26 08:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/gtwvg/gtwvt.h * harbour/contrib/gtwvg/gtwvt.c diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index c7df363337..2f78fbfd65 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -274,10 +274,10 @@ while [ \$n -lt \${#P[@]} ]; do DIROUT="\${d%}" elif [ -d "\${d%/*}" ]; then DIROUT="\${d%/*}"; FILEOUT="\${d##*/}"; p="-o\${d}" - [ \${HB} != "cc" ] || p="-o\${d%.*}" + [ \${HB} = "cc" ] || p="-o\${d%.*}" elif [ -n "\${d}" ]; then FILEOUT="\${d}"; p="-o\${d}" - [ \${HB} != "cc" ] || p="-o\${d%.*}" + [ \${HB} = "cc" ] || p="-o\${d%.*}" fi ;; -static) HB_STATIC="yes" ;; -fullstatic) HB_STATIC="full" ;; diff --git a/harbour/contrib/gtwvg/gtwvt.c b/harbour/contrib/gtwvg/gtwvt.c index c5598fd759..fdccb30724 100644 --- a/harbour/contrib/gtwvg/gtwvt.c +++ b/harbour/contrib/gtwvg/gtwvt.c @@ -1913,9 +1913,9 @@ BOOL HB_EXPORT hb_wvt_gtSetFont( char *fontFace, int height, int width, int Bold _s.fontQuality = Quality; size = strlen( fontFace ); - if( ( size > 0 ) && ( size < LF_FACESIZE-1 ) ) + if( size > 0 && size < LF_FACESIZE - 1 ) { - strcpy( _s.fontFace, fontFace ); + hb_strncpy( _s.fontFace, fontFace, sizeof( _s.fontFace ) - 1 ); } if( _s.hWnd ) {