GNU standards require "file name" instead of "filename" in

[pspp-builds.git] / src / language / line-buffer.c

diff --git a/src/language/line-buffer.c b/src/language/line-buffer.c
index 0803f0825ed712e2be08b27f19263adc28fb0d9c..24b09b8cd3d4fab225b69720d67934729e46d060 100644 (file)
--- a/src/language/line-buffer.c
+++ b/src/language/line-buffer.c
@@ -26,7 +26,7 @@
 #include <libpspp/alloc.h>
 #include <language/command.h>
 #include <libpspp/message.h>
-#include <data/filename.h>
+#include <data/file-name.h>
 #include <language/lexer/lexer.h>
 #include <data/settings.h>
 #include <libpspp/str.h>
@@ -45,7 +45,7 @@ struct getl_source
     struct getl_source *next;          /* Next file in list. */
 
     /* Current location. */
-    char *fn;                          /* Filename. */
+    char *fn;                          /* File name. */
     int ln;                            /* Line number. */
 
     enum getl_source_type
@@ -123,7 +123,7 @@ void
 getl_add_include_dir (const char *path)
 {
   if (ds_length (&getl_include_path))
-    ds_putc (&getl_include_path, PATH_DELIMITER);
+    ds_putc (&getl_include_path, ':');
 
   ds_puts (&getl_include_path, path);
 }
@@ -228,15 +228,15 @@ getl_append_syntax_file (const char *fn)
   append_source (create_syntax_file_source (fn));
 }
 
-/* Inserts the given file with filename FN into the current file after
-   the current line. */
+/* Inserts the given file with name FN into the current file
+   after the current line. */
 void
 getl_include_syntax_file (const char *fn)
 {
   if (cur_source != NULL) 
     {
       char *found_fn = fn_search_path (fn, ds_c_str (&getl_include_path),
-                                       fn_dirname (cur_source->fn));
+                                       fn_dir_name (cur_source->fn));
       if (found_fn != NULL) 
         {
           include_source (create_syntax_file_source (found_fn));
@@ -427,7 +427,7 @@ err_location (struct file_locator *f)
   if (nfile_loc)
     *f = *file_loc[nfile_loc - 1];
   else
-    getl_location (&f->filename, &f->line_number);
+    getl_location (&f->file_name, &f->line_number);
 }
 
 /* Reads a line from syntax file source S into LINE.
@@ -438,7 +438,7 @@ read_syntax_file (struct string *line, struct getl_source *s)
   /* Open file, if not yet opened. */
   if (s->u.syntax_file == NULL)
     {
-      msg (VM (1), _("%s: Opening as syntax file."), s->fn);
+      verbose_msg (1, _("opening \"%s\" as syntax file"), s->fn);
       s->u.syntax_file = fn_open (s->fn, "r");
 
       if (s->u.syntax_file == NULL)
@@ -465,7 +465,7 @@ read_syntax_file (struct string *line, struct getl_source *s)
 
   /* Echo to listing file, if configured to do so. */
   if (get_echo ())
-    tab_output_text (TAB_LEFT | TAT_FIX, ds_c_str (line));
+    tab_output_text (TAB_LEFT | TAB_FIX, ds_c_str (line));
 
   return true;
 }