Applied patch #5661

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

diff --git a/src/data/file-name.h b/src/data/file-name.h
index d4540ffe1bc4a256a220341e68a203e3bb46346d..a5f62776647e1c2e8ba114d181b0b71cb1d1aeec 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,6 +20,7 @@
 #define FILE_NAME_H 1
 
 #include <stdio.h>
+#include <stdbool.h>
 
 /* Search path for configuration files. */
 extern const char *config_path;
@@ -28,20 +28,21 @@ 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);
+char *fn_search_path (const char *base_name, const char *path);
 char *fn_normalize (const char *fn);
 char *fn_dir_name (const char *fn);
 char *fn_extension (const char *fn);
 
 char *fn_get_cwd (void);
 
-int fn_is_absolute (const char *fn);
-int fn_is_special (const char *fn);
-int fn_exists (const char *fn);
+bool fn_is_absolute (const char *fn);
+bool fn_is_special (const char *fn);
+bool fn_exists (const char *fn);
 char *fn_readlink (const char *fn);
 
 const char *fn_getenv (const char *variable);
@@ -50,7 +51,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 *);