2005-02-07 Andrew Cagney <cagney@gnu.org>

[binutils-gdb.git] / gas / input-file.c

diff --git a/gas/input-file.c b/gas/input-file.c
index f001e521035d0b9b9f019678e690251f1b86f942..01cc669feffb8522b6c01c2ae25cc565698c32c8 100644 (file)
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,5 +1,5 @@
 /* input_file.c - Deal with Input Files -
 /* input_file.c - Deal with Input Files -

-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.


@@ -19,81 +19,77 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 

-/*
- * Confines all details of reading source bytes to this module.
- * All O/S specific crocks should live here.
- * What we lose in "efficiency" we gain in modularity.
- * Note we don't need to #include the "as.h" file. No common coupling!
- */
+/* Confines all details of reading source bytes to this module.
+   All O/S specific crocks should live here.
+   What we lose in "efficiency" we gain in modularity.
+   Note we don't need to #include the "as.h" file. No common coupling!  */

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

-
+#include <errno.h>

 #include "as.h"
 #include "input-file.h"
 #include "as.h"
 #include "input-file.h"

+#include "safe-ctype.h"

 
 

-static int input_file_get PARAMS ((char *, int));
+static int input_file_get (char *, int);

 
 /* This variable is non-zero if the file currently being read should be
 
 /* This variable is non-zero if the file currently being read should be

-   preprocessed by app.  It is zero if the file can be read straight in.
-   */
+   preprocessed by app.  It is zero if the file can be read straight in.  */

 int preprocess = 0;
 
 int preprocess = 0;
 

-/*
- * This code opens a file, then delivers BUFFER_SIZE character
- * chunks of the file on demand.
- * BUFFER_SIZE is supposed to be a number chosen for speed.
- * The caller only asks once what BUFFER_SIZE is, and asks before
- * the nature of the input files (if any) is known.
- */
+/* This code opens a file, then delivers BUFFER_SIZE character
+   chunks of the file on demand.
+   BUFFER_SIZE is supposed to be a number chosen for speed.
+   The caller only asks once what BUFFER_SIZE is, and asks before
+   the nature of the input files (if any) is known.  */

 
 #define BUFFER_SIZE (32 * 1024)
 
 
 #define BUFFER_SIZE (32 * 1024)
 

-/*
- * We use static data: the data area is not sharable.
- */
+/* We use static data: the data area is not sharable.  */

 
 static FILE *f_in;
 static char *file_name;
 
 /* Struct for saving the state of this module for file includes.  */
 
 static FILE *f_in;
 static char *file_name;
 
 /* Struct for saving the state of this module for file includes.  */

-struct saved_file {
-  FILE *f_in;
-  char *file_name;
-  int preprocess;
-  char *app_save;
-};
+struct saved_file
+  {
+    FILE * f_in;
+    char * file_name;
+    int    preprocess;
+    char * app_save;
+  };

 \f
 \f

-/* These hooks accomodate most operating systems.  */
+/* These hooks accommodate most operating systems.  */

 
 void
 
 void

-input_file_begin ()
+input_file_begin (void)

 {
   f_in = (FILE *) 0;
 }
 
 void
 {
   f_in = (FILE *) 0;
 }
 
 void

-input_file_end ()
+input_file_end (void)

 {
 }
 
 /* Return BUFFER_SIZE.  */
 unsigned int
 {
 }
 
 /* Return BUFFER_SIZE.  */
 unsigned int

-input_file_buffer_size ()
+input_file_buffer_size (void)

 {
   return (BUFFER_SIZE);
 }
 
 int
 {
   return (BUFFER_SIZE);
 }
 
 int

-input_file_is_open ()
+input_file_is_open (void)

 {
   return f_in != (FILE *) 0;
 }
 
 /* Push the state of our input, returning a pointer to saved info that
    can be restored with input_file_pop ().  */
 {
   return f_in != (FILE *) 0;
 }
 
 /* Push the state of our input, returning a pointer to saved info that
    can be restored with input_file_pop ().  */

+

 char *
 char *

-input_file_push ()
+input_file_push (void)

 {
   register struct saved_file *saved;
 
 {
   register struct saved_file *saved;
 


@@ -105,18 +101,18 @@ input_file_push ()
   if (preprocess)
     saved->app_save = app_push ();
 
   if (preprocess)
     saved->app_save = app_push ();
 

-  input_file_begin ();         /* Initialize for new file */
+  /* Initialize for new file.  */
+  input_file_begin ();

 
   return (char *) saved;
 }
 
 void
 
   return (char *) saved;
 }
 
 void

-input_file_pop (arg)
-     char *arg;
+input_file_pop (char *arg)

 {
   register struct saved_file *saved = (struct saved_file *) arg;
 
 {
   register struct saved_file *saved = (struct saved_file *) arg;
 

-  input_file_end ();           /* Close out old file */
+  input_file_end ();           /* Close out old file.  */

 
   f_in = saved->f_in;
   file_name = saved->file_name;
 
   f_in = saved->f_in;
   file_name = saved->file_name;


@@ -128,9 +124,8 @@ input_file_pop (arg)
 }
 \f
 void
 }
 \f
 void

