* elf.c (_bfd_elf_write_object_contents): Check for non-NULL

	elf_shstrtab.
	* format.c (bfd_check_format_matches): Set output_has_begun
	for both_direction.
	* section.c (bfd_set_section_contents): Use bfd_write_p.  Remove
	special case for both_direction.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c6ecec7..ed035b7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * elf.c (_bfd_elf_write_object_contents): Check for non-NULL
+       elf_shstrtab.
+       * format.c (bfd_check_format_matches): Set output_has_begun
+       for both_direction.
+       * section.c (bfd_set_section_contents): Use bfd_write_p.  Remove
+       special case for both_direction.
+
 2005-05-17  Nick Clifton  <nickc@redhat.com>
 
        * elf.c (group_signature): Check for a group section which is

diff --git a/bfd/elf.c b/bfd/elf.c
index 5a97580..3ef04d4 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4950,8 +4950,9 @@ _bfd_elf_write_object_contents (bfd *abfd)
     }
 
   /* Write out the section header names.  */
-  if (bfd_seek (abfd, elf_tdata (abfd)->shstrtab_hdr.sh_offset, SEEK_SET) != 0
-      || ! _bfd_elf_strtab_emit (abfd, elf_shstrtab (abfd)))
+  if (elf_shstrtab (abfd) != NULL
+      && (bfd_seek (abfd, elf_tdata (abfd)->shstrtab_hdr.sh_offset, SEEK_SET) != 0
+          || ! _bfd_elf_strtab_emit (abfd, elf_shstrtab (abfd))))
     return FALSE;
 
   if (bed->elf_backend_final_write_processing)

diff --git a/bfd/format.c b/bfd/format.c
index 3a36210..4ccca2a 100644 (file)
--- a/bfd/format.c
+++ b/bfd/format.c
@@ -173,6 +173,14 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching)
          if (matching)
            free (matching_vector);
 
+         /* If the file was opened for update, then `output_has_begun'
+            some time ago when the file was created.  Do not recompute
+            sections sizes or alignments in _bfd_set_section_contents.
+            We can not set this flag until after checking the format,
+            because it will interfere with creation of BFD sections.  */
+         if (abfd->direction == both_direction)
+           abfd->output_has_begun = TRUE;
+
          return TRUE;                  /* File position has moved, BTW.  */
        }
 
@@ -319,6 +327,14 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching)
       if (matching)
        free (matching_vector);
 
+      /* If the file was opened for update, then `output_has_begun'
+        some time ago when the file was created.  Do not recompute
+        sections sizes or alignments in _bfd_set_section_contents.
+        We can not set this flag until after checking the format,
+        because it will interfere with creation of BFD sections.  */
+      if (abfd->direction == both_direction)
+       abfd->output_has_begun = TRUE;
+
       return TRUE;                     /* File position has moved, BTW.  */
     }
 

diff --git a/bfd/section.c b/bfd/section.c
index 4e46a5d..75acad7 100644 (file)
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -1346,22 +1346,10 @@ bfd_set_section_contents (bfd *abfd,
       return FALSE;
     }
 
-  switch (abfd->direction)
+  if (!bfd_write_p (abfd))
     {
-    case read_direction:
-    case no_direction:
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;
-
-    case write_direction:
-      break;
-
-    case both_direction:
-      /* File is opened for update. `output_has_begun' some time ago when
-          the file was created.  Do not recompute sections sizes or alignments
-          in _bfd_set_section_content.  */
-      abfd->output_has_begun = TRUE;
-      break;
     }
 
   /* Record a copy of the data in memory if desired.  */