X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstream.c;h=96ab73fb08dcc97c8857541c0d91bafedbe7b33b;hb=1517709438931d163e561b67991af15ec1d358c5;hp=a7f991d9f0805b370300c727ee859fcc10ad9bda;hpb=1d19cdbaca8b7cd239cd5d1e1f650bd48fa37bee;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/stream.c b/libchimara/stream.c
index a7f991d..96ab73f 100644
--- a/libchimara/stream.c
+++ b/libchimara/stream.c
@@ -24,29 +24,16 @@ stream_new_common(glui32 rock)
 	/* Add it to the global stream list */
 	glk_data->stream_list = g_list_prepend(glk_data->stream_list, str);
 	str->stream_list = glk_data->stream_list;
-	
+
 	return str;
 }
 
-/* Internal function: Stuff to do upon closing any type of stream. */
+/* Internal function: Stuff to do upon closing any type of stream. Call only 
+ from Glk thread. */
 void
 stream_close_common(strid_t str, stream_result_t *result)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
-	/* Remove the stream from the global stream list */
-	glk_data->stream_list = g_list_delete_link(glk_data->stream_list, str->stream_list);
-	
-	/* If it was the current output stream, set that to NULL */
-	if(glk_data->current_stream == str)
-		glk_data->current_stream = NULL;
-		
-	/* If it was one or more windows' echo streams, set those to NULL */
-	winid_t win;
-	for(win = glk_window_iterate(NULL, NULL); win; 
-		win = glk_window_iterate(win, NULL))
-		if(win->echo_stream == str)
-			win->echo_stream = NULL;
 
 	if(glk_data->unregister_obj)
 	{
@@ -54,12 +41,26 @@ stream_close_common(strid_t str, stream_result_t *result)
 		str->disprock.ptr = NULL;
 	}
 	
+	/* If the stream was one or more windows' echo streams, set those to NULL */
+	winid_t win;
+	for(win = glk_window_iterate(NULL, NULL); win; 
+		win = glk_window_iterate(win, NULL))
+		if(win->echo_stream == str)
+			win->echo_stream = NULL;
+	
 	/* Return the character counts */
 	if(result) 
 	{
 		result->readcount = str->read_count;
 		result->writecount = str->write_count;
 	}
+
+	/* Remove the stream from the global stream list */
+	glk_data->stream_list = g_list_delete_link(glk_data->stream_list, str->stream_list);
+	
+	/* If it was the current output stream, set that to NULL */
+	if(glk_data->current_stream == str)
+		glk_data->current_stream = NULL;
 	
 	str->magic = MAGIC_FREE;
 	g_free(str);
@@ -102,7 +103,8 @@ glk_stream_iterate(strid_t str, glui32 *rockptr)
  * @str: A stream.
  * 
  * Retrieves the stream @str's rock value. See <link 
- * linkend="chimara-Rocks">Rocks</link>.
+ * linkend="chimara-Rocks">Rocks</link>. Window streams always have rock 0; all
+ * other streams return whatever rock you created them with.
  *
  * Returns: A rock value.
  */
@@ -191,7 +193,7 @@ glk_put_char_uni(glui32 ch)
  * equivalent to
  * |[
  * for (ptr = s; *ptr; ptr++)
- * 	#glk_put_char(*ptr);
+ *     glk_put_char(*ptr);
  * ]|
  * However, it may be more efficient.
  */
@@ -228,7 +230,7 @@ glk_put_string_uni(glui32 *s)
  * to:
  * |[
  * for (i = 0; i < len; i++)
- * 	#glk_put_char(buf[i]);
+ *     glk_put_char(buf[i]);
  * ]|
  * However, it may be more efficient.
  */
@@ -282,6 +284,7 @@ glk_stream_open_memory(char *buf, glui32 buflen, glui32 fmode, glui32 rock)
 	str->file_mode = fmode;
 	str->type = STREAM_TYPE_MEMORY;
 	str->mark = 0;
+	str->endmark = 0;
 	str->unicode = FALSE;
 
 	if(buf && buflen) 
