--- hatari/src/gui-sdl/dlgFileSelect.c	2019/04/01 07:12:22	1.1.1.2
+++ hatari/src/gui-sdl/dlgFileSelect.c	2019/04/01 07:13:50	1.1.1.4
@@ -6,14 +6,14 @@
  
   A file selection dialog for the graphical user interface for Hatari.
 */
-char DlgFileSelect_rcsid[] = "Hatari $Id: dlgFileSelect.c,v 1.1.1.2 2019/04/01 07:12:22 root Exp $";
+const char DlgFileSelect_rcsid[] = "Hatari $Id: dlgFileSelect.c,v 1.1.1.4 2019/04/01 07:13:50 root Exp $";
 
 #include <SDL.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <dirent.h>
 
 #include "main.h"
+#include "scandir.h"
 #include "sdlgui.h"
 #include "file.h"
 #include "zip.h"
@@ -24,13 +24,15 @@ char DlgFileSelect_rcsid[] = "Hatari $Id
 
 #define SGFSDLG_FILENAME  5
 #define SGFSDLG_UPDIR     6
-#define SGFSDLG_ROOTDIR   7
-#define SGFSDLG_ENTRY1    10
-#define SGFSDLG_ENTRY16   25
-#define SGFSDLG_UP        26
-#define SGFSDLG_DOWN      27
-#define SGFSDLG_OKAY      28
-#define SGFSDLG_CANCEL    29
+#define SGFSDLG_HOMEDIR   7
+#define SGFSDLG_ROOTDIR   8
+#define SGFSDLG_ENTRY1    11
+#define SGFSDLG_ENTRY16   26
+#define SGFSDLG_UP        27
+#define SGFSDLG_DOWN      28
+#define SGFSDLG_SHOWHIDDEN  29
+#define SGFSDLG_OKAY      30
+#define SGFSDLG_CANCEL    31
 
 
 #define DLGPATH_SIZE 62
@@ -51,7 +53,8 @@ static SGOBJ fsdlg[] =
 	{ SGTEXT, 0, 0, 1,3, DLGPATH_SIZE,1, dlgpath },
 	{ SGTEXT, 0, 0, 1,4, 6,1, "File:" },
 	{ SGTEXT, 0, 0, 7,4, DLGFNAME_SIZE,1, dlgfname },
-	{ SGBUTTON, 0, 0, 55,1, 4,1, ".." },
+	{ SGBUTTON, 0, 0, 51,1, 4,1, ".." },
+	{ SGBUTTON, 0, 0, 56,1, 3,1, "~" },
 	{ SGBUTTON, 0, 0, 60,1, 3,1, "/" },
 	{ SGBOX, 0, 0, 1,6, 62,16, NULL },
 	{ SGBOX, 0, 0, 62,7, 1,14, NULL },
@@ -73,8 +76,9 @@ static SGOBJ fsdlg[] =
 	{ SGTEXT, SG_EXIT, 0, 2,21, DLGFILENAMES_SIZE,1, dlgfilenames[15] },
 	{ SGBUTTON, SG_TOUCHEXIT, 0, 62,6, 1,1, "\x01" },           /* Arrow up */
 	{ SGBUTTON, SG_TOUCHEXIT, 0, 62,21, 1,1, "\x02" },          /* Arrow down */
