X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Ffileref.c;h=716586c4a23c261e092a47f198d4ec6423669a8b;hb=1e0dc5378f314f555e3b923c6d95f5017abd528b;hp=5aa4ff33bddac9bc53ef6d778ef52289f45c6eae;hpb=c9c4577dd8b78fb65d5475e1c40836d22dfd80c3;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/fileref.c b/libchimara/fileref.c
index 5aa4ff3..716586c 100644
--- a/libchimara/fileref.c
+++ b/libchimara/fileref.c
@@ -10,16 +10,17 @@
 #include "chimara-glk-private.h"
 #include "gi_dispa.h"
 
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
 
-/* Internal function: create a fileref using the given parameters. */
+/* Internal function: create a fileref using the given parameters. If @basename
+is NULL, compute a basename from @filename. */
 frefid_t
-fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode)
+fileref_new(char *filename, char *basename, glui32 rock, glui32 usage, glui32 orig_filemode)
 {
 	g_return_val_if_fail(filename != NULL, NULL);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	frefid_t f = g_new0(struct glk_fileref_struct, 1);
 	f->magic = MAGIC_FILEREF;
 	f->rock = rock;
@@ -27,6 +28,10 @@ fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode)
 		f->disprock = (*glk_data->register_obj)(f, gidisp_Class_Fileref);
 	
 	f->filename = g_strdup(filename);
+	if(basename)
+		f->basename = g_strdup(basename);
+	else
+		f->basename = g_path_get_basename(filename);
 	f->usage = usage;
 	f->orig_filemode = orig_filemode;
 	
@@ -40,8 +45,8 @@ fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode)
 static void
 fileref_close_common(frefid_t fref)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	glk_data->fileref_list = g_list_delete_link(glk_data->fileref_list, fref->fileref_list);
 
 	if(glk_data->unregister_obj)
@@ -50,8 +55,8 @@ fileref_close_common(frefid_t fref)
 		fref->disprock.ptr = NULL;
 	}
 	
-	if(fref->filename)
-		g_free(fref->filename);
+	g_free(fref->filename);
+	g_free(fref->basename);
 	
 	fref->magic = MAGIC_FREE;
 	g_free(fref);
@@ -73,7 +78,7 @@ glk_fileref_iterate(frefid_t fref, glui32 *rockptr)
 {
 	VALID_FILEREF_OR_NULL(fref, return NULL);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	GList *retnode;
 	
 	if(fref == NULL)
@@ -147,7 +152,8 @@ glk_fileref_create_temp(glui32 usage, glui32 rock)
 		return NULL;
 	}
 	
-	frefid_t f = fileref_new(filename, rock, usage, filemode_Write);
+	/* Pass a basename of "" to ensure that this file can't be repurposed */
+	frefid_t f = fileref_new(filename, "", rock, usage, filemode_Write);
 	g_free(filename);
 	return f;
 }
@@ -219,8 +225,8 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 	for each usage */
 	GtkWidget *chooser;
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	gdk_threads_enter();
 
 	switch(fmode)
@@ -240,11 +246,7 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 				NULL);
 			gtk_file_chooser_set_action(GTK_FILE_CHOOSER(chooser), GTK_FILE_CHOOSER_ACTION_SAVE);
-
-			/* COMPAT: */
-#if GTK_CHECK_VERSION(2,8,0)
 			gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
-#endif
 			break;
 		case filemode_ReadWrite:
 		case filemode_WriteAppend:
@@ -313,7 +315,7 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 		return NULL;
 	}
 	gchar *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(chooser) );
-	frefid_t f = fileref_new(filename, rock, usage, fmode);
+	frefid_t f = fileref_new(filename, NULL, rock, usage, fmode);
 	g_free(filename);
 	gtk_widget_destroy(chooser);
 
@@ -430,8 +432,8 @@ glk_fileref_create_by_name(glui32 usage, char *name, glui32 rock)
 {
 	g_return_val_if_fail(name != NULL && strlen(name) > 0, NULL);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	/* Do any string-munging here to remove illegal Latin-1 characters from 
 	filename. On ext3, the only illegal characters are '/' and '\0', but the Glk
 	spec calls for removing any other tricky characters. */
@@ -474,7 +476,6 @@ glk_fileref_create_by_name(glui32 usage, char *name, glui32 rock)
 			return NULL;
 	}
 	filename = g_strconcat(buf, extension, NULL);
-	g_free(buf);
 	
 	/* Find out what encoding filenames are in */
 	const gchar **charsets; /* Do not free */
@@ -496,8 +497,9 @@ glk_fileref_create_by_name(glui32 usage, char *name, glui32 rock)
 		path = g_strdup(osname);
 	g_free(osname);
 	
-	frefid_t f = fileref_new(path, rock, usage, filemode_ReadWrite);
+	frefid_t f = fileref_new(path, buf, rock, usage, filemode_ReadWrite);
 	g_free(path);
+	g_free(buf);
 	return f;
 }
 
@@ -536,7 +538,7 @@ frefid_t
 glk_fileref_create_from_fileref(glui32 usage, frefid_t fref, glui32 rock)
 {
 	VALID_FILEREF(fref, return NULL);
-	return fileref_new(fref->filename, rock, usage, fref->orig_filemode);
+	return fileref_new(fref->filename, fref->basename, rock, usage, fref->orig_filemode);
 }
 
 /**