X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=52d0e09c91dec5b559e8c86104917f08cad2b5dd;hb=52c400a0ac67e4a43c5cae5a0d40e1452326240c;hp=26c718a42de419ada022a35cb07b199dc2fd7406;hpb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;p=pspp
diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 26c718a42d..52d0e09c91 100644
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -15,19 +15,23 @@
along with this program. If not, see . */
#include
+
#include
+#include
#include
-#include
+#include
+#include
+
+#include
#include
-#include
-#include
-#include
#include
+#include
+#include
+#include
#include
-#include
-#include
-#include
+#include "dirname.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -87,8 +91,8 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
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;
}
}
@@ -105,7 +109,8 @@ 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;
}
}
@@ -122,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;
}
}
@@ -172,7 +178,7 @@ parse_insert (struct lexer *lexer, char **filename)
lex_match (lexer, '=');
/* 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;
@@ -191,8 +197,14 @@ parse_insert (struct lexer *lexer, char **filename)
return CMD_FAILURE;
}
- *filename = canonicalize_file_name (relative_filename);
- free (relative_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;
}