nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 03:53:01 -05:00
Code Issues Projects Releases Wiki Activity

open_settings_r() and open_settings_w() need to cope with a NULL session name.

Browse Source 
[originally from svn r3009]
This commit is contained in:
Ben Harris 2003-03-27 22:46:28 +00:00
parent 1a27942544
commit 5c9e56ba3e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mac/macstore.c
View File

@ -1,4 +1,4 @@
/* $Id: macstore.c,v 1.16 2003/02/02 00:04:36 ben Exp $ */ /* $Id: macstore.c,v 1.17 2003/03/27 22:46:28 ben Exp $ */
/* /*
* macstore.c: Macintosh-specific impementation of the interface * macstore.c: Macintosh-specific impementation of the interface
@ -126,6 +126,8 @@ void *open_settings_w(char const *sessionname) {
error = get_session_dir(kCreateFolder, &sessVRefNum, &sessDirID); error = get_session_dir(kCreateFolder, &sessVRefNum, &sessDirID);
if (error != noErr) return NULL; if (error != noErr) return NULL;
if (!sessionname || !*sessionname)
sessionname = "Default Settings";
c2pstrcpy(psessionname, sessionname); c2pstrcpy(psessionname, sessionname);
error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &dstfile); error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &dstfile);
if (error == fnfErr) { if (error == fnfErr) {
@ -256,6 +258,8 @@ void *open_settings_r(char const *sessionname)
error = get_session_dir(kDontCreateFolder, &sessVRefNum, &sessDirID); error = get_session_dir(kDontCreateFolder, &sessVRefNum, &sessDirID);
if (!sessionname || !*sessionname)
sessionname = "Default Settings";
c2pstrcpy(psessionname, sessionname); c2pstrcpy(psessionname, sessionname);
error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &sessfile); error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &sessfile);
if (error != noErr) goto out; if (error != noErr) goto out;