X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=fe98aeb87f3347b82b61853adc70360cee87f132;hb=7878e5e2f2d1045bba2483ab9a752ceae50086f3;hp=26c718a42de419ada022a35cb07b199dc2fd7406;hpb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;p=pspp diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index 26c718a42d..fe98aeb87f 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -16,8 +16,9 @@ #include #include +#include #include -#include +#include #include #include #include @@ -25,9 +26,9 @@ #include #include #include -#include -#include +#include "dirname.h" +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -191,8 +192,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; }