Update.

1998-08-20  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile (sh-ldd-rewrite): Remove expression to remove
	BASH-ONLY marked region.
	* elf/ldd.bash.in: Remove special BASH-ONLY markers.

1998-02-20 17:54  H.J. Lu  <hjl@gnu.org>

	* libio/oldfileops.c (_IO_file_seekoff): Don't adjust pointers if
	_IO_SYSSEEK fails.

	* libio/iolibio.h (_IO_pos_BAD): Define of type _IO_fpos64_t.

	* libio/oldfileops.c (FILEBUF_LITERAL): Also initialize new _offset
	element.

diff --git a/ChangeLog b/ChangeLog
index 7553cf60954a46f1bfa6650e1610fa44885c9007..177deda9e8c7ef1dd9a1b7c5db981ea92051570b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1998-08-20  Ulrich Drepper  <drepper@cygnus.com>
+
+       * elf/Makefile (sh-ldd-rewrite): Remove expression to remove
+       BASH-ONLY marked region.
+       * elf/ldd.bash.in: Remove special BASH-ONLY markers.
+
+1998-02-20 17:54  H.J. Lu  <hjl@gnu.org>
+
+       * libio/oldfileops.c (_IO_file_seekoff): Don't adjust pointers if
+       _IO_SYSSEEK fails.
+
+       * libio/iolibio.h (_IO_pos_BAD): Define of type _IO_fpos64_t.
+
+       * libio/oldfileops.c (FILEBUF_LITERAL): Also initialize new _offset
+       element.
+
 1998-08-21  Roland McGrath  <roland@baalperazim.frob.com>
 
        * elf/ldd.bash.in (TEXTDOMAIN, TEXTDOMAINDIR): Surround setting these

diff --git a/elf/Makefile b/elf/Makefile
index 3771ffb685b14d310d3db403dea289e4bf76bdb8..5cc13b2bc07b508fd453d10ba667ff4c06c30da1 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -166,8 +166,7 @@ $(inst_slibdir)/$(rtld-installed-name): \
 
 common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
                     -e 's%@VERSION@%$(version)%g'
-sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g' \
-                -e 's/\$$"/"/g;/^\#\#\#BASH-ONLY/,/\#\#\#END-BASH-ONLY/d'
+sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g'
 bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
                   -e 's%@TEXTDOMAINDIR@%$(localedir)%g'
 

diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index f0d50e4430001bd6a1b226852792f008aaa605ae..f6ffa6b4e80488b46660b0e77ec564b45dd4a2bd 100644 (file)
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -24,11 +24,9 @@
 # run-time dynamic linker as a command and setting the environment
 # variable LD_TRACE_LOADED_OBJECTS to a non-empty value.
 
-###BASH-ONLY
 # We should be able to find the translation right at the beginning.
 TEXTDOMAIN=libc
 TEXTDOMAINDIR=@TEXTDOMAINDIR@
-###END-BASH-ONLY
 
 RTLD=@RTLD@
 warn=

diff --git a/libio/libioP.h b/libio/libioP.h
index 4891294726a02c27df92eea1a1d501552b4aa8eb..004c95ab8d21b6a613c9336cadd682c63d235a26 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -552,15 +552,28 @@ extern int _IO_vscanf __P ((const char *, _IO_va_list));
 
 #ifdef _IO_MTSAFE_IO
 /* check following! */
-# define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
+# ifdef _IO_USE_OLD_IO_FILE
+#  define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
        { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \
           0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock }
+# else
+#  define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
+       { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \
+         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \
+          0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock, _IO_pos_BAD }
+# endif
 #else
-/* check following! */
-# define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
+# ifdef _IO_USE_OLD_IO_FILE
+#  define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
        { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \
           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, 0, _IO_pos_BAD }
+# else
+#  define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
+       { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \
+         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \
+          0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock, _IO_pos_BAD }
+# endif
 #endif
 
 /* VTABLE_LABEL defines NAME as of the CLASS class.

diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 251dc78c6c5a044fea24f0a6a3acb7138fad232d..ae710b15398fabe2abeaa4d7492791621892dda3 100644 (file)
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -583,10 +583,12 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
   _IO_unsave_markers (fp);
   result = _IO_SYSSEEK (fp, offset, dir);
   if (result != EOF)
-    _IO_mask_flags (fp, 0, _IO_EOF_SEEN);
-  fp->_old_offset = result;
-  _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
-  _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
+    {
+      _IO_mask_flags (fp, 0, _IO_EOF_SEEN);
+      fp->_old_offset = result;
+      _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
+      _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
+    }
   return result;
 }