From: <pa...@us...> - 2003-10-29 15:38:10
|
Update of /cvsroot/fuse-emulator/fuse In directory sc8-pr-cvs1:/tmp/cvs-serv21629 Modified Files: trdos.c utils.c Log Message: Don't assume temp path ends with a slash (Marek). Index: trdos.c =================================================================== RCS file: /cvsroot/fuse-emulator/fuse/trdos.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** trdos.c 20 Oct 2003 14:35:48 -0000 1.16 --- trdos.c 29 Oct 2003 15:38:03 -0000 1.17 *************** *** 415,419 **** temp_path = utils_get_temp_path(); ! length = strlen( temp_path ) + strlen( SCL_TMP_FILE_TEMPLATE ) + 1; trd_template = malloc( length ); --- 415,421 ---- temp_path = utils_get_temp_path(); ! /* +2 is for the slash between the path and the template and for the ! null at the end */ ! length = strlen( temp_path ) + strlen( SCL_TMP_FILE_TEMPLATE ) + 2; trd_template = malloc( length ); *************** *** 423,427 **** } ! snprintf( trd_template, length, "%s%s", temp_path, SCL_TMP_FILE_TEMPLATE ); discs[ which ].disc_ready = 0; --- 425,429 ---- } ! snprintf( trd_template, length, "%s/%s", temp_path, SCL_TMP_FILE_TEMPLATE ); discs[ which ].disc_ready = 0; Index: utils.c =================================================================== RCS file: /cvsroot/fuse-emulator/fuse/utils.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** utils.c 28 Oct 2003 10:47:03 -0000 1.30 --- utils.c 29 Oct 2003 15:38:03 -0000 1.31 *************** *** 346,350 **** dir = getenv( "TMP" ); if( dir ) return dir; dir = getenv( "TEMP" ); if( dir ) return dir; ! return "./"; #else /* #ifdef WIN32 */ --- 346,350 ---- dir = getenv( "TMP" ); if( dir ) return dir; dir = getenv( "TEMP" ); if( dir ) return dir; ! return "."; #else /* #ifdef WIN32 */ *************** *** 352,356 **** /* Unix-ish. Use TMPDIR if specified, if not /tmp */ dir = getenv( "TMPDIR" ); if( dir ) return dir; ! return "/tmp/"; #endif /* #ifdef WIN32 */ --- 352,356 ---- /* Unix-ish. Use TMPDIR if specified, if not /tmp */ dir = getenv( "TMPDIR" ); if( dir ) return dir; ! return "/tmp"; #endif /* #ifdef WIN32 */ |