* cygwin.din: Remove cygwin_getshared.

* shared.cc: Ditto.
* include/cygwin/version.h: Bump API minor number.
* dtable.cc (dtable::build_fhandler): Fix incorrect test for socket.

6 files changed, 32 insertions, 22 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3027aea81..69a4810ae 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,6 +1,17 @@
+Tue Sep 11 11:23:10 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* cygwin.din: Remove cygwin_getshared.
+	* shared.cc: Ditto.
+	* include/cygwin/version.h: Bump API minor number.
+
+Tue Sep 11 11:14:11 2001  Dmitry Timoshkov  <dmitry@baikal.ru>
+
+	* dtable.cc (dtable::build_fhandler): Fix incorrect test for socket.
+
 Tue Sep 11 21:22:00 2001  Robert Collins <rbtcollins@hotmail.com>
 
-	* thread.cc (pthread_cond::~pthread_cond): Bugfix: Incorrect use of InterlockExchangePointer.
+	* thread.cc (pthread_cond::~pthread_cond): Bugfix: Incorrect use of
+	InterlockExchangePointer.
 	(pthread_mutex::~pthread_mutex): Ditto.
 	(semaphore::~semaphore): Ditto.
 
@@ -8,20 +19,26 @@ Tue Sep 11 18:15:00 2001  Robert Collins <rbtcollins@hotmail.com>
 
 	* dcrt0.cc (cygwin_finished_initializing): Copy _mtinterf on fork;
 	* fork.cc (fork_child): fixup thread-related structures after fork;
-	* thread.cc (MTinterface::Init): Initialise the new mutex, condition and semaphore lists.
-	(MTinterface::fixup_after_fork): Iterate through each list and fixup the objects.
+	* thread.cc (MTinterface::Init): Initialise the new mutex, condition
+	and semaphore lists.
+	(MTinterface::fixup_after_fork): Iterate through each list and fixup
+	the objects.
 	(pthread_cond::pthread_cond): Add this to the condition list.
 	(pthread_cond::~pthread_cond): Remove this from the condition list.
-	(pthread_cond::fixup_after_fork): Recreate as best we can the pre-fork state.
+	(pthread_cond::fixup_after_fork): Recreate as best we can the pre-fork
+	state.
 	(pthread_mutex::pthread_mutex): Add this to the mutex list.
 	(pthread_mutex::~pthread_mutex): Remove this from the mutex list.
-	(pthread_mutex::fixup_after_fork): Recreate as best we can the pre-fork state.
- 	(semaphore::semaphore): Store the initial value, and add this to the semaphore list.
+	(pthread_mutex::fixup_after_fork): Recreate as best we can the pre-fork
+	state.
+	(semaphore::semaphore): Store the initial value, and add this to the
+	semaphore list.
 	(semaphore::~semaphore): Remove this from the semaphore list.
 	(semaphore::Post): Increment the current semaphore value.
 	(semaphore::TryWait): Decrement the current semaphore value.
 	(semaphore::Wait): Ditto.
-	(semaphote::fixup_after_fork): Recreate the pre-fork state as best we can.
+	(semaphote::fixup_after_fork): Recreate the pre-fork state as best we
+	can.
 	* thread.h (pthread_mutex): New members to allow fixup_after_fork.
 	(pthread_cond): Ditto.
 	(semaphore): Ditto.
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index dae2631b9..dc35209f2 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -1037,8 +1037,6 @@ vhangup
 _vhangup = vhangup
 nice
 _nice = nice
-cygwin_getshared
-cygwin32_getshared = cygwin_getshared
 cygwin_conv_to_win32_path
 cygwin_conv_to_full_win32_path
 cygwin_conv_to_posix_path
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 5dc56ee64..a89663bb3 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -246,7 +246,7 @@ dtable::build_fhandler (int fd, const char *name, HANDLE handle)
 	devn = FH_CONIN;
       else if (GetConsoleScreenBufferInfo (handle, &cinfo))
 	devn= FH_CONOUT;
-      else if (wsock_started && getpeername ((SOCKET) handle, &sa, &sal))
+      else if (wsock_started && getpeername ((SOCKET) handle, &sa, &sal) == 0)
 	devn = FH_SOCKET;
       else if (GetFileType (handle) == FILE_TYPE_PIPE)
 	devn = FH_PIPE;
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 7ab001711..a8e027844 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -143,10 +143,11 @@ details. */
        43: sigsetjmp, siglongjmp fixed
        44: Export dirfd
        45: perprocess change, gamma_r, gammaf_r, lgamma_r, lgammaf_r
+       46: Remove cygwin_getshared
      */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 45
+#define CYGWIN_VERSION_API_MINOR 46
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh
index 421ca5bf2..5a859f4f0 100755
--- a/winsup/cygwin/mkvers.sh
+++ b/winsup/cygwin/mkvers.sh
@@ -92,10 +92,12 @@ wv_cvs_tag="$cvs_tag"
 
 #
 # Look in the source directory containing the include/cygwin/version.h
-# file for a ".snapshot-date" file.  If one is found then this information
-# will be saved for output to the DLL.
-#
+# and set dir accordingly.
 dir=`echo $dir | sed -e 's%/include/cygwin.*$%%' -e 's%include/cygwin.*$%.%'`
+
+# Look in $dir for a a ".snapshot-date" file.  If one is found then this
+# information will be saved for output to the DLL.
+#
 if [ -r "$dir/.snapshot-date" ]; then
     read snapshotdate < "$dir/.snapshot-date"
     snapshot="snapshot date
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index 1a267ea4c..8ce88d240 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -201,14 +201,6 @@ shared_info::heap_chunk_size ()
   return heap_chunk_in_mb << 20;
 }
 
-/* For apps that wish to access the shared data.  */
-
-shared_info *
-cygwin_getshared ()
-{
-  return cygwin_shared;
-}
-
 /*
  * Function to return a common SECURITY_DESCRIPTOR * that
  * allows all access.