about summary refs log tree commit diff
path: root/sysdeps/i386/strtok.S
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-02 17:43:35 +0000
committerRoland McGrath <roland@gnu.org>1996-07-02 17:43:35 +0000
commitffee131630368bc2600747346d0b03025cbca6ee (patch)
tree4e496094645ba4e4d744868167cd0f79f118aa05 /sysdeps/i386/strtok.S
parenteb48c9632eb9b40b0855003d48e5547c542d2abe (diff)
downloadglibc-ffee131630368bc2600747346d0b03025cbca6ee.tar.gz
glibc-ffee131630368bc2600747346d0b03025cbca6ee.tar.xz
glibc-ffee131630368bc2600747346d0b03025cbca6ee.zip
Tue Jul 2 10:44:37 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
	* pwd/fgetpwent.c: Don't include ../nss/nss_files/files-parse.c to
	define parse_line function.
	(parse_line): #define to _nss_files_parse_pwent and
	add extern decl for that.

	* nss/nss_files/files-XXX.c (internal_getent): Return
	NSS_STATUS_TRYAGAIN for ERANGE error.

	* sysdeps/i386/strtok.S (LreturnNULL): Save current state ptr instead
	of null, so next round returns null again instead of bombing.  Fix
	from drepper.

	* nss/nss_files/files-parse.c (LINE_PARSER): Take new first arg EOLSET.
	Remove ; after `ENTDATA_DECL (data)'.
	Truncate line at strpbrk (line, EOLSET "\n").
	(ENTDATA_DECL): Put ; at end.
	(MIDLINE_COMMENTS): Macro removed.
	* nss/nss_files/files-ethers.c: Pass new argument.
	* nss/nss_files/files-hosts.c: Likewise.
	* nss/nss_files/files-network.c: Likewise.
	* nss/nss_files/files-parse.c: Likewise.
	* nss/nss_files/files-proto.c: Likewise.
	* nss/nss_files/files-rpc.c: Likewise.
	* nss/nss_files/files-service.c: Likewise.
	* grp/fgetgrent.c: Likewise.
	* pwd/fgetpwent.c: Likewise.
	* nss/nss_files/files-pwd.c: Get parse_line with extern decl, since
	fgetpwent.c already defines it.
	* nss/nss_files/files-grp.c: Likewise.

	* elf/dl-load.c (_dl_map_object): Use any object with matching l_name
	as well as any matching with l_libname.  Fix DT_SONAME lookup to use
	string table properly.

	* elf/rtld.c (dl_main): Set _dl_rtld_map.l_name from _dl_argv[0] when
	invoked directly, and l_libname from that if PT_INTERP missing.
	Set l_name from l_libname only if not set from argv.

	* time/europe, time/northamerica: Updated from ADO 96i.

	* stdio-common/tst-ungetc.c: Include unistd.h.
Diffstat (limited to 'sysdeps/i386/strtok.S')
-rw-r--r--sysdeps/i386/strtok.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/i386/strtok.S b/sysdeps/i386/strtok.S
index 2ef8803ef6..c38ebf90a2 100644
--- a/sysdeps/i386/strtok.S
+++ b/sysdeps/i386/strtok.S
@@ -269,15 +269,15 @@ L11:
 LreturnNULL:
 	xorl %eax, %eax
 
-	/* Store NULL as pointer to the next character.  */
+	/* Store current pointer for next round.  */
 #ifdef USE_AS_STRTOK_R
 	movl 12(%esp), %ecx
-	movl %eax, (%ecx)
+	movl %edx, (%ecx)
 #else
 # ifndef PIC
-	movl %eax, save_ptr
+	movl %edx, save_ptr
 # else
-	movl %eax, save_ptr@GOTOFF(%ebx)
+	movl %edx, save_ptr@GOTOFF(%ebx)
 	popl %ebx
 # endif
 #endif