@@ -320,6 +323,7 @@ glk_stream_open_memory_uni(glui32 *buf, glui32 buflen, glui32 fmode, glui32 rock
 	str->file_mode = fmode;
 	str->type = STREAM_TYPE_MEMORY;
 	str->mark = 0;
+	str->endmark = 0;
 	str->unicode = TRUE;
 
 	if(buf && buflen) 
@@ -340,7 +344,7 @@ file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
 {
 	VALID_FILEREF(fileref, return NULL);
 	
-	gchar *modestr;
+	const gchar *modestr;
 	/* Binary mode is 0x000, text mode 0x100 */
 	gboolean binary = !(fileref->usage & fileusage_TextMode);
 	switch(fmode) 
@@ -350,20 +354,23 @@ file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
 				ILLEGAL_PARAM("Tried to open a nonexistent file, '%s', in read mode", fileref->filename);
 				return NULL;
 			}
-			modestr = g_strdup(binary? "rb" : "r");
+			modestr = binary? "rb" : "r";
 			break;
 		case filemode_Write:
-			modestr = g_strdup(binary? "wb" : "w");
+			modestr = binary? "wb" : "w";
 			break;
 		case filemode_WriteAppend:
-			modestr = g_strdup(binary? "ab" : "a");
-			break;
 		case filemode_ReadWrite:
-			if( g_file_test(fileref->filename, G_FILE_TEST_EXISTS) ) {
-				modestr = g_strdup(binary? "r+b" : "r+");
-			} else {
-				modestr = g_strdup(binary? "w+b" : "w+");
+		{
+			/* We have to open the file first and then close it, in order to
+			 both make sure it exists and be able to seek in it later */
+			FILE *fp = g_fopen(fileref->filename, binary? "ab" : "a");
+			if(fclose(fp) != 0) {
+				IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
+				return NULL;
 			}
+			modestr = binary? "r+b" : "r+";
+		}
 			break;
 		default:
 			ILLEGAL_PARAM("Invalid file mode: %u", fmode);
@@ -371,12 +378,17 @@ file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
 	}
 	
 	FILE *fp = g_fopen(fileref->filename, modestr);
-	g_free(modestr);
 	if(fp == NULL) {
 		IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
 		return NULL;
 	}
 	
+	/* Fast-forward to the end if we are appending */
+	if(fmode == filemode_WriteAppend && fseek(fp, 0, SEEK_END) != 0) {
+		IO_WARNING("Error fast-forwarding file to end", fileref->filename, g_strerror(errno));
+		return NULL;
+	}
+
 	/* If they opened a file in write mode but didn't specifically get
 	permission to do so, complain if the file already exists */
 	if(fileref->orig_filemode == filemode_Read && fmode != filemode_Read) {
@@ -420,9 +432,22 @@ file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
  * Opens a stream which reads to or writes from a disk file. If @fmode is
  * %filemode_Read, the file must already exist; for the other modes, an empty
  * file is created if none exists. If @fmode is %filemode_Write, and the file
- * already exists, it is truncated down to zero length (an empty file). If
- * @fmode is %filemode_WriteAppend, the file mark is set to the end of the 
- * file.
+ * already exists, it is truncated down to zero length (an empty file); the
+ * other modes do not truncate. If @fmode is %filemode_WriteAppend, the file
+ * mark is set to the end of the file.
+ *
+ * <note><para>
+ *   Note, again, that this doesn't match stdio's fopen() call very well. See
+ *   <link linkend="filemode-WriteAppend">the file mode constants</link>.
+ * </para></note>
+ *
+ * If the filemode requires the file to exist, but the file does not exist,
+ * glk_stream_open_file() returns %NULL.
+ *
+ * The file may be read or written in text or binary mode; this is determined
+ * by the @fileref argument. Similarly, platform-dependent attributes such as
+ * file type are determined by @fileref. See <link
+ * linkend="chimara-File-References">File References</link>.
  *
  * When writing in binary mode, Unicode values (characters greater than 255)
  * cannot be written to the file. If you try, they will be stored as 0x3F