X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ffile-handle.c;h=8dcc1028cf1bb654ac936154d17e198964befe91;hb=9574a6c2bf65ddc8ef13d4e942833bc5d4b0d2e0;hp=8d65418db75b0a30078c2600730404b3adfeb5ff;hpb=f9b2322d7b0662bd313d9c63450638c39b88be70;p=pspp

diff --git a/src/language/data-io/file-handle.c b/src/language/data-io/file-handle.c
index 8d65418db7..8dcc1028cf 100644
--- a/src/language/data-io/file-handle.c
+++ b/src/language/data-io/file-handle.c
@@ -94,7 +94,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
             }
 
           lex_match (lexer, T_EQUALS);
-          if (!lex_force_int (lexer))
+          if (!lex_force_int_range (lexer, "LRECL", 1, (1UL << 31) - 1))
             goto exit;
           lrecl = lex_integer (lexer);
           lex_get (lexer);
@@ -108,7 +108,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
             }
           lex_match (lexer, T_EQUALS);
 
-          if (!lex_force_int (lexer))
+          if (!lex_force_int_range (lexer, "TABWIDTH", 1, INT_MAX))
             goto exit;
           tabwidth = lex_integer (lexer);
           lex_get (lexer);
@@ -252,10 +252,6 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
         msg (SE, _("The specified file mode requires LRECL.  "
                    "Assuming %zu-character records."),
              properties.record_width);
-      else if (lrecl < 1 || lrecl >= (1UL << 31))
-        msg (SE, _("Record length (%d) must be between 1 and %lu bytes.  "
-                   "Assuming %zu-character records."),
-             lrecl, (1UL << 31) - 1, properties.record_width);
       else
         properties.record_width = lrecl;
     }
@@ -370,9 +366,3 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask,
 
   return handle;
 }
-
-/*
-   Local variables:
-   mode: c
-   End:
-*/