daily update

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

diff --git a/gas/input-file.c b/gas/input-file.c
index ec36a4269649faa968f43ef5e153a58f2bfa9990..354ff56ce3dfc040cddeef176e18aed1e9d4ccb9 100644 (file)
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,13 +1,11 @@
 /* input_file.c - Deal with Input Files -
 /* input_file.c - Deal with Input Files -

-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
-   2002, 2003, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2014 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -29,8 +27,6 @@
 #include "input-file.h"
 #include "safe-ctype.h"
 
 #include "input-file.h"
 #include "safe-ctype.h"
 

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

 /* 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.  */
 int preprocess = 0;
 /* 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.  */
 int preprocess = 0;


@@ -71,7 +67,7 @@ input_file_end (void)
 }
 
 /* Return BUFFER_SIZE.  */
 }
 
 /* Return BUFFER_SIZE.  */

-unsigned int
+size_t

 input_file_buffer_size (void)
 {
   return (BUFFER_SIZE);
 input_file_buffer_size (void)
 {
   return (BUFFER_SIZE);


@@ -124,7 +120,7 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
 
   preprocess = pre;
 
 
   preprocess = pre;
 

-  assert (filename != 0);      /* Filename may not be NULL.  */
+  gas_assert (filename != 0);  /* Filename may not be NULL.  */

   if (filename[0])
     {
       f_in = fopen (filename, FOPEN_RT);
   if (filename[0])
     {
       f_in = fopen (filename, FOPEN_RT);


@@ -157,14 +153,23 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
       return;
     }
 
       return;
     }
 

+  /* Check for an empty input file.  */
+  if (feof (f_in))
+    {
+      fclose (f_in);
+      f_in = NULL;
+      return;
+    }
+  gas_assert (c != EOF);
+

   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
       c = getc (f_in);
       if (c == 'N')
        {
   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
       c = getc (f_in);
       if (c == 'N')
        {

-         fgets (buf, 80, f_in);
-         if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))
+         if (fgets (buf, sizeof (buf), f_in)
+             && !strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))

            preprocess = 0;
          if (!strchr (buf, '\n'))
            ungetc ('#', f_in); /* It was longer.  */
            preprocess = 0;
          if (!strchr (buf, '\n'))
            ungetc ('#', f_in); /* It was longer.  */


@@ -173,8 +178,8 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
        }
       else if (c == 'A')
        {
        }
       else if (c == 'A')
        {

-         fgets (buf, 80, f_in);
-         if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
+         if (fgets (buf, sizeof (buf), f_in)
+             && !strncmp (buf, "PP", 2) && ISSPACE (buf[2]))

            preprocess = 1;
          if (!strchr (buf, '\n'))
            ungetc ('#', f_in);
            preprocess = 1;
          if (!strchr (buf, '\n'))
            ungetc ('#', f_in);


@@ -204,17 +209,17 @@ input_file_close (void)
 
 /* This function is passed to do_scrub_chars.  */
 
 
 /* This function is passed to do_scrub_chars.  */
 

-static int
-input_file_get (char *buf, int buflen)
+static size_t
+input_file_get (char *buf, size_t buflen)

 {
 {

-  int size;
+  size_t size;
+
+  if (feof (f_in))
+    return 0;

 
   size = fread (buf, sizeof (char), buflen, f_in);
 
   size = fread (buf, sizeof (char), buflen, f_in);

-  if (size < 0)
-    {
-      as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
-      size = 0;
-    }
+  if (ferror (f_in))
+    as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));

   return size;
 }
 
   return size;
 }
 


@@ -224,7 +229,7 @@ char *
 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.  */
 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;
+  size_t size;

 
   if (f_in == (FILE *) 0)
     return 0;
 
   if (f_in == (FILE *) 0)
     return 0;


@@ -235,18 +240,14 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new
   if (preprocess)
     size = do_scrub_chars (input_file_get, where, BUFFER_SIZE);
   else
   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)
-    {
-      as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
-      size = 0;
-    }
+    size = input_file_get (where, BUFFER_SIZE);
+

   if (size)
     return_value = where + size;
   else
     {
       if (fclose (f_in))
   if (size)
     return_value = where + size;
   else
     {
       if (fclose (f_in))

-       as_bad (_("can't close %s: %s"), file_name, xstrerror (errno));
+       as_warn (_("can't close %s: %s"), file_name, xstrerror (errno));

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