From 02e980612ec1654787f11bb4103c3c7d149e984c Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Thu, 24 Dec 2009 07:19:49 +0100
Subject: [PATCH] make #ifdef positive, add comments

---
 lib/hcrypto/ui.c | 90 +++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/lib/hcrypto/ui.c b/lib/hcrypto/ui.c
index de7d0fc9a..f6f8a1ffe 100644
--- a/lib/hcrypto/ui.c
+++ b/lib/hcrypto/ui.c
@@ -55,7 +55,52 @@ intr(int sig)
     intr_flag++;
 }
 
-#ifndef HAVE_CONIO_H
+#ifdef HAVE_CONIO_H
+
+/*
+ * Windows does console slightly different then then unix case.
+ */
+
+static int
+read_string(const char *preprompt, const char *prompt, 
+	    char *buf, size_t len, int echo)
+{
+    int of = 0;
+    int c;
+    char *p;
+    void (*oldsigintr)(int);
+
+    _cprintf("%s%s", preprompt, prompt);
+
+    oldsigintr = signal(SIGINT, intr);
+
+    p = buf;
+    while(intr_flag == 0){
+	c = ((echo)? _getche(): _getch());
+	if(c == '\n')
+	    break;
+	if(of == 0)
+	    *p++ = c;
+	of = (p == buf + len);
+    }
+    if(of)
+	p--;
+    *p = 0;
+    
+    if(echo == 0){
+	printf("\n");
+    }
+
+    signal(SIGINT, oldsigintr);
+    
+    if(intr_flag)
+	return -2;
+    if(of)
+	return -1;
+    return 0;
+}
+
+#else /* !HAVE_CONIO_H */
 
 #ifndef NSIG
 #define NSIG 47
@@ -142,48 +187,7 @@ read_string(const char *preprompt, const char *prompt,
     return 0;
 }
 
-#else  /* CONIO_H */
-
-static int
-read_string(const char *preprompt, const char *prompt, 
-	    char *buf, size_t len, int echo)
-{
-    int of = 0;
-    int c;
-    char *p;
-    void (*oldsigintr)(int);
-
-    _cprintf("%s%s", preprompt, prompt);
-
-    oldsigintr = signal(SIGINT, intr);
-
-    p = buf;
-    while(intr_flag == 0){
-	c = ((echo)? _getche(): _getch());
-	if(c == '\n')
-	    break;
-	if(of == 0)
-	    *p++ = c;
-	of = (p == buf + len);
-    }
-    if(of)
-	p--;
-    *p = 0;
-    
-    if(echo == 0){
-	printf("\n");
-    }
-
-    signal(SIGINT, oldsigintr);
-    
-    if(intr_flag)
-	return -2;
-    if(of)
-	return -1;
-    return 0;
-}
-
-#endif
+#endif /* HAVE_CONIO_H */
 
 int
 UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify)