WebSVN – Kolibri OS – Diff – /contrib/toolchain/binutils/gas/input-scrub.c

 /* input_scrub.c - Break up input buffers into whole numbers of lines.
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of GAS, the GNU Assembler.
    area, which can be restored by passing it to input_scrub_pop().  */
 static struct input_save *
 input_scrub_push (char *saved_position)
 {
-  register struct input_save *saved;
+  struct input_save *saved;
   saved = (struct input_save *) xmalloc (sizeof *saved);
   logical_input_file = (char *) NULL;
   buffer_length = input_file_buffer_size ();
   sb_index = -1;
   buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
-                                    + buffer_length + AFTER_SIZE));
+                                    + buffer_length + AFTER_SIZE + 1));
   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
   input_file_begin ();
   buffer_length = input_file_buffer_size ();
   buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
-                                    + buffer_length + AFTER_SIZE));
+                                    + buffer_length + AFTER_SIZE + 1));
   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
+}
 char *
 input_scrub_next_buffer (char **bufp)
 {
-  register char *limit;		/*->just after last char of buffer.  */
+  char *limit;		/*->just after last char of buffer.  */
   if (sb_index != (size_t) -1)
+    {
 	      md_macro_end ();
 #endif
+	    }
 	  --macro_nest;
 	  partial_where = NULL;
+	  partial_size = 0;
 	  if (next_saved_file != NULL)
 	    *bufp = input_scrub_pop (next_saved_file);
 	  return partial_where;
+	}
       *bufp = from_sb.ptr + sb_index;
       sb_index = from_sb.len;
       return partial_where;
+    }
-  *bufp = buffer_start + BEFORE_SIZE;
   if (partial_size)
+    {
       memmove (buffer_start + BEFORE_SIZE, partial_where,
 	       (unsigned int) partial_size);
       memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
-    }
-  limit = input_file_give_next_buffer (buffer_start
-				       + BEFORE_SIZE
-				       + partial_size);
-  if (limit)
-    {
-      register char *p;		/* Find last newline.  */
-      /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
-      *limit = '\0';
-      for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
-	;
-      ++p;
+    }
-      while (p <= buffer_start + BEFORE_SIZE)
+  while (1)
-	{
-	  int limoff;
-	  limoff = limit - buffer_start;
-	  buffer_length += input_file_buffer_size ();
-	  buffer_start = (char *) xrealloc (buffer_start,
                                             (BEFORE_SIZE
-                                             + 2 * buffer_length
+      char *p;
-                                             + AFTER_SIZE));
+      *bufp = buffer_start + BEFORE_SIZE;
-	  *bufp = buffer_start + BEFORE_SIZE;
+  limit = input_file_give_next_buffer (buffer_start
-	  limit = input_file_give_next_buffer (buffer_start + limoff);
+				       + BEFORE_SIZE
-	  if (limit == NULL)
+				       + partial_size);
-	    {
-	      as_warn (_("partial line at end of file ignored"));
-	      partial_where = NULL;
-	      if (next_saved_file)
+      if (!limit)
+    {
+	  if (partial_size == 0)
+	    break;
+	  as_warn (_("end of file not at end of a line; newline inserted"));
+	  p = buffer_start + BEFORE_SIZE + partial_size;
+	  *p++ = '\n';
-		*bufp = input_scrub_pop (next_saved_file);
+	  limit = p;
 	      return NULL;
+      else
+	{
 	  /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
 	  *limit = '\0';
 	  /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
-	  *limit = '\0';
+	  /* Find last newline.  */
+	  for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
+	    ;
-	  for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
+	  ++p;
+	}
 	  ++p;
       if (p != buffer_start + BEFORE_SIZE)
+	{
       partial_where = p;
-      partial_where = p;
       partial_size = limit - p;
       memcpy (save_source, partial_where, (int) AFTER_SIZE);
       memcpy (partial_where, AFTER_STRING, (int) AFTER_SIZE);
-    }
-  else
+	  return partial_where;
+    }
+      partial_size = limit - (buffer_start + BEFORE_SIZE);
       buffer_length += input_file_buffer_size ();
-      partial_where = 0;
+      buffer_start = (char *) xrealloc (buffer_start,
-      if (partial_size > 0)
+					(BEFORE_SIZE
 					 + 2 * buffer_length
+					 + AFTER_SIZE + 1));
 	  as_warn (_("partial line at end of file ignored"));
-	}
-      /* Tell the listing we've finished the file.  */
-      LISTING_EOF ();
+      /* Tell the listing we've finished the file.  */
-      /* If we should pop to another file at EOF, do it.  */
+      LISTING_EOF ();
       if (next_saved_file)
       /* If we should pop to another file at EOF, do it.  */
-	  *bufp = input_scrub_pop (next_saved_file);	/* Pop state */
+  partial_where = NULL;
-	  /* partial_where is now correct to return, since we popped it.  */
+      if (next_saved_file)

Subversion Repositories Kolibri OS

(root)/contrib/toolchain/binutils/gas/input-scrub.c – Rev 5222 → 6324