X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ffile-handle.q;h=f1c7cb54afd868875c921b4f7769b9305a37ec67;hb=c806348911641248369536c11e48ed59757865da;hp=90b33cc4751704eea3cbe8912b179375838c79a7;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index 90b33cc475..f1c7cb54af 100644
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -1,20 +1,18 @@
-/* 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>
@@ -61,7 +59,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
     return CMD_CASCADING_FAILURE;
   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.  "
@@ -98,12 +96,12 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
       if (cmd.n_lrecl[0] == NOT_LONG)
         msg (SE, _("Fixed-length records were specified on /RECFORM, but "
                    "record length was not specified on /LRECL.  "
-                   "Assuming %d-character records."),
-             properties.record_width);
+                   "Assuming %u-character records."),
+             (unsigned int) 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."),
-             cmd.n_lrecl[0], properties.record_width);
+                   "Assuming %u-character records."),
+             cmd.n_lrecl[0], (unsigned int) properties.record_width);
       else
         properties.record_width = cmd.n_lrecl[0];
       break;
@@ -125,13 +123,13 @@ 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;
 
   if (!lex_force_id (lexer))
     return CMD_CASCADING_FAILURE;
-  handle = fh_from_name (lex_tokid (lexer));
+  handle = fh_from_id (lex_tokid (lexer));
   if (handle == NULL)
     return CMD_CASCADING_FAILURE;
 
@@ -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,27 +175,22 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
         }
 
       handle = NULL;
-      if (lex_token (lexer) == T_ID) 
-        handle = fh_from_name (lex_tokid (lexer));
-      if (handle == NULL) 
-        handle = fh_from_file_name (ds_cstr (lex_tokstr (lexer))); 
+      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) 
-            {
-              char *file_name = ds_cstr (lex_tokstr (lexer));
-              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 (lex_tokid (lexer));
         }
       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)));