about summary refs log tree commit diff
path: root/libio
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-07-08 00:44:35 +0000
committerUlrich Drepper <drepper@redhat.com>1997-07-08 00:44:35 +0000
commit9c2322bc08c01e34c7488ef12c1d1bf26097190b (patch)
treeec433de31ad6b94ffc5b422c95fcefb9895fd571 /libio
parent762a2918eee55943319f2c81f35257d59450ad5b (diff)
downloadglibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.gz
glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.xz
glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.zip
1997-07-08 02:18  Ulrich Drepper  <drepper@cygnus.com>

	* io/lockf.c (lockf): Clear fl before using.
	Patch by sr@adb.fr.

	* libio/strops.c: Correctly handle _IO_write_end.

	* nss/libnss_files.map: Add __nss_netgroup_parseline.
	* nss/nss_files/files-netgroup.c (_nss_netgroup_parseline): Don't
	panic if setnetgrent wasn't called before, return error.
	Patch by Thorsten Kukuk <kukuk@uni-paderborn.de>.

	* time/mktime.c: Define localtime_r function as my_mktime_localtime_r
	if locally defined.
	* time/strftime.c: Define localtime_r function as my_ftime_localtime_r
	if locally defined.
	Define tm_diff function as ftime_tm_diff if locally defined.
	Reported by Richard Stallman <rms@gnu.ai.mit.edu>.
Diffstat (limited to 'libio')
-rw-r--r--libio/strops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libio/strops.c b/libio/strops.c
index 9fa48eadc3..ee2ed16c51 100644
--- a/libio/strops.c
+++ b/libio/strops.c
@@ -88,7 +88,7 @@ DEFUN(_IO_str_init_static, (fp, ptr, size, pstart),
   if (pstart)
     {
       fp->_IO_write_ptr = pstart;
-      fp->_IO_write_end = ptr+size;
+      fp->_IO_write_end = pstart;
       fp->_IO_read_end = pstart;
     }
   else
@@ -158,7 +158,7 @@ DEFUN(_IO_str_overflow, (fp, c),
 	  fp->_IO_write_ptr = new_buf + (fp->_IO_write_ptr - old_buf);
 
 	  fp->_IO_write_base = new_buf;
-	  fp->_IO_write_end = fp->_IO_buf_end;
+	  fp->_IO_write_end = new_buf + (fp->_IO_write_end - old_buf);
 	}
     }