]> granicus.if.org Git - php/commitdiff
Fix build
authorZeev Suraski <zeev@php.net>
Sun, 20 Aug 2000 22:18:19 +0000 (22:18 +0000)
committerZeev Suraski <zeev@php.net>
Sun, 20 Aug 2000 22:18:19 +0000 (22:18 +0000)
ext/session/mod_files.c
sapi/pi3web/pi3web_sapi.c

index 3257186a03fe8b6642a64f706c54474bfe4276c7..036cc7084ee148986c458b4114ed30453ba64dca 100644 (file)
@@ -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 &&
index a9099e0b11df7051918a38e66d54829144d98016..08beb7ad1160cd12e0596fbdf8c428bda74b398f 100644 (file)
@@ -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;