From: Zeev Suraski Date: Sun, 20 Aug 2000 22:18:19 +0000 (+0000) Subject: Fix build X-Git-Tag: php-4.0.2RC1~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30ccec36b9a5b2e34fec171eb748a0386babad83;p=php Fix build --- diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 3257186a03..036cc7084e 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -92,10 +92,10 @@ static char *_ps_files_path_create(char *buf, size_t buflen, ps_files *data, con (strlen(data->basedir) + 2 * data->dirdepth + keylen + 5 + sizeof(FILE_PREFIX))) return NULL; p = key; - n = sprintf(buf, "%s%c", data->basedir, PHP_SEPARATOR); + n = sprintf(buf, "%s%c", data->basedir, PHP_DIR_SEPARATOR); for (i = 0; i < data->dirdepth; i++) { buf[n++] = *p++; - buf[n++] = PHP_SEPARATOR; + buf[n++] = PHP_DIR_SEPARATOR; } buf[n] = '\0'; strcat(buf, FILE_PREFIX); @@ -169,7 +169,7 @@ static int _ps_files_cleanup_dir(const char *dirname, int maxlifetime) /* does the file start with our prefix? */ if (!strncmp(entry->d_name, FILE_PREFIX, sizeof(FILE_PREFIX) - 1) && /* create full path */ - snprintf(buf, MAXPATHLEN, "%s%c%s", dirname, PHP_SEPARATOR, + snprintf(buf, MAXPATHLEN, "%s%c%s", dirname, PHP_DIR_SEPARATOR, entry->d_name) > 0 && /* stat the directory entry */ V_STAT(buf, &sbuf) == 0 && diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index a9099e0b11..08beb7ad11 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -306,8 +306,8 @@ static sapi_module_struct sapi_module = { static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK lpCB) { - char *path_end = strrchr(lpCB->lpszFileName, PHP_SEPARATOR); - if ( path_end ) *path_end = PHP_SEPARATOR; + char *path_end = strrchr(lpCB->lpszFileName, PHP_DIR_SEPARATOR); + if ( path_end ) *path_end = PHP_DIR_SEPARATOR; SG(server_context) = lpCB; SG(request_info).request_method = lpCB->lpszMethod;