Greatly simplify PSPP configuration.

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

diff --git a/src/data/file-name.h b/src/data/file-name.h
index b4231d2f87178b841f85cf62d69a76e15b871b5e..8e04d36a926dffb80618b236f60cf7e4309d802b 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010 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
@@ -19,18 +19,11 @@
 
 #include <stdio.h>
 #include <stdbool.h>
-#include <libpspp/str.h>
 #include <sys/types.h>
 
-/* Search path for configuration files. */
-extern const char *config_path;
+struct string_set;
 
-void fn_init (void);
-
-void fn_interp_vars (struct substring src,
-                     const char *(*getenv) (const char *),
-                     struct string *dst);
-char *fn_search_path (const char *base_name, const char *path);
+char *fn_search_path (const char *base_name, char **path);
 char *fn_dir_name (const char *fn);
 char *fn_extension (const char *fn);
 
@@ -52,4 +45,6 @@ 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 */