X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ffile-handle.q;h=71081b922ac0601835fec8b13a819aa4f2a17dc3;hb=774441e68b4d2e3a4b5c6975e9614dcd4369955e;hp=71cc961f7227d4e1646a59d098fff9c4a87162d0;hpb=9f4661992f4b481c6dafa6fd53c94ecfe7b3af8c;p=pspp
diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index 71cc961f72..71081b922a 100644
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -15,6 +15,7 @@
along with this program. If not, see . */
#include
+#include
#include
#include
#include
@@ -41,7 +42,8 @@
name=string;
lrecl=integer;
tabwidth=integer "x>=0" "%s must be nonnegative";
- mode=mode:!character/image/scratch.
+ mode=mode:!character/binary/image/360/scratch;
+ recform=recform:fixed/f/variable/v/spanned/vs.
*/
/* (declarations) */
/* (functions) */
@@ -49,9 +51,7 @@
int
cmd_file_handle (struct lexer *lexer, struct dataset *ds)
{
- char handle_name[LONG_NAME_LEN + 1];
- struct fh_properties properties = *fh_default_properties ();
-
+ char handle_name[VAR_NAME_LEN + 1];
struct cmd_file_handle cmd;
struct file_handle *handle;
@@ -78,39 +78,69 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
if (lex_end_of_command (lexer) != CMD_SUCCESS)
goto lossage;
- if (cmd.s_name == NULL && cmd.mode != FH_SCRATCH)
+ if (cmd.mode != FH_SCRATCH)
{
- lex_sbc_missing (lexer, "NAME");
- goto lossage;
- }
+ struct fh_properties properties = *fh_default_properties ();
- switch (cmd.mode)
- {
- case FH_CHARACTER:
- properties.mode = FH_MODE_TEXT;
- if (cmd.sbc_tabwidth)
- properties.tab_width = cmd.n_tabwidth[0];
- break;
- case FH_IMAGE:
- properties.mode = FH_MODE_BINARY;
- 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 %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 %zu-character records."),
- cmd.n_lrecl[0], properties.record_width);
- else
- properties.record_width = cmd.n_lrecl[0];
- break;
- default:
- NOT_REACHED ();
- }
+ if (cmd.s_name == NULL)
+ {
+ lex_sbc_missing (lexer, "NAME");
+ goto lossage;
+ }
- if (cmd.mode != FH_SCRATCH)
- fh_create_file (handle_name, cmd.s_name, &properties);
+ switch (cmd.mode)
+ {
+ case FH_CHARACTER:
+ properties.mode = FH_MODE_TEXT;
+ if (cmd.sbc_tabwidth)
+ properties.tab_width = cmd.n_tabwidth[0];
+ break;
+ case FH_IMAGE:
+ properties.mode = FH_MODE_FIXED;
+ break;
+ case FH_BINARY:
+ properties.mode = FH_MODE_VARIABLE;
+ break;
+ case FH_360:
+ properties.encoding = "EBCDIC-US";
+ if (cmd.recform == FH_FIXED || cmd.recform == FH_F)
+ properties.mode = FH_MODE_FIXED;
+ else if (cmd.recform == FH_VARIABLE || cmd.recform == FH_V)
+ {
+ properties.mode = FH_MODE_360_VARIABLE;
+ properties.record_width = 8192;
+ }
+ else if (cmd.recform == FH_SPANNED || cmd.recform == FH_VS)
+ {
+ properties.mode = FH_MODE_360_SPANNED;
+ properties.record_width = 8192;
+ }
+ else
+ {
+ msg (SE, _("RECFORM must be specified with MODE=360."));
+ goto lossage;
+ }
+ break;
+ default:
+ NOT_REACHED ();
+ }
+
+ if (properties.mode == FH_MODE_FIXED || cmd.n_lrecl[0] != LONG_MIN)
+ {
+ if (cmd.n_lrecl[0] == LONG_MIN)
+ msg (SE, _("The specified file mode requires LRECL. "
+ "Assuming %zu-character records."),
+ properties.record_width);
+ else if (cmd.n_lrecl[0] < 1 || cmd.n_lrecl[0] >= (1UL << 31))
+ msg (SE, _("Record length (%ld) must be between 1 and %lu bytes. "
+ "Assuming %d-character records."),
+ cmd.n_lrecl[0], (1UL << 31) - 1, properties.record_width);
+ else
+ properties.record_width = cmd.n_lrecl[0];
+ }
+
+ fh_create_file (handle_name, cmd.s_name, &properties);
+ }
else
fh_create_scratch (handle_name);
@@ -133,8 +163,7 @@ cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
if (handle == NULL)
return CMD_CASCADING_FAILURE;
- fh_free (handle);
-
+ fh_unname (handle);
return CMD_SUCCESS;
}
@@ -158,7 +187,10 @@ 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 (struct lexer *lexer, enum fh_referent referent_mask)
{
@@ -168,7 +200,7 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
handle = fh_inline_file ();
else
{
- 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 a file name or handle name"));
return NULL;
@@ -177,11 +209,9 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
handle = NULL;
if (lex_token (lexer) == T_ID)
handle = fh_from_id (lex_tokid (lexer));
- if (handle == NULL)
- handle = fh_from_file_name (ds_cstr (lex_tokstr (lexer)));
if (handle == NULL)
{
- if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || get_syntax () != ENHANCED)
+ if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || settings_get_syntax () != ENHANCED)
handle = fh_create_file (NULL, ds_cstr (lex_tokstr (lexer)),
fh_default_properties ());
else
@@ -194,6 +224,7 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
{
msg (SE, _("Handle for %s not allowed here."),
referent_name (fh_get_referent (handle)));
+ fh_unref (handle);
return NULL;
}