cvs: php4 /ext/session mod_mm.c

sas Wed Mar 6 07:25:01 2002 EDT Modified files: /php4/ext/session mod_mm.c Log: Did not revert back enough. This patch does not make sense, because it enforces the existence of a single directory. Index: php4/ext/session/mod_mm.c diff -u php4/ext/session/mod_mm.c:1.37 php4/ext/session/mod_mm.c:1.38 --- php4/ext/session/mod_mm.c:1.37 Wed Mar 6 04:02:31 2002 +++ php4/ext/session/mod_mm.c Wed Mar 6 07:25:01 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_mm.c,v 1.37 2002/03/06 09:02:31 sas Exp $ */ +/* $Id: mod_mm.c,v 1.38 2002/03/06 12:25:01 sas Exp $ */ #include "php.h" @@ -249,6 +249,7 @@ PHP_MINIT_FUNCTION(ps_mm) { + int save_path_len = strlen(PS(save_path)); int mod_name_len = strlen(sapi_module.name); char *ps_mm_path, euid[30]; int ret; @@ -260,10 +261,14 @@ if (!sprintf(euid,"%d", geteuid())) return FAILURE; - /* '/tmp/' + File + Module Name + Effective UID + \0 */ - ps_mm_path = do_alloca(5+sizeof(PS_MM_FILE)+mod_name_len+strlen(euid)+1); + /* Directory + '/' + File + Module Name + Effective UID + \0 */ + ps_mm_path = do_alloca(save_path_len+1+sizeof(PS_MM_FILE)+mod_name_len+strlen(euid)+1); - memcpy(ps_mm_path, "/tmp/", 5); + memcpy(ps_mm_path, PS(save_path), save_path_len + 1); + if (save_path_len > 0 && ps_mm_path[save_path_len - 1] != DEFAULT_SLASH) { + ps_mm_path[save_path_len] = DEFAULT_SLASH; + ps_mm_path[save_path_len+1] = '\0'; + } strcat(ps_mm_path, PS_MM_FILE); strcat(ps_mm_path, sapi_module.name); strcat(ps_mm_path, euid);