* cygheap.cc (cygheap_user::set_name): Correct thinko in below change.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1af4606..85eb55d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
 2002-06-26  Christopher Faylor  <cgf@redhat.com>
 
+       * cygheap.cc (cygheap_user::set_name): Correct thinko in below change.
+
+2002-06-26  Christopher Faylor  <cgf@redhat.com>
+
        * cygheap.cc (cygheap_user::set_name): Avoid clearing things when just
        setting name to itself or during first time initialization.
 

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index ded9c25..561e933 100644 (file)
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -440,12 +440,14 @@ cygheap_user::~cygheap_user ()
 void
 cygheap_user::set_name (const char *new_name)
 {
-  if (strcasematch (new_name, pname))
-    return;            /* nothing changed */
-
   bool allocated = !!pname;
+
   if (allocated)
-    cfree (pname);
+    {
+      if (strcasematch (new_name, pname))
+       return;
+      cfree (pname);
+    }
 
   pname = cstrdup (new_name ? new_name : "");
   if (!allocated)

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 443612f..c412e21 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -103,11 +103,13 @@ fhandler_disk_file::fstat_by_name (struct __stat64 *buf, path_conv *pc)
 
   if (!pc->exists ())
     {
+      debug_printf ("already determined that pc does not exist");
       set_errno (ENOENT);
       res = -1;
     }
-  else if ((handle = FindFirstFile (pc->get_win32 (), &local)) == INVALID_HANDLE_VALUE)
+  else if ((handle = FindFirstFile ((char *) pc, &local)) == INVALID_HANDLE_VALUE)
     {
+      debug_printf ("FindFirstFile failed, %E");
       __seterrno ();
       res = -1;
     }