-	{ SGBUTTON, 0, 0, 14,23, 8,1, "Okay" },
-	{ SGBUTTON, 0, 0, 34,23, 8,1, "Cancel" },
+	{ SGCHECKBOX, SG_EXIT, SG_SELECTED, 2,23, 18,1, "Show hidden files" },
+	{ SGBUTTON, SG_DEFAULT, 0, 32,23, 8,1, "Okay" },
+	{ SGBUTTON, SG_CANCEL, 0, 50,23, 8,1, "Cancel" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -101,9 +105,9 @@ static int DlgFileSelect_RefreshEntries(
 	}
 
 	/* Copy entries to dialog: */
-	for(i=0; i<SGFS_NUMENTRIES; i++)
+	for (i=0; i<SGFS_NUMENTRIES; i++)
 	{
-		if( i+ypos < entries )
+		if (i+ypos < entries)
 		{
 			struct stat filestat;
 			/* Prepare entries: */
@@ -114,9 +118,9 @@ static int DlgFileSelect_RefreshEntries(
 			strcpy(tempstr, path);
 			strcat(tempstr, files[i+ypos]->d_name);
 
-			if( browsingzip )
+			if (browsingzip)
 			{
-				if( tempstr[strlen(tempstr)-1] == '/'  )
+				if (File_DoesFileNameEndWithSlash(tempstr))
 					dlgfilenames[i][0] = SGFOLDER;    /* Mark folders */
 			}
 			else
@@ -138,6 +142,51 @@ static int DlgFileSelect_RefreshEntries(
 
 /*-----------------------------------------------------------------------*/
 /*
+  Remove all hidden files (files with file names that begin with a dot) from
+  the list.
+*/
+static void DlgFileSelect_RemoveHiddenFiles(struct dirent **files)
+{
+	int i;
+	int nActPos = -1;
+	int nOldEntries;
+
+	nOldEntries = entries;
+
+	/* Scan list for hidden files and remove them. */
+	for (i = 0; i < nOldEntries; i++)
+	{
+		/* Does file name start with a dot? -> hidden file! */
+		if (files[i]->d_name[0] == '.')
+		{
+			if (nActPos == -1)
+				nActPos = i;
+			/* Remove file from list: */
+			free(files[i]);
+			files[i] = NULL;
+			entries -= 1;
+		}
+	}
+
+	/* Now close the gaps in the list: */
+	if (nActPos != -1)
+	{
+		for (i = nActPos; i < nOldEntries; i++)
+		{
+			if (files[i] != NULL)
+			{
+				/* Move entry to earlier position: */
+				files[nActPos] = files[i];
+				files[i] = NULL;
+				nActPos += 1;
+			}
+		}
+	}
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
   Prepare to scroll up one entry.
 */
 static void DlgFileSelect_ScrollUp(void)
@@ -170,6 +219,7 @@ static void DlgFileSelect_ScrollDown(voi
 */
 static void DlgFileSelect_HandleSdlEvents(SDL_Event *pEvent)
 {
+	int oldypos = ypos;
 	switch (pEvent->type)
 	{
 	 case SDL_MOUSEBUTTONDOWN:
@@ -181,45 +231,109 @@ static void DlgFileSelect_HandleSdlEvent
 	 case SDL_KEYDOWN:
 		switch (pEvent->key.keysym.sym)
 		{
-		 case SDLK_UP:  	DlgFileSelect_ScrollUp(); break;
-		 case SDLK_DOWN:	DlgFileSelect_ScrollDown(); break;
-		 case SDLK_HOME:	ypos = 0; refreshentries = TRUE; break;
-		 case SDLK_END: 	ypos = entries-SGFS_NUMENTRIES; refreshentries = TRUE; break;
-		 case SDLK_PAGEUP:
-			if (ypos > SGFS_NUMENTRIES)
-				ypos -= SGFS_NUMENTRIES;
-			else
-				ypos = 0;
-			refreshentries = TRUE;
-			break;
+		 case SDLK_UP:       DlgFileSelect_ScrollUp(); break;
+		 case SDLK_DOWN:     DlgFileSelect_ScrollDown(); break;
+		 case SDLK_HOME:     ypos = 0; break;
+		 case SDLK_END:      ypos = entries-SGFS_NUMENTRIES; break;
+		 case SDLK_PAGEUP:   ypos -= SGFS_NUMENTRIES; break;
 		 case SDLK_PAGEDOWN:
 			if (ypos+2*SGFS_NUMENTRIES < entries)
 				ypos += SGFS_NUMENTRIES;
 			else
 				ypos = entries-SGFS_NUMENTRIES;
-			refreshentries = TRUE;
 			break;
-		 default: break;
+		 default:
+			break;
 		}
 		break;
+	default:
+		break;
+	}
+	if (ypos < 0)
+		ypos = 0;
+	if (ypos != oldypos)
+		refreshentries = TRUE;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Free file entries
+*/
+static struct dirent **files_free(struct dirent **files)
+{
+	int i;
+	if (files != NULL)
+	{
+		for(i=0; i<entries; i++)
+		{
+			free(files[i]);
+		}
+		free(files);
+	}
+	return NULL;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Copy to dst src+add if they are below maxlen and return true,
+  otherwise return false
+*/
+static int strcat_maxlen(char *dst, int maxlen, const char *src, const char *add)
+{
+	int slen, alen;
+	slen = strlen(src);
+	alen = strlen(add);
+	if (slen + alen < maxlen)
+	{
+		strcpy(dst, src);
+		strcpy(dst+slen, add);
+		return 1;
+	}
+	return 0;
+}
+
+/*-----------------------------------------------------------------------*/
+/*
+  Create and return suitable path into zip file
+*/
+static char* zip_get_path(const char *zipdir, const char *zipfilename, int browsingzip)
+{
+	if (browsingzip)
+	{
+		char *zippath;
+		zippath = malloc(strlen(zipdir) + strlen(zipfilename) + 1);
+		strcpy(zippath, zipdir);
+		strcat(zippath, zipfilename);
+		return zippath;
 	}
+	return strdup("");
 }
 
+/* string for zip root needs to be empty, check and correct if needed */
+static void correct_zip_root(char *zippath)
+{
+	if (zippath[0] == PATHSEP && !zippath[1])
+	{
+		zippath[0] = '\0';
+	}
+}
 
 /*-----------------------------------------------------------------------*/
 /*
   Show and process a file selection dialog.
-  Returns TRUE if the use selected "okay", FALSE if "cancel".
-  input: zip_path = pointer to buffer to contain file path within a selected
-  zip file, or NULL if browsing zip files is disallowed.
+  Returns path/name user selected or NULL if user canceled
+  input: zip_path = pointer's pointer to buffer to contain file path
+  within a selected zip file, or NULL if browsing zip files is disallowed.
   bAllowNew: TRUE if the user is allowed to insert new file names.
 */
-int SDLGui_FileSelect(char *path_and_name, char *zip_path, BOOL bAllowNew)
+char* SDLGui_FileSelect(const char *path_and_name, char **zip_path, BOOL bAllowNew)
 {
-	int i,n;
 	struct dirent **files = NULL;
 	char *pStringMem;
-	char *path, *fname;                 /* The actual file and path names */
+	char *retpath;
+	char *home, *path, *fname;          /* The actual file and path names */
 	BOOL reloaddir = TRUE;              /* Do we have to reload the directory file list? */
 	int retbut;
 	int oldcursorstate;
@@ -239,9 +353,8 @@ int SDLGui_FileSelect(char *path_and_nam
 	pStringMem = malloc(4 * FILENAME_MAX);
 	path = pStringMem;
 	fname = pStringMem + FILENAME_MAX;
-	zipfilename = pStringMem + 2 * FILENAME_MAX;
-	zipdir = pStringMem + 3 * FILENAME_MAX;
-
+	zipdir = pStringMem + 2 * FILENAME_MAX;
+	zipfilename = pStringMem + 3 * FILENAME_MAX;
 	zipfilename[0] = 0;
 
 	SDLGui_CenterDlg(fsdlg);
@@ -257,18 +370,32 @@ int SDLGui_FileSelect(char *path_and_nam
 	}
 
 	/* Prepare the path and filename variables */
-	if (stat(path_and_name, &filestat) == 0 && S_ISDIR(filestat.st_mode))
+	if (path_and_name && path_and_name[0])
 	{
-		/* assure that a directory name ends with a '/' */
-		File_AddSlashToEndFileName(path_and_name);
+		strncpy(path, path_and_name, FILENAME_MAX);
+		path[FILENAME_MAX-1] = '\0';
+	}
+	else
+	{
+		if (!getcwd(path, FILENAME_MAX))
+		{
+			perror("SDLGui_FileSelect");
+			return NULL;
+		}
 	}
-	File_splitpath(path_and_name, path, fname, NULL);
+	if (stat(path, &filestat) == 0 && S_ISDIR(filestat.st_mode))
+	{
+		File_AddSlashToEndFileName(path);
+		fname[0] = 0;
+	}
+	else
+		File_SplitPath(path, path, fname, NULL);
 	File_MakeAbsoluteName(path);
 	File_MakeValidPathName(path);
 	File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
 	File_ShrinkName(dlgfname, fname, DLGFNAME_SIZE);
 
-	/* Save old mouse cursor state and enable cursor anyway */
+	/* Save old mouse cursor state and enable cursor */
 	oldcursorstate = SDL_ShowCursor(SDL_QUERY);
 	if (oldcursorstate == SDL_DISABLE)
 		SDL_ShowCursor(SDL_ENABLE);
@@ -277,23 +404,7 @@ int SDLGui_FileSelect(char *path_and_nam
 	{
 		if (reloaddir)
 		{
-			if (strlen(path) >= FILENAME_MAX)
-			{
-				fprintf(stderr, "SDLGui_FileSelect: Path name too long!\n");
-				free(pStringMem);
-				return FALSE;
-			}
-
-			/* Free old allocated memory: */
-			if (files != NULL)
-			{
-				for(i=0; i<entries; i++)
-				{
-					free(files[i]);
-				}
-				free(files);
-				files = NULL;
-			}
+			files = files_free(files);
 
 			if (browsingzip)
 			{
@@ -304,6 +415,12 @@ int SDLGui_FileSelect(char *path_and_nam
 				/* Load directory entries: */
 				entries = scandir(path, &files, 0, alphasort);
 			}
+			
+			/* Remove hidden files from the list if necessary: */
+			if (!(fsdlg[SGFSDLG_SHOWHIDDEN].state & SG_SELECTED))
+			{
+				DlgFileSelect_RemoveHiddenFiles(files);
+			}
 
 			if (entries < 0)
 			{
@@ -312,6 +429,7 @@ int SDLGui_FileSelect(char *path_and_nam
 				return FALSE;
 			}
 
+			/* reload always implies refresh */
 			reloaddir = FALSE;
 			refreshentries = TRUE;
 		}/* reloaddir */
@@ -331,10 +449,10 @@ int SDLGui_FileSelect(char *path_and_nam
 		retbut = SDLGui_DoDialog(fsdlg, &sdlEvent);
 
 		/* Has the user clicked on a file or folder? */
-		if( retbut>=SGFSDLG_ENTRY1 && retbut<=SGFSDLG_ENTRY16 && retbut-SGFSDLG_ENTRY1+ypos<entries)
+		if (retbut>=SGFSDLG_ENTRY1 && retbut<=SGFSDLG_ENTRY16 && retbut-SGFSDLG_ENTRY1+ypos<entries)
 		{
 			char *tempstr;
-
+			
 			tempstr = malloc(FILENAME_MAX);
 			if (!tempstr)
 			{
@@ -343,19 +461,24 @@ int SDLGui_FileSelect(char *path_and_nam
 				return FALSE;
 			}
 
-			if( browsingzip == TRUE )
+			if (browsingzip == TRUE)
 			{
-				strcpy(tempstr, zipdir);
-				strcat(tempstr, files[retbut-SGFSDLG_ENTRY1+ypos]->d_name);
-				if(tempstr[strlen(tempstr)-1] == '/')
+				if (!strcat_maxlen(tempstr, FILENAME_MAX,
+						   zipdir, files[retbut-SGFSDLG_ENTRY1+ypos]->d_name))
+				{
+					fprintf(stderr, "SDLGui_FileSelect: Path name too long!\n");
+					free(pStringMem);
+					return FALSE;
+				}
+				/* directory? */
+				if (File_DoesFileNameEndWithSlash(tempstr))
 				{
 					/* handle the ../ directory */
-					if(strcmp(files[retbut-SGFSDLG_ENTRY1+ypos]->d_name, "../") == 0)
+					if (strcmp(files[retbut-SGFSDLG_ENTRY1+ypos]->d_name, "../") == 0)
 					{
 						/* close the zip file */
-						if( strcmp(tempstr, "../") == 0 )
+						if (strcmp(tempstr, "../") == 0)
 						{
-							reloaddir = refreshentries = TRUE;
 							/* free zip file entries */
 							ZIP_FreeZipDir(zipfiles);
 							zipfiles = NULL;
@@ -365,16 +488,9 @@ int SDLGui_FileSelect(char *path_and_nam
 						}
 						else
 						{
-							i=strlen(tempstr)-1;
-							n=0;
-							while(i > 0 && n < 3)
-								if( tempstr[i--] == '/' )
-									n++;
-							if(tempstr[i+1] == '/')
-								tempstr[i+2] = '\0';
-							else
-								tempstr[0] = '\0';
-
+							/* remove "../" and previous dir from path */
+							File_PathShorten(tempstr, 2);
+							correct_zip_root(tempstr);
 							strcpy(zipdir, tempstr);
 							File_ShrinkName(dlgpath, zipdir, DLGPATH_SIZE);
 						}
@@ -390,48 +506,33 @@ int SDLGui_FileSelect(char *path_and_nam
 					zipfilename[0] = '\0';
 					dlgfname[0] = 0;
 					ypos = 0;
-
 				}
 				else
 				{
-					/* Select a file in the zip */
+					/* not dir, select a file in the zip */
 					selection = retbut-SGFSDLG_ENTRY1+ypos;
 					strcpy(zipfilename, files[selection]->d_name);
 					File_ShrinkName(dlgfname, zipfilename, DLGFNAME_SIZE);
 				}
 
-			} /* if browsingzip */
-			else
+			}
+			else /* not browsingzip */
 			{
-				strcpy(tempstr, path);
-				strcat(tempstr, files[retbut-SGFSDLG_ENTRY1+ypos]->d_name);
-				if( stat(tempstr, &filestat)==0 && S_ISDIR(filestat.st_mode) )
+				if (!strcat_maxlen(tempstr, FILENAME_MAX,
+						   path, files[retbut-SGFSDLG_ENTRY1+ypos]->d_name))
+				{
+					fprintf(stderr, "SDLGui_FileSelect: Path name too long!\n");
+					free(pStringMem);
+					return FALSE;
+				}
+				if (stat(tempstr, &filestat) == 0 && S_ISDIR(filestat.st_mode))
 				{
-					/* Set the new directory */
+					File_HandleDotDirs(tempstr);
+					File_AddSlashToEndFileName(tempstr);
+					/* Copy the path name to the dialog */
+					File_ShrinkName(dlgpath, tempstr, DLGPATH_SIZE);
 					strcpy(path, tempstr);
-					if( strlen(path)>=3 )
-					{
-						if(path[strlen(path)-2]=='/' && path[strlen(path)-1]=='.')
-							path[strlen(path)-2] = 0;  /* Strip a single dot at the end of the path name */
-						if(path[strlen(path)-3]=='/' && path[strlen(path)-2]=='.' && path[strlen(path)-1]=='.')
-						{
-							/* Handle the ".." folder */
-							char *ptr;
-							if( strlen(path)==3 )
-								path[1] = 0;
-							else
-							{
-								path[strlen(path)-3] = 0;
-								ptr = strrchr(path, '/');
-								if(ptr)
-									*(ptr+1) = 0;
-							}
-						}
-					}
-					File_AddSlashToEndFileName(path);
 					reloaddir = TRUE;
-					/* Copy the path name to the dialog */
-					File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
 					selection = -1;                /* Remove old selection */
 					dlgfname[0] = 0;
 					ypos = 0;
@@ -440,15 +541,15 @@ int SDLGui_FileSelect(char *path_and_nam
 				{
 					/* open a zip file */
 					zipfiles = ZIP_GetFiles(tempstr);
-					if( zipfiles != NULL && browsingzip == FALSE )
+					if (zipfiles != NULL && browsingzip == FALSE)
 					{
 						selection = retbut-SGFSDLG_ENTRY1+ypos;
 						strcpy(fname, files[selection]->d_name);
 						File_ShrinkName(dlgfname, fname, DLGFNAME_SIZE);
-						browsingzip=TRUE;
-						strcpy(zipdir, "");
+						browsingzip = TRUE;
+						zipdir[0] = '\0'; /* zip root */
 						File_ShrinkName(dlgpath, zipdir, DLGPATH_SIZE);
-						reloaddir = refreshentries = TRUE;
+						reloaddir = TRUE;
 						ypos = 0;
 					}
 
@@ -471,76 +572,62 @@ int SDLGui_FileSelect(char *path_and_nam
 			{
 			case SGFSDLG_UPDIR:                 /* Change path to parent directory */
 
-				if( browsingzip )
+				if (browsingzip)
 				{
-					/* close the zip file */
-					if( strcmp(zipdir, "") == 0 )
+					/* close the zip file? */
+					if (!zipdir[0])
 					{
-						reloaddir = refreshentries = TRUE;
 						/* free zip file entries */
 						ZIP_FreeZipDir(zipfiles);
+						browsingzip = FALSE;
 						zipfiles = NULL;
-						/* Copy the path name to the dialog */
 						File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
-						browsingzip = FALSE;
-						reloaddir = TRUE;
-						selection = -1;         /* Remove old selection */
-						fname[0] = 0;
-						dlgfname[0] = 0;
-						ypos = 0;
 					}
 					else
 					{
-						i=strlen(zipdir)-1;
-						n=0;
-						while(i > 0 && n < 2)
-							if( zipdir[i--] == '/' )
-								n++;
-						if(zipdir[i+1] == '/')
-							zipdir[i+2] = '\0';
-						else
-							zipdir[0] = '\0';
-
+						/* remove last dir from zipdir path */
+						File_PathShorten(zipdir, 1);
+						correct_zip_root(zipdir);
 						File_ShrinkName(dlgpath, zipdir, DLGPATH_SIZE);
-						reloaddir = TRUE;
-						selection = -1;         /* Remove old selection */
 						zipfilename[0] = '\0';
-						dlgfname[0] = 0;
-						ypos = 0;
 					}
 				}  /* not a zip file: */
-				else if( strlen(path)>2 )
+				else
 				{
-					char *ptr;
-					File_CleanFileName(path);
-					ptr = strrchr(path, '/');
-					if(ptr)
-						*(ptr+1) = 0;
-					File_AddSlashToEndFileName(path);
-					reloaddir = TRUE;
-					File_ShrinkName(dlgpath, path, DLGPATH_SIZE);  /* Copy the path name to the dialog */
-					selection = -1;             /* Remove old selection */
-					fname[0] = 0;
-					dlgfname[0] = 0;
-					ypos = 0;
+					File_PathShorten(path, 1);
+					File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
 				}
+				reloaddir = TRUE;
 				break;
-			case SGFSDLG_ROOTDIR:               /* Change to root directory */
-				if( browsingzip )
+
+			case SGFSDLG_HOMEDIR:               /* Change to home directory */
+				home = getenv("HOME");
+				if (home == NULL)
+					break;
+				if (browsingzip)
 				{
 					/* free zip file entries */
 					ZIP_FreeZipDir(zipfiles);
 					zipfiles = NULL;
 					browsingzip = FALSE;
 				}
+				strcpy(path, home);
+				File_AddSlashToEndFileName(path);
+				File_ShrinkName(dlgpath, path, DLGPATH_SIZE);
+				reloaddir = TRUE;
+				break;
 
+			case SGFSDLG_ROOTDIR:               /* Change to root directory */
+				if (browsingzip)
+				{
+					/* free zip file entries */
+					ZIP_FreeZipDir(zipfiles);
+					zipfiles = NULL;
+					browsingzip = FALSE;
+				}
 				strcpy(path, "/");
-				reloaddir = TRUE;
 				strcpy(dlgpath, path);
-				selection = -1;                 /* Remove old selection */
-				fname[0] = 0;
-				dlgfname[0] = 0;
-				ypos = 0;
+				reloaddir = TRUE;
 				break;
 			case SGFSDLG_UP:                    /* Scroll up */
 				DlgFileSelect_ScrollUp();
@@ -553,31 +640,34 @@ int SDLGui_FileSelect(char *path_and_nam
 			case SGFSDLG_FILENAME:              /* User entered new filename */
 				strcpy(fname, dlgfname);
 				break;
+			case SGFSDLG_SHOWHIDDEN:            /* Show/hide hidden files */
+				reloaddir = TRUE;
+				ypos = 0;
+				break;
 			case SDLGUI_UNKNOWNEVENT:
 				DlgFileSelect_HandleSdlEvents(&sdlEvent);
 				break;
 			} /* switch */
+      
+			if (reloaddir)
+			{
+				/* Remove old selection */
+				selection = -1;
+				fname[0] = 0;
+				dlgfname[0] = 0;
+				ypos = 0;
+			}
 		} /* other button code */
 
 
 	} /* do */
-	while (retbut!=SGFSDLG_OKAY && retbut!=SGFSDLG_CANCEL && retbut!=SDLGUI_QUIT && !bQuitProgram);
+	while (retbut!=SGFSDLG_OKAY && retbut!=SGFSDLG_CANCEL
+	       && retbut!=SDLGUI_QUIT && retbut != SDLGUI_ERROR && !bQuitProgram);
 
 	if (oldcursorstate == SDL_DISABLE)
 		SDL_ShowCursor(SDL_DISABLE);
 
-	File_makepath(path_and_name, path, fname, NULL);
-
-	/* Free old allocated memory: */
-	if (files != NULL)
-	{
-		for(i=0; i<entries; i++)
-		{
-			free(files[i]);
-		}
-		free(files);
-		files = NULL;
-	}
+	files_free(files);
 
 	if (browsingzip)
 	{
@@ -586,19 +676,49 @@ int SDLGui_FileSelect(char *path_and_nam
 		zipfiles = NULL;
 	}
 
-	if (zip_path != NULL)
+	if (retbut == SGFSDLG_OKAY)
 	{
-		if( browsingzip )
+		if (zip_path)
+			*zip_path = zip_get_path(zipdir, zipfilename, browsingzip);
+		retpath = File_MakePath(path, fname, NULL);
+	}
+	else
+		retpath = NULL;
+	free(pStringMem);
+	return retpath;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/* Let user browse for a file, confname is used as default.
+ * If bAllowNew is true, user can select new files also.
+ * 
+ * If no file is selected, or there's some problem with the file,
+ * return FALSE and clear dlgname & confname.
+ * Otherwise return TRUE, set dlgname & confname to the new file name
+ * (dlgname is shrinked & limited to maxlen and confname is assumed
+ * to have FILENAME_MAX amount of space).
+ */
+BOOL SDLGui_FileConfSelect(char *dlgname, char *confname, int maxlen, BOOL bAllowNew)
+{
+	char *selname;
+	
+	selname = SDLGui_FileSelect(confname, NULL, bAllowNew);
+	if (selname)
+	{
+		if (!File_DoesFileNameEndWithSlash(selname) &&
+		    (bAllowNew || File_Exists(selname)))
 		{
-			strcpy(zip_path, zipdir);
-			strcat(zip_path, zipfilename);
+			strncpy(confname, selname, FILENAME_MAX);
+			confname[FILENAME_MAX-1] = '\0';
+			File_ShrinkName(dlgname, selname, maxlen);
 		}
 		else
-			zip_path[0] = '\0';
+		{
+			dlgname[0] = confname[0] = 0;
+		}
+		free(selname);
+		return TRUE;
 	}
-
-	free(pStringMem);
-
-	return(retbut == SGFSDLG_OKAY);
+	return FALSE;
 }
-