From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 5 Nov 2010 12:27:37 +0000 (-0400)
Subject: Windows: fix keystroke delay in waitkey
X-Git-Tag: upstream/1.8.0_pre1^2~4546
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=27f00bb29665d6a9c725817f105cfba48af4adbe;p=packages%2Fo%2Fopenafs.git

Windows: fix keystroke delay in waitkey

Fix the keystroke delay in the pthreaded wait for key
function.

Change-Id: I79293ceca57a418d23b0a211f875c17b805f9391
Reviewed-on: http://gerrit.openafs.org/3268
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c
index 330725f56..79b968e48 100644
--- a/src/lwp/waitkey.c
+++ b/src/lwp/waitkey.c
@@ -58,12 +58,14 @@ LWP_WaitForKeystroke(int seconds)
 {
     time_t startTime, nowTime;
     double timeleft = 1;
+#ifndef AFS_PTHREAD_ENV
     struct timeval twait;
 
-    time(&startTime);
-
     twait.tv_sec = 0;
     twait.tv_usec = LWP_KEYSTROKE_DELAY;
+#endif
+
+    time(&startTime);
 
     if (seconds >= 0)
 	timeleft = seconds;
@@ -79,11 +81,10 @@ LWP_WaitForKeystroke(int seconds)
 	/* sleep for  LWP_KEYSTROKE_DELAY ms and let other
 	 * process run some*/
 #ifdef AFS_PTHREAD_ENV
-	select(0, 0, 0, 0, &twait);
+	Sleep(LWP_KEYSTROKE_DELAY);
 #else
 	IOMGR_Select(0, 0, 0, 0, &twait);
 #endif
-
 	if (seconds > 0) {	/* we only worry about elapsed time if
 				 * not looping forever (seconds < 0) */
 	    /* now check elapsed time */