diff options
Diffstat (limited to 'src/interfaces/odbc')
| -rw-r--r-- | src/interfaces/odbc/gpps.c | 33 | ||||
| -rw-r--r-- | src/interfaces/odbc/setup.c | 9 |
2 files changed, 18 insertions, 24 deletions
diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 8d2796673ca..b067ca1c10e 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -36,11 +36,6 @@ #define FALSE ((BOOL)0) #endif -#if HAVE_SYS_PARAM_H -#include <sys/param.h> -#else -#define MAXPATHLEN 255 -#endif DWORD GetPrivateProfileString(char *theSection, // section name @@ -50,7 +45,7 @@ GetPrivateProfileString(char *theSection, // section name size_t theReturnBufferLength, // byte length of return buffer char *theIniFileName) // pathname of ini file to search { - char buf[MAXPATHLEN+1]; + char buf[MAXPGPATH]; char* ptr = 0; FILE* aFile = 0; size_t aLength; @@ -70,8 +65,8 @@ GetPrivateProfileString(char *theSection, // section name if( ptr == NULL) { - if( MAXPATHLEN < j ) - theIniFileName[MAXPATHLEN] = '\0'; + if( MAXPGPATH-1 < j ) + theIniFileName[MAXPGPATH-1] = '\0'; sprintf(buf,"%s",theIniFileName); } @@ -84,12 +79,12 @@ GetPrivateProfileString(char *theSection, // section name * the file won't be found and thus the default value will be * returned. */ - if( MAXPATHLEN < strlen(ptr) + j ) + if( MAXPGPATH-1 < strlen(ptr) + j ) { - if( MAXPATHLEN < strlen(ptr) ) - ptr[MAXPATHLEN] = '\0'; + if( MAXPGPATH-1 < strlen(ptr) ) + ptr[MAXPGPATH-1] = '\0'; else - theIniFileName[MAXPATHLEN-strlen(ptr)] = '\0'; + theIniFileName[MAXPGPATH-1-strlen(ptr)] = '\0'; } sprintf( buf, "%s/%s",ptr,theIniFileName ); @@ -323,7 +318,7 @@ WritePrivateProfileString(char *theSection, // section name char *theBuffer, // input buffer char *theIniFileName) // pathname of ini file to write { - char buf[MAXPATHLEN+1]; + char buf[MAXPGPATH]; char* ptr = 0; FILE* aFile = 0; size_t aLength; @@ -349,8 +344,8 @@ WritePrivateProfileString(char *theSection, // section name if( ptr == NULL) { - if( MAXPATHLEN < j ) - theIniFileName[MAXPATHLEN] = '\0'; + if( MAXPGPATH-1 < j ) + theIniFileName[MAXPGPATH-1] = '\0'; sprintf(buf,"%s",theIniFileName); } @@ -363,12 +358,12 @@ WritePrivateProfileString(char *theSection, // section name // the file won't be found and thus the default value will be // returned. // - if( MAXPATHLEN < strlen(ptr) + j ) + if( MAXPGPATH-1 < strlen(ptr) + j ) { - if( MAXPATHLEN < strlen(ptr) ) - ptr[MAXPATHLEN] = '\0'; + if( MAXPGPATH-1 < strlen(ptr) ) + ptr[MAXPGPATH-1] = '\0'; else - theIniFileName[MAXPATHLEN-strlen(ptr)] = '\0'; + theIniFileName[MAXPGPATH-1-strlen(ptr)] = '\0'; } sprintf( buf, "%s/%s",ptr,theIniFileName ); diff --git a/src/interfaces/odbc/setup.c b/src/interfaces/odbc/setup.c index dae789003dd..40816fd1100 100644 --- a/src/interfaces/odbc/setup.c +++ b/src/interfaces/odbc/setup.c @@ -32,7 +32,6 @@ extern GLOBAL_VALUES globals; // Constants --------------------------------------------------------------- #define MIN(x,y) ((x) < (y) ? (x) : (y)) -#define MAXPATHLEN (255+1) // Max path length #define MAXKEYLEN (15+1) // Max keyword length #define MAXDESC (255+1) // Max description length #define MAXDSNAME (32+1) // Max data source name length @@ -323,7 +322,7 @@ LPCSTR lpsz; LPCSTR lpszStart; char aszKey[MAXKEYLEN]; int cbKey; -char value[MAXPATHLEN]; +char value[MAXPGPATH]; memset(&lpsetupdlg->ci, 0, sizeof(ConnInfo)); @@ -352,7 +351,7 @@ char value[MAXPATHLEN]; // lpsetupdlg->aAttr[iElement].fSupplied = TRUE; - _fmemcpy(value, lpszStart, MIN(lpsz-lpszStart+1, MAXPATHLEN)); + _fmemcpy(value, lpszStart, MIN(lpsz-lpszStart+1, MAXPGPATH)); mylog("aszKey='%s', value='%s'\n", aszKey, value); @@ -384,8 +383,8 @@ LPCSTR lpszDSN; // Pointer to da { if (hwndParent) { - char szBuf[MAXPATHLEN]; - char szMsg[MAXPATHLEN]; + char szBuf[MAXPGPATH]; + char szMsg[MAXPGPATH]; LoadString(s_hModule, IDS_BADDSN, szBuf, sizeof(szBuf)); wsprintf(szMsg, szBuf, lpszDSN); |