X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fsyntax-file.c;h=5521972477f270a1a046b9a99f5b0b3e5a117f69;hb=b4a1fe2442a0b6fc8716e92574d33726d7170fe8;hp=e41466cedd55d180986749cc4a27abc98e7cb9a4;hpb=b8b67a1e1f709640ccdb3422a591b938edb0ceea;p=pspp

diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c
index e41466cedd..5521972477 100644
--- a/src/language/syntax-file.c
+++ b/src/language/syntax-file.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   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 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/>. */
 
 #include <config.h>
 
@@ -23,6 +20,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include <data/file-name.h>
@@ -30,26 +28,27 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
+#include <libpspp/cast.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
 #include <libpspp/version.h>
-#include <output/table.h>
+#include <output/tab.h>
 
 #include <libpspp/ll.h>
 
 #include "prompt.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 #include <libpspp/getl.h>
 
 
-struct syntax_file_source 
+struct syntax_file_source
   {
     struct getl_interface parent ;
 
@@ -63,29 +62,32 @@ struct syntax_file_source
 static const char *
 name (const struct getl_interface *s)
 {
-  const struct syntax_file_source *sfs = (const struct syntax_file_source *) s;
+  const struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+                                                  parent);
   return sfs->fn;
 }
 
 static int
 line_number (const struct getl_interface *s)
 {
-  const struct syntax_file_source *sfs = (const struct syntax_file_source *) s;
+  const struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+                                                  parent);
   return sfs->ln;
 }
 
 
 /* Reads a line from syntax file source S into LINE.
    Returns true if successful, false at end of file. */
-bool
-read_syntax_file (struct getl_interface *s, struct string *line)
+static bool
+read_syntax_file (struct getl_interface *s,
+                  struct string *line)
 {
-  struct syntax_file_source *sfs = (struct syntax_file_source *) s;
+  struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+                                            parent);
 
   /* Open file, if not yet opened. */
   if (sfs->syntax_file == NULL)
     {
-      verbose_msg (1, _("opening \"%s\" as syntax file"), sfs->fn);
       sfs->syntax_file = fn_open (sfs->fn, "r");
 
       if (sfs->syntax_file == NULL)
@@ -97,10 +99,11 @@ read_syntax_file (struct getl_interface *s, struct string *line)
 
   /* Read line from file and remove new-line.
      Skip initial "#! /usr/bin/pspp" line. */
-  do 
+  do
     {
       sfs->ln++;
-      if (!ds_read_line (line, sfs->syntax_file))
+      ds_clear (line);
+      if (!ds_read_line (line, sfs->syntax_file, SIZE_MAX))
         {
           if (ferror (sfs->syntax_file))
             msg (ME, _("Reading `%s': %s."), sfs->fn, strerror (errno));
@@ -110,17 +113,14 @@ read_syntax_file (struct getl_interface *s, struct string *line)
     }
   while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
 
-  /* Echo to listing file, if configured to do so. */
-  if (get_echo ())
-    tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
-
   return true;
 }
 
 static void
 syntax_close (struct getl_interface *s)
 {
-  struct syntax_file_source *sfs = (struct syntax_file_source *) s;
+  struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
+                                            parent);
 
   if (sfs->syntax_file && EOF == fn_close (sfs->fn, sfs->syntax_file))
     msg (MW, _("Closing `%s': %s."), sfs->fn, strerror (errno));
@@ -137,7 +137,7 @@ always_false (const struct getl_interface *s UNUSED)
 
 /* Creates a syntax file source with file name FN. */
 struct getl_interface *
-create_syntax_file_source (const char *fn) 
+create_syntax_file_source (const char *fn)
 {
   struct syntax_file_source *ss = xzalloc (sizeof (*ss));
 
@@ -150,6 +150,6 @@ create_syntax_file_source (const char *fn)
   ss->parent.name = name ;
   ss->parent.location = line_number;
 
-  return (struct getl_interface *) ss;
+  return &ss->parent;
 }