Merge branch 'master' into output

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

diff --git a/src/data/file-name.h b/src/data/file-name.h
index 9cd5a4f23ad2bf0e2e6286d0ed48faaa7085c4a4..327d716e7f57723da0922a0179779fe9cd15e620 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef FILE_NAME_H
 #define FILE_NAME_H 1
@@ -22,6 +20,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <libpspp/str.h>
+#include <sys/types.h>
 
 /* Search path for configuration files. */
 extern const char *config_path;
@@ -29,8 +28,9 @@ extern const char *config_path;
 void fn_init (void);
 
 void fn_interp_vars (struct substring src,
-                     const char *(*getenv) (const char *),
-                     struct string *dst);
+                     void (*insert_variable) (const char *var,
+                                              struct string *dst, void *aux),
+                     void *aux, struct string *dst);
 char *fn_search_path (const char *base_name, const char *path);
 char *fn_dir_name (const char *fn);
 char *fn_extension (const char *fn);
@@ -45,9 +45,14 @@ 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 *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 *);
+
+const char * default_output_path (void);
 
 #endif /* file-name.h */