-input_file_open (filename, pre)
-     char *filename;           /* "" means use stdin. Must not be 0.  */
-     int pre;
+input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
+                int pre)

 {
   int c;
   char buf[80];
 {
   int c;
   char buf[80];


@@ -139,33 +134,57 @@ input_file_open (filename, pre)
 
   assert (filename != 0);      /* Filename may not be NULL.  */
   if (filename[0])
 
   assert (filename != 0);      /* Filename may not be NULL.  */
   if (filename[0])

-    {                          /* We have a file name. Suck it and see.  */
-      f_in = fopen (filename, "r");
+    {
+      f_in = fopen (filename, FOPEN_RT);

       file_name = filename;
     }
   else
       file_name = filename;
     }
   else

-    {                          /* use stdin for the input file.  */
+    {
+      /* Use stdin for the input file.  */

       f_in = stdin;
       f_in = stdin;

-      file_name = _("{standard input}");       /* For error messages.  */
+      /* For error messages.  */
+      file_name = _("{standard input}");

     }
     }

-  if (f_in == (FILE *) 0)
+
+  if (f_in)
+    c = getc (f_in);
+
+  if (f_in == NULL || ferror (f_in))

     {
     {

-      as_bad (_("Can't open %s for reading."), file_name);
-      as_perror ("%s", file_name);
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
+      as_perror (_("Can't open %s for reading"), file_name);
+
+      if (f_in)
+       {
+         fclose (f_in);
+         f_in = NULL;
+       }

       return;
     }
 
       return;
     }
 

-  c = getc (f_in);

   if (c == '#')
   if (c == '#')

-    {                          /* Begins with comment, may not want to preprocess */
+    {
+      /* Begins with comment, may not want to preprocess.  */

       c = getc (f_in);
       if (c == 'N')
        {
          fgets (buf, 80, f_in);
       c = getc (f_in);
       if (c == 'N')
        {
          fgets (buf, 80, f_in);

-         if (!strcmp (buf, "O_APP\n"))
+         if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))

            preprocess = 0;
          if (!strchr (buf, '\n'))
            preprocess = 0;
          if (!strchr (buf, '\n'))

-           ungetc ('#', f_in); /* It was longer */
+           ungetc ('#', f_in); /* It was longer.  */
+         else
+           ungetc ('\n', f_in);
+       }
+      else if (c == 'A')
+       {
+         fgets (buf, 80, f_in);
+         if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
+           preprocess = 1;
+         if (!strchr (buf, '\n'))
+           ungetc ('#', f_in);

          else
            ungetc ('\n', f_in);
        }
          else
            ungetc ('\n', f_in);
        }


@@ -179,28 +198,30 @@ input_file_open (filename, pre)
 }
 
 /* Close input file.  */
 }
 
 /* Close input file.  */

+

 void
 void

-input_file_close ()
+input_file_close (void)

 {
 {

+  /* Don't close a null file pointer.  */

   if (f_in != NULL)
   if (f_in != NULL)

-    {
-      fclose (f_in);
-    }                          /* don't close a null file pointer */
+    fclose (f_in);
+

   f_in = 0;
 }
 
 /* This function is passed to do_scrub_chars.  */
 
 static int
   f_in = 0;
 }
 
 /* This function is passed to do_scrub_chars.  */
 
 static int

-input_file_get (buf, buflen)
-     char *buf;
-     int buflen;
+input_file_get (char *buf, int buflen)

 {
   int size;
 
   size = fread (buf, sizeof (char), buflen, f_in);
   if (size < 0)
     {
 {
   int size;
 
   size = fread (buf, sizeof (char), buflen, f_in);
   if (size < 0)
     {

+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif

       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }


@@ -210,26 +231,26 @@ input_file_get (buf, buflen)
 /* Read a buffer from the input file.  */
 
 char *
 /* Read a buffer from the input file.  */
 
 char *

-input_file_give_next_buffer (where)
-     char *where;              /* Where to place 1st character of new buffer.  */
+input_file_give_next_buffer (char *where /* Where to place 1st character of new buffer.  */)

 {
   char *return_value;          /* -> Last char of what we read, + 1.  */
   register int size;
 
   if (f_in == (FILE *) 0)
     return 0;
 {
   char *return_value;          /* -> Last char of what we read, + 1.  */
   register int size;
 
   if (f_in == (FILE *) 0)
     return 0;

-  /*
-   * fflush (stdin); could be done here if you want to synchronise
-   * stdin and stdout, for the case where our input file is stdin.
-   * Since the assembler shouldn't do any output to stdout, we
-   * don't bother to synch output and input.
-   */
+  /* fflush (stdin); could be done here if you want to synchronise
+     stdin and stdout, for the case where our input file is stdin.
+     Since the assembler shouldn't do any output to stdout, we
+     don't bother to synch output and input.  */

   if (preprocess)
     size = do_scrub_chars (input_file_get, where, BUFFER_SIZE);
   else
     size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
   if (size < 0)
     {
   if (preprocess)
     size = do_scrub_chars (input_file_get, where, BUFFER_SIZE);
   else
     size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
   if (size < 0)
     {

+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif

       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }


@@ -238,9 +259,15 @@ input_file_give_next_buffer (where)
   else
     {
       if (fclose (f_in))
   else
     {
       if (fclose (f_in))

-       as_perror (_("Can't close %s"), file_name);
+       {
+#ifdef BFD_ASSEMBLER
+         bfd_set_error (bfd_error_system_call);
+#endif
+         as_perror (_("Can't close %s"), file_name);
+       }

       f_in = (FILE *) 0;
       return_value = 0;
     }
       f_in = (FILE *) 0;
       return_value = 0;
     }

-  return (return_value);
+
+  return return_value;

 }
 }