X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ffile-handle.q;h=d53017735259eeec6b6cb2635fa4dd5734e9f17e;hb=6435b289a7c00df2445a491490869d7d1f2bc3bc;hp=b3d15619e91b5957fa48a229a396c90c4d2a31d7;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index b3d15619e9..d530177352 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -1,39 +1,35 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include #include #include #include -#include #include #include #include -#include #include #include -#include #include #include #include +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -51,7 +47,7 @@ /* (functions) */ int -cmd_file_handle (struct dataset *ds) +cmd_file_handle (struct lexer *lexer, struct dataset *ds) { char handle_name[LONG_NAME_LEN + 1]; struct fh_properties properties = *fh_default_properties (); @@ -59,11 +55,11 @@ cmd_file_handle (struct dataset *ds) struct cmd_file_handle cmd; struct file_handle *handle; - if (!lex_force_id ()) + if (!lex_force_id (lexer)) return CMD_CASCADING_FAILURE; - str_copy_trunc (handle_name, sizeof handle_name, tokid); + str_copy_trunc (handle_name, sizeof handle_name, lex_tokid (lexer)); - handle = fh_from_name (handle_name); + handle = fh_from_id (handle_name); if (handle != NULL) { msg (SE, _("File handle %s is already defined. " @@ -72,19 +68,19 @@ cmd_file_handle (struct dataset *ds) return CMD_CASCADING_FAILURE; } - lex_get (); - if (!lex_force_match ('/')) + lex_get (lexer); + if (!lex_force_match (lexer, '/')) return CMD_CASCADING_FAILURE; - if (!parse_file_handle (ds, &cmd, NULL)) + if (!parse_file_handle (lexer, ds, &cmd, NULL)) return CMD_CASCADING_FAILURE; - if (lex_end_of_command () != CMD_SUCCESS) + if (lex_end_of_command (lexer) != CMD_SUCCESS) goto lossage; if (cmd.s_name == NULL && cmd.mode != FH_SCRATCH) { - lex_sbc_missing ("NAME"); + lex_sbc_missing (lexer, "NAME"); goto lossage; } @@ -97,14 +93,14 @@ cmd_file_handle (struct dataset *ds) break; case FH_IMAGE: properties.mode = FH_MODE_BINARY; - if (cmd.n_lrecl[0] == NOT_LONG) + if (cmd.n_lrecl[0] == LONG_MIN) msg (SE, _("Fixed-length records were specified on /RECFORM, but " "record length was not specified on /LRECL. " - "Assuming %d-character records."), + "Assuming %zu-character records."), properties.record_width); else if (cmd.n_lrecl[0] < 1) msg (SE, _("Record length (%ld) must be at least one byte. " - "Assuming %d-character records."), + "Assuming %zu-character records."), cmd.n_lrecl[0], properties.record_width); else properties.record_width = cmd.n_lrecl[0]; @@ -127,26 +123,25 @@ cmd_file_handle (struct dataset *ds) } int -cmd_close_file_handle (struct dataset *ds UNUSED) +cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED) { struct file_handle *handle; - if (!lex_force_id ()) + if (!lex_force_id (lexer)) return CMD_CASCADING_FAILURE; - handle = fh_from_name (tokid); + handle = fh_from_id (lex_tokid (lexer)); if (handle == NULL) return CMD_CASCADING_FAILURE; - fh_free (handle); - + fh_unname (handle); return CMD_SUCCESS; } /* Returns the name for REFERENT. */ static const char * -referent_name (enum fh_referent referent) +referent_name (enum fh_referent referent) { - switch (referent) + switch (referent) { case FH_REF_FILE: return _("file"); @@ -162,47 +157,44 @@ referent_name (enum fh_referent referent) /* Parses a file handle name, which may be a file name as a string or a file handle name as an identifier. The allowed types of file handle are restricted to those in REFERENT_MASK. Returns - the file handle when successful, a null pointer on failure. */ + the file handle when successful, a null pointer on failure. + + The caller is responsible for fh_unref()'ing the returned + file handle when it is no longer needed. */ struct file_handle * -fh_parse (enum fh_referent referent_mask) +fh_parse (struct lexer *lexer, enum fh_referent referent_mask) { struct file_handle *handle; - if (lex_match_id ("INLINE")) + if (lex_match_id (lexer, "INLINE")) handle = fh_inline_file (); - else + else { - if (token != T_ID && token != T_STRING) + if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING) { - lex_error (_("expecting a file name or handle name")); + lex_error (lexer, _("expecting a file name or handle name")); return NULL; } handle = NULL; - if (token == T_ID) - handle = fh_from_name (tokid); - if (handle == NULL) - handle = fh_from_file_name (ds_cstr (&tokstr)); + if (lex_token (lexer) == T_ID) + handle = fh_from_id (lex_tokid (lexer)); if (handle == NULL) { - if (token != T_ID || tokid[0] != '#' || get_syntax () != ENHANCED) - { - char *file_name = ds_cstr (&tokstr); - char *handle_name = xasprintf ("\"%s\"", file_name); - handle = fh_create_file (handle_name, file_name, - fh_default_properties ()); - free (handle_name); - } + if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || get_syntax () != ENHANCED) + handle = fh_create_file (NULL, ds_cstr (lex_tokstr (lexer)), + fh_default_properties ()); else - handle = fh_create_scratch (tokid); + handle = fh_create_scratch (lex_tokid (lexer)); } - lex_get (); + lex_get (lexer); } - if (!(fh_get_referent (handle) & referent_mask)) + if (!(fh_get_referent (handle) & referent_mask)) { msg (SE, _("Handle for %s not allowed here."), referent_name (fh_get_referent (handle))); + fh_unref (handle); return NULL; }