fbuf: New data structure for buffered file I/O.

[pspp] / src / data / file-name.h

diff --git a/src/data/file-name.h b/src/data/file-name.h
index 8e04d36a926dffb80618b236f60cf7e4309d802b..23c2e9da97f3057cc428b2f0c7950d4ad43ce0c8 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -21,30 +21,30 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-struct string_set;
+struct file_handle ;
 
 char *fn_search_path (const char *base_name, char **path);
-char *fn_dir_name (const char *fn);
-char *fn_extension (const char *fn);
+char *fn_extension (const struct file_handle *);
 
-bool fn_is_absolute (const char *fn);
-bool fn_is_special (const char *fn);
-bool fn_exists (const char *fn);
+bool fn_exists (const struct file_handle *);
 
-const char *fn_getenv (const char *variable);
-const char *fn_getenv_default (const char *variable, const char *def);
 
-FILE *fn_open (const char *fn, const char *mode);
-int fn_close (const char *fn, FILE *file);
+FILE *fn_fopen (const struct file_handle *, const char *mode);
+int fn_close (const struct file_handle *, FILE *file);
 
-FILE *create_stream (const char *fn, const char *mode, mode_t permissions);
-
-struct file_identity *fn_get_identity (const char *file_name);
-void fn_free_identity (struct file_identity *);
-int fn_compare_file_identities (const struct file_identity *,
-                                const struct file_identity *);
-unsigned int fn_hash_identity (const struct file_identity *);
+int fn_open (const struct file_handle *, int flags, mode_t mode);
 
 const char * default_output_path (void);
 
+#if defined _WIN32 || defined __WIN32__
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#define UNICODE 1
+#include <windows.h>
+#else
+typedef char TCHAR;
+#endif
+
+TCHAR * convert_to_filename_encoding (const char *s, size_t len, const char *current_encoding);
+
+
 #endif /* file-name.h */