X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.h;h=f38d0f3e141024fcebc55db653998dbc4bca84b7;hb=f70f1b22e925d55c246372376de1c6ffaacf8a4b;hp=f9620b035dfb6388aa25112533981aebd5a0f365;hpb=5f168bf8465ae50ba5c2c761b52f29a0500c0658;p=pspp-builds.git

diff --git a/src/data/file-name.h b/src/data/file-name.h
index f9620b03..f38d0f3e 100644
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -22,27 +22,16 @@
 
 #include <stdio.h>
 
-/* Directory separator and path delimiter for this OS. */
-#ifndef __MSDOS__
-#define DIR_SEPARATOR '/'
-#define PATH_DELIMITER ':'
-#define DIR_SEPARATOR_STRING "/"
-#define PATH_DELIMITER_STRING ":"
-#else
-#define DIR_SEPARATOR '\\'
-#define PATH_DELIMITER ';'
-#define DIR_SEPARATOR_STRING "\\"
-#define PATH_DELIMITER_STRING ";"
-#endif
-
 /* Search path for configuration files. */
 extern const char *config_path;
 
 void fn_init (void);
 
 struct string;
-void fn_interp_vars (struct string *target, 
-                     const char *(*getenv) (const char *));
+struct substring;
+void fn_interp_vars (struct substring src, 
+                     const char *(*getenv) (const char *),
+                     struct string *dst);
 char *fn_tilde_expand (const char *fn);
 char *fn_search_path (const char *base_name, const char *path,
 		      const char *prefix);
@@ -63,7 +52,7 @@ 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);
 
-struct file_identity *fn_get_identity (const char *filename);
+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 *);