From 5ce3f47376e6407986574371482a650f8fac378c Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Sat, 8 Jun 2002 01:24:58 +0000
Subject: [PATCH] * fhandler_socket.cc (fhandler_socket::fstat): Don't assume
 that socket is unix-domain socket. * times.cc (hires_ms::prime): Set init
 flag. * times.cc (hires_ms::prime): Adjust epoch of initime_us from 1601 to
 1970.

---
 winsup/cygwin/ChangeLog          | 14 ++++++++++++++
 winsup/cygwin/fhandler_socket.cc |  7 ++++---
 winsup/cygwin/times.cc           |  6 +++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 245767779b..25db5f77c8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-07  Christopher Faylor  <cgf@redhat.com>
+
+	* fhandler_socket.cc (fhandler_socket::fstat): Don't assume that socket
+	is unix-domain socket.
+
+2002-06-07  Christopher Faylor  <cgf@redhat.com>
+
+	* times.cc (hires_ms::prime): Set init flag.
+
+2002-06-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
+	* times.cc (hires_ms::prime): Adjust epoch of initime_us from 1601 to
+	1970.
+
 2002-06-06  Christopher Faylor  <cgf@redhat.com>
 
 	* autoload.cc (timeGetDevCaps): Define new autoload function.
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index bed274babf..3207aaf070 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -256,9 +256,10 @@ fhandler_socket::dup (fhandler_base *child)
 int __stdcall
 fhandler_socket::fstat (struct __stat64 *buf, path_conv *pc)
 {
-  fhandler_disk_file fh;
-  fh.set_name (cstrdup (get_name ()), get_win32_name ());
-  return fh.fstat (buf, pc);
+  int res = fhandler_base::fstat (buf, pc);
+  if (!res)
+    buf->st_ino = get_handle ();
+  return res;
 }
 
 int
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index a64ee3d869..7a9a3eb330 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -646,14 +646,18 @@ hires_ms::prime ()
     minperiod = 0;
   else
     {
-      minperiod = min (max(tc.wPeriodMin, 1), tc.wPeriodMax);
+      minperiod = min (max (tc.wPeriodMin, 1), tc.wPeriodMax);
       timeBeginPeriod (minperiod);
     }
+
   initime_ms = timeGetTime ();
   GetSystemTimeAsFileTime (&f);
   SetThreadPriority (GetCurrentThread (), priority);
+
+  inited = 1;
   initime_us.HighPart = f.dwHighDateTime;
   initime_us.LowPart = f.dwLowDateTime;
+  initime_us.QuadPart -= FACTOR;
   initime_us.QuadPart /= 10;
 }
 
-- 
2.11.0