* autoload.cc (noload): Correctly save argument count register.

4 files changed, 19 insertions, 14 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fe3e97d89..75d49d070 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,21 +1,24 @@
+2002-06-06  Christopher Faylor  <cgf@redhat.com>
+
+	* autoload.cc (noload): Correctly save argument count register.
+
 2002-06-05  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
 	* fhandler.cc (fhandler_base::fstat): Initialise tv_nsec member of
 	st_atim, st_mtim, and st_ctim fields.
 	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Ditto.
 	* fhandler_process.cc (fhandler_process::fstat): Ditto.
-	* glob.c (stat32_to_STAT): Copy across the whole st_atim,
-	st_mtime, and st_ctim fields.
+	* glob.c (stat32_to_STAT): Copy across the whole st_atim, st_mtime, and
+	st_ctim fields.
 	* syscalls.cc (stat64_to_stat32): Ditto.
 	* times.cc (to_timestruc_t): New function.
 	(time_as_timestruc_t): New function.
 	* winsup.h: Add to_timestruc_t and time_as_timestruc_t functions.
-	* include/cygwin/stat.h: Replace time_t with timestruc_t
-	throughout for all file times, removing the st_spare1, st_spare2,
-	and st_spare3 fields in the process. Add macros to access tv_sec
-	fields by old names.
-	* include/cygwin/types.h: Typedef timespec_t and timestruc_t as
-	struct timespec.
+	* include/cygwin/stat.h: Replace time_t with timestruc_t throughout for
+	all file times, removing the st_spare1, st_spare2, and st_spare3 fields
+	in the process.  Add macros to access tv_sec fields by old names.
+	* include/cygwin/types.h: Typedef timespec_t and timestruc_t as struct
+	timespec.
 
 2002-06-03  Pierre Humblet <pierre.humblet@ieee.org>
 
@@ -64,8 +67,8 @@
 
 	* dir.cc (rmdir): Streamline.  Detect attempts to remove directories
 	from "read-only" virtual devices. (Suggested by Pavel Tsekov)
-	* syscalls.cc (unlink): Detect attempts to remove directories
-        from "read-only" virtual devices.  (From Pavel Tsekov)
+	* syscalls.cc (unlink): Detect attempts to remove directories from
+	"read-only" virtual devices.  (From Pavel Tsekov)
 
 2002-06-05  Christopher Faylor  <cgf@redhat.com>
 
@@ -98,7 +101,7 @@
 	to create correct group entry.  On error or on 9x systems fallback
 	to emulating Administrators group as before.
 	* passwd.cc (read_etc_passwd): When emulating nonexisting passwd file
-	on NT systems, read user and primary group SID from process token. 
+	on NT systems, read user and primary group SID from process token.
 	Use that info to create correct passwd entry.  On error or on 9x
 	systems fallback to emulating user with Administrator user id and
 	Administrators group as before.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 7a04b566d..c3c778fb7 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -276,10 +276,10 @@ version.cc winver.o: winver_stamp
 	@ :
 
 shared_info_magic.h: cygmagic shared_info.h
-	/bin/sh ${word 1,$^} $@ "$(CXX) -x c" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
 
 child_info_magic.h: cygmagic child_info.h
-	/bin/sh ${word 1,$^} $@ "$(CXX) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
 
 dcrt0.o sigproc.o: child_info_magic.h
 
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index 9af5aeaeb..7776896e3 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -122,9 +122,10 @@ noload:									\n\
 	jz	1f		# Nope.					\n\
 	decl	%eax		# Yes.  This is the # of bytes + 1	\n\
 	popl	%edx		# Caller's caller			\n\
-	pushl	%eax		# Save for later			\n\
+	movl	%eax,%ebx	# For manipulation			\n\
 	andl	$0xffff,%eax	# Only want lower word			\n\
 	addl	%eax,%esp	# Pop off bytes				\n\
+	pushl	%ebx		# Save for later			\n\
 	movl	$127,%eax	# ERROR_PROC_NOT_FOUND			\n\
 	pushl	%eax		# First argument			\n\
 	call	_SetLastError@4	# Set it				\n\
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index c00420d5d..71bf25a17 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -737,6 +737,7 @@ handle_to_fn (HANDLE h, char *posix_fn)
   if (res)
     {
       strcpy (posix_fn, "some disk file");
+      debug_printf ("NtQueryObject failed");
       return posix_fn;
     }