Change license from GPLv2+ to GPLv3+.

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

diff --git a/src/data/file-name.h b/src/data/file-name.h
index f9620b035dfb6388aa25112533981aebd5a0f365..d18ce22a5f51d418ea16c6d838e14ccca1412cc9 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -1,61 +1,41 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    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
-   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
 
 #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
+#include <stdbool.h>
+#include <libpspp/str.h>
 
 /* 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 *));
-char *fn_tilde_expand (const char *fn);
-char *fn_search_path (const char *base_name, const char *path,
-                     const char *prefix);
-char *fn_normalize (const char *fn);
+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_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);
-char *fn_readlink (const char *fn);
+bool fn_is_absolute (const char *fn);
+bool fn_is_special (const char *fn);
+bool fn_exists (const char *fn);
 
 const char *fn_getenv (const char *variable);
 const char *fn_getenv_default (const char *variable, const char *def);
@@ -63,7 +43,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 *);