From 647a4ec9577ec10244f18a33f600e4cc8bac3358 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 23 Aug 2008 17:01:47 +0000 Subject: [PATCH] 2008-08-23 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/common/hbwince.c ! strcpy() -> hb_strncpy() ; TOFIX: Only spd.c and dbgentry.c have some remaining strcpy() calls. --- harbour/ChangeLog | 6 ++++++ harbour/source/common/hbwince.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e0297bde9f..edc865827b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-23 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/common/hbwince.c + ! strcpy() -> hb_strncpy() + ; TOFIX: Only spd.c and dbgentry.c have some remaining strcpy() + calls. + 2008-08-23 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * tests/multifnc/t0.prg * tests/multifnc/t1.prg diff --git a/harbour/source/common/hbwince.c b/harbour/source/common/hbwince.c index df867aa007..d5538a1c11 100644 --- a/harbour/source/common/hbwince.c +++ b/harbour/source/common/hbwince.c @@ -204,7 +204,7 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) LONG lret; LPBYTE lpData; DWORD dwType = REG_SZ, cbData; - TCHAR buf[MAX_PATH] = { 0 }; + TCHAR buf[ MAX_PATH ] = { 0 }; LPWSTR wname; LPSTR avalue; @@ -213,7 +213,7 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) if( lret != ERROR_SUCCESS ) { if( value && size ) - value[0] = '\0'; + value[ 0 ] = '\0'; return 0; } @@ -227,7 +227,7 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) if( lret != ERROR_SUCCESS ) { if( value && size ) - value[0] = '\0'; + value[ 0 ] = '\0'; hb_xfree( wname ); return 0; } @@ -260,7 +260,7 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, BOOL WINAPI GetUserNameA( LPSTR buffer, LPDWORD len ) { if( len && buffer ) - buffer[0] = '\0'; + buffer[ 0 ] = '\0'; return FALSE; } @@ -268,7 +268,7 @@ BOOL WINAPI GetUserNameA( LPSTR buffer, LPDWORD len ) BOOL WINAPI GetComputerNameA( LPSTR buffer, LPDWORD len ) { if( len && buffer ) - buffer[0] = '\0'; + buffer[ 0 ] = '\0'; return FALSE; } @@ -276,7 +276,7 @@ BOOL WINAPI GetComputerNameA( LPSTR buffer, LPDWORD len ) DWORD WINAPI GetCurrentDirectoryA( DWORD len, LPSTR buffer ) { if( len && buffer ) - buffer[0] = '\0'; + buffer[ 0 ] = '\0'; return FALSE; } @@ -466,7 +466,7 @@ HANDLE WINAPI FindFirstFileA( LPCSTR path, WIN32_FIND_DATAA * data ) hb_xfree( wpath ); mb = hb_wctomb( wdata.cFileName ); - strcpy( data->cFileName, mb ); + hb_strncpy( data->cFileName, mb, sizeof( data->cFileName ) - 1 ); hb_xfree( mb ); data->dwFileAttributes = wdata.dwFileAttributes; data->ftCreationTime = wdata.ftCreationTime; @@ -486,7 +486,7 @@ BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA * data ) b = FindNextFileW( handle, &wdata ); mb = hb_wctomb( wdata.cFileName ); - strcpy( data->cFileName, mb ); + hb_strncpy( data->cFileName, mb, sizeof( data->cFileName ) - 1 ); hb_xfree( mb ); data->dwFileAttributes = wdata.dwFileAttributes; data->ftCreationTime = wdata.ftCreationTime; @@ -537,7 +537,7 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA * v ) b = GetVersionExW( &wv ); mb = hb_wctomb( wv.szCSDVersion ); - strcpy( v->szCSDVersion, mb ); + hb_strncpy( v->szCSDVersion, mb, sizeof( v->szCSDVersion ) - 1 ); hb_xfree( mb ); v->dwOSVersionInfoSize = wv.dwOSVersionInfoSize; v->dwMajorVersion = wv.dwMajorVersion; @@ -605,7 +605,7 @@ DWORD WINAPI GetTempPathA( DWORD size, LPSTR buffer ) UINT WINAPI GetTempFileNameA( LPCSTR tmpdir, LPCSTR prefix, UINT unique, LPSTR filename ) { LPWSTR wtmpdir, wprefix; - WCHAR wfilename[MAX_PATH] = { 0 }; + WCHAR wfilename[ MAX_PATH ] = { 0 }; UINT u; wtmpdir = hb_mbtowc( tmpdir );