#include "fileref.h"
#include "stream.h"
-extern ChimaraGlkPrivate *glk_data;
+extern GPrivate *glk_data_key;
/**
* glkunix_stream_open_pathname:
* @pathname: A path to a file, in the system filename encoding.
- * @usage: Bitfield with one or more of the <code>fileusage_</code> constants.
+ * @textmode: Bitfield with one or more of the <code>fileusage_</code> constants.
* @rock: The new stream's rock value.
*
* Opens an arbitrary file, in read-only mode. Note that this function is
* Returns: A new stream, or %NULL if the file operation failed.
*/
strid_t
-glkunix_stream_open_pathname(char *pathname, glui32 usage, glui32 rock)
+glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock)
{
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
if(!glk_data->in_startup)
ILLEGAL("glkunix_stream_open_pathname() may only be called from "
"glkunix_startup_code().");
g_return_val_if_fail(pathname, NULL);
g_return_val_if_fail(strlen(pathname) > 0, NULL);
- frefid_t fileref = fileref_new(pathname, rock, usage, filemode_Read);
+ frefid_t fileref = fileref_new(pathname, rock, textmode, filemode_Read);
return file_stream_new(fileref, filemode_Read, rock, FALSE);
}
{
g_return_if_fail(filename);
g_return_if_fail(strlen(filename) > 0);
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
gchar *dirname = g_path_get_dirname(filename);
if(!g_file_test(dirname, G_FILE_TEST_IS_DIR))