#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/line-buffer.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/magic.h>
#include <libpspp/str.h>
if (!lex_force_match ('/'))
return CMD_CASCADING_FAILURE;
- if (!parse_file_handle (&cmd))
+ if (!parse_file_handle (&cmd, NULL))
return CMD_CASCADING_FAILURE;
if (lex_end_of_command () != CMD_SUCCESS)
properties.record_width = cmd.n_lrecl[0];
break;
default:
- assert (0);
+ NOT_REACHED ();
}
if (cmd.mode != FH_SCRATCH)
case FH_REF_SCRATCH:
return _("scratch file");
default:
- abort ();
+ NOT_REACHED ();
}
}
if (token == T_ID)
handle = fh_from_name (tokid);
if (handle == NULL)
- handle = fh_from_file_name (ds_c_str (&tokstr));
+ handle = fh_from_file_name (ds_cstr (&tokstr));
if (handle == NULL)
{
if (token != T_ID || tokid[0] != '#' || get_syntax () != ENHANCED)
{
- char *file_name = ds_c_str (&tokstr);
+ char *file_name = ds_cstr (&tokstr);
char *handle_name = xasprintf ("\"%s\"", file_name);
handle = fh_create_file (handle_name, file_name,
fh_default_properties ());