Fixed a bug in creating fileref from fileref

glk_fileref_create_from_fileref() would use the entire pathname of
the old fileref as its basename. Now it uses the original basename.

diff --git a/libchimara/fileref.c b/libchimara/fileref.c
index 5aa4ff33bddac9bc53ef6d778ef52289f45c6eae..d4f2043dc454fc322c627844d22f168060b47e61 100644 (file)
--- a/libchimara/fileref.c
+++ b/libchimara/fileref.c
@@ -12,9 +12,10 @@
 
 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);
 
@@ -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;
        
@@ -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);
@@ -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;
 }
@@ -313,7 +319,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);
 
@@ -474,7 +480,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 +501,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 +542,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);
 }
 
 /**

diff --git a/libchimara/fileref.h b/libchimara/fileref.h
index c2d8f4666b2124e94f860804a8f96dac3e39a982..03ab4fe94fcd99c5cc98f8eb7ba1da9c0af3aca7 100644 (file)
--- a/libchimara/fileref.h
+++ b/libchimara/fileref.h
@@ -22,10 +22,11 @@ struct glk_fileref_struct
        /* Fileref parameters */
        gchar *filename; /* Always stored in the default filename encoding, not
                UTF8 or Latin-1 */
+       char *basename; /* Name from which real filename was derived */
        glui32 orig_filemode; /* Used to check if the user gets a fileref in read
                mode and then tries to open it in write mode */
        glui32 usage;
 };
 
-G_GNUC_INTERNAL frefid_t fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode);
+G_GNUC_INTERNAL frefid_t fileref_new(char *filename, char *basename, glui32 rock, glui32 usage, glui32 orig_filemode);
 #endif

diff --git a/libchimara/glkunix.c b/libchimara/glkunix.c
index 284fc1cd19f74f8f5df9ba622e4feaf26af68a83..ddaf84806c2bed15a65252bab4e9a83c0d4f0164 100644 (file)
--- a/libchimara/glkunix.c
+++ b/libchimara/glkunix.c
@@ -36,7 +36,7 @@ glkunix_stream_open_pathname_gen(char *pathname, glui32 writemode, glui32 textmo
        g_return_val_if_fail(pathname, NULL);
        g_return_val_if_fail(strlen(pathname) > 0, NULL);
 
-       frefid_t fileref = fileref_new(pathname, rock,
+       frefid_t fileref = fileref_new(pathname, NULL, rock,
                textmode? fileusage_TextMode : fileusage_BinaryMode,
                writemode? filemode_Write : filemode_Read);
        return file_stream_new(fileref, writemode? filemode_Write : filemode_Read, rock, FALSE);
@@ -67,7 +67,7 @@ glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock)
        g_return_val_if_fail(pathname, NULL);
        g_return_val_if_fail(strlen(pathname) > 0, NULL);
 
-       frefid_t fileref = fileref_new(pathname, rock, textmode? fileusage_TextMode : fileusage_BinaryMode, filemode_Read);
+       frefid_t fileref = fileref_new(pathname, NULL, rock, textmode? fileusage_TextMode : fileusage_BinaryMode, filemode_Read);
        return file_stream_new(fileref, filemode_Read, rock, FALSE);
 }
 
@@ -190,4 +190,4 @@ parse_command_line(glkunix_argumentlist_t glkunix_arguments[], int argc, char *a
        g_slist_free(arglist);
        
        return TRUE;
-}
\ No newline at end of file
+}