X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=f3c87779787188ad986e2be99cdb16d335c9354f;hb=f5d9f9911bd04682a7edfb48521a12202e561e0a;hp=0ef9d463d7393b1488dc0d768d012671dcde2b84;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 0ef9d463..f3c87779 100644
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007 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
@@ -16,8 +16,9 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <errno.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
+#include <string.h>
 #include <language/command.h>
 #include <libpspp/message.h>
 #include <libpspp/getl.h>
@@ -26,16 +27,147 @@
 #include <libpspp/str.h>
 #include <data/file-name.h>
 
+#include "dirname.h"
+#include "canonicalize.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+static int parse_insert (struct lexer *lexer, char **filename);
+
+
 int
 cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
 {
-  struct source_stream *ss;
-  char *found_fn;
+  char *filename = NULL;
+  int status = parse_insert (lexer, &filename);
+
+  if ( CMD_SUCCESS != status)
+    return status;
+
+  lex_get (lexer);
+
+  status = lex_end_of_command (lexer);
+
+  if ( status == CMD_SUCCESS)
+    {
+      struct source_stream *ss = lex_get_source_stream (lexer);
+
+      assert (filename);
+      getl_include_source (ss, create_syntax_file_source (filename),
+			   GETL_BATCH, ERRMODE_STOP);
+      free (filename);
+    }
+
+  return status;
+}
+
+
+int
+cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
+{
+  enum syntax_mode syntax_mode = GETL_INTERACTIVE;
+  enum error_mode error_mode = ERRMODE_CONTINUE;
+  char *filename = NULL;
+  int status = parse_insert (lexer, &filename);
+  bool cd = false;
+
+  if ( CMD_SUCCESS != status)
+    return status;
+
+  lex_get (lexer);
+
+  while ( '.' != lex_token (lexer))
+    {
+      if (lex_match_id (lexer, "SYNTAX"))
+	{
+	  lex_match (lexer, '=');
+	  if ( lex_match_id (lexer, "INTERACTIVE") )
+	    syntax_mode = GETL_INTERACTIVE;
+	  else if ( lex_match_id (lexer, "BATCH"))
+	    syntax_mode = GETL_BATCH;
+	  else
+	    {
+	      lex_error(lexer,
+			_("Expecting BATCH or INTERACTIVE after SYNTAX."));
+	      return CMD_FAILURE;
+	    }
+	}
+      else if (lex_match_id (lexer, "CD"))
+	{
+	  lex_match (lexer, '=');
+	  if ( lex_match_id (lexer, "YES") )
+	    {
+	      cd = true;
+	    }
+	  else if ( lex_match_id (lexer, "NO"))
+	    {
+	      cd = false;
+	    }
+	  else
+	    {
+	      lex_error (lexer, _("Expecting YES or NO after CD."));
+	      return CMD_FAILURE;
+	    }
+	}
+      else if (lex_match_id (lexer, "ERROR"))
+	{
+	  lex_match (lexer, '=');
+	  if ( lex_match_id (lexer, "CONTINUE") )
+	    {
+	      error_mode = ERRMODE_CONTINUE;
+	    }
+	  else if ( lex_match_id (lexer, "STOP"))
+	    {
+	      error_mode = ERRMODE_STOP;
+	    }
+	  else
+	    {
+	      lex_error (lexer, _("Expecting CONTINUE or STOP after ERROR."));
+	      return CMD_FAILURE;
+	    }
+	}
+
+      else
+	{
+	  lex_error (lexer, _("Unexpected token: `%s'."),
+		     lex_token_representation (lexer));
+
+	  return CMD_FAILURE;
+	}
+    }
+
+  status = lex_end_of_command (lexer);
+
+  if ( status == CMD_SUCCESS)
+    {
+      struct source_stream *ss = lex_get_source_stream (lexer);
+
+      assert (filename);
+      getl_include_source (ss, create_syntax_file_source (filename),
+			   syntax_mode,
+			   error_mode);
+
+      if ( cd )
+	{
+	  char *directory = dir_name (filename);
+	  chdir (directory);
+	  free (directory);
+	}
+
+      free (filename);
+    }
+
+  return status;
+}
+
+
+static int
+parse_insert (struct lexer *lexer, char **filename)
+{
   char *target_fn;
+  char *relative_filename;
 
   /* Skip optional FILE=. */
   if (lex_match_id (lexer, "FILE"))
@@ -45,23 +177,31 @@ cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
   if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
     {
       lex_error (lexer, _("expecting file name"));
-      return CMD_CASCADING_FAILURE;
+      return CMD_FAILURE;
     }
 
   target_fn = ds_cstr (lex_tokstr (lexer));
 
-  ss = lex_get_source_stream (lexer);
-  found_fn = fn_search_path (target_fn, getl_include_path ( ss ));
+  relative_filename =
+    fn_search_path (target_fn,
+		    getl_include_path (lex_get_source_stream (lexer)));
 
-  if (found_fn != NULL)
+  if ( ! relative_filename)
     {
-      getl_include_source (ss, create_syntax_file_source (found_fn));
-      free (found_fn);
-    }
-  else
-    msg (SE, _("Can't find `%s' in include file search path."),
+      msg (SE, _("Can't find `%s' in include file search path."),
 	 target_fn);
+      return CMD_FAILURE;
+    }
 
-  lex_get (lexer);
-  return lex_end_of_command (lexer);
+  *filename = canonicalize_file_name (relative_filename);
+  if (*filename == NULL) 
+    {
+      msg (SE, _("Unable to open `%s': %s."),
+           relative_filename, strerror (errno));
+      free (relative_filename);
+      return CMD_FAILURE;
+    }
+  free (relative_filename);
+
+  return CMD_SUCCESS;
 }