X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=e326134de01e3a11de7a154e4cff1f31c42eac10;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=8e69dab50c6260f63795d569c910ab48cd743c47;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp-builds.git
diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 8e69dab5..e326134d 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, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2010, 2011 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
@@ -15,18 +15,23 @@
along with this program. If not, see . */
#include
+
#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+
+#include "data/file-name.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/syntax-file.h"
+#include "libpspp/getl.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
-#include "dirname.h"
-#include "xalloc.h"
+#include "gl/dirname.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -75,25 +80,25 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
lex_get (lexer);
- while ( '.' != lex_token (lexer))
+ while ( T_ENDCMD != lex_token (lexer))
{
if (lex_match_id (lexer, "SYNTAX"))
{
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
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."));
+ lex_error (lexer, _("expecting %s or %s after %s"),
+ "BATCH", "INTERACTIVE", "SYNTAX");
return CMD_FAILURE;
}
}
else if (lex_match_id (lexer, "CD"))
{
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
if ( lex_match_id (lexer, "YES") )
{
cd = true;
@@ -104,13 +109,14 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
}
else
{
- lex_error (lexer, _("Expecting YES or NO after CD."));
+ lex_error (lexer, _("expecting %s or %s after %s"),
+ "YES", "NO", "CD");
return CMD_FAILURE;
}
}
else if (lex_match_id (lexer, "ERROR"))
{
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
if ( lex_match_id (lexer, "CONTINUE") )
{
error_mode = ERRMODE_CONTINUE;
@@ -121,7 +127,8 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
}
else
{
- lex_error (lexer, _("Expecting CONTINUE or STOP after ERROR."));
+ lex_error (lexer, _("expecting %s or %s after %s"),
+ "CONTINUE", "STOP", "ERROR");
return CMD_FAILURE;
}
}
@@ -163,21 +170,21 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
static int
parse_insert (struct lexer *lexer, char **filename)
{
- char *target_fn;
+ const char *target_fn;
char *relative_filename;
/* Skip optional FILE=. */
if (lex_match_id (lexer, "FILE"))
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
/* File name can be identifier or string. */
- if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
+ if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
{
lex_error (lexer, _("expecting file name"));
return CMD_FAILURE;
}
- target_fn = ds_cstr (lex_tokstr (lexer));
+ target_fn = lex_tokcstr (lexer);
relative_filename =
fn_search_path (target_fn,
@@ -191,6 +198,13 @@ parse_insert (struct lexer *lexer, char **filename)
}
*filename = relative_filename;
+ if (*filename == NULL)
+ {
+ msg (SE, _("Unable to open `%s': %s."),
+ relative_filename, strerror (errno));
+ free (relative_filename);
+ return CMD_FAILURE;
+ }
return CMD_SUCCESS;
}