posix-xprintf-functions.patch from patch #6230.

[pspp-builds.git] / src / language / data-io / file-handle.q

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index 6ace912896cbf65f6be66a0676b197ff2988d2f8..71cc961f7227d4e1646a59d098fff9c4a87162d0 100644 (file)
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -1,37 +1,35 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
 
-   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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <language/data-io/file-handle.h>
 #include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <data/file-name.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
-#include <libpspp/magic.h>
 #include <libpspp/str.h>
 #include <data/variable.h>
 #include <data/file-handle-def.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -95,14 +93,14 @@ cmd_file_handle (struct lexer *lexer, 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];
@@ -125,7 +123,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
 }
 
 int
-cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED) 
+cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
 {
   struct file_handle *handle;
 
@@ -142,9 +140,9 @@ cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
 
 /* 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");
@@ -166,9 +164,9 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
 {
   struct file_handle *handle;
 
-  if (lex_match_id (lexer, "INLINE")) 
+  if (lex_match_id (lexer, "INLINE"))
     handle = fh_inline_file ();
-  else 
+  else
     {
       if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
         {
@@ -177,13 +175,13 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
         }
 
       handle = NULL;
-      if (lex_token (lexer) == T_ID) 
+      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)
+        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] != '#' || get_syntax () != ENHANCED)
             handle = fh_create_file (NULL, ds_cstr (lex_tokstr (lexer)),
                                      fh_default_properties ());
           else
@@ -192,7 +190,7 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
       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)));