undid some of the changes I made for the curses part of the input

routines, because apparently I broke it. I would spin on the login
name. So I put most of it back the way it was, now it works.
Sorry about that IO.
No amount of my poking around seems to make ChangeLog work, maybe it's
my version of CVS.

diff --git a/citadel/commands.c b/citadel/commands.c
index e15270b3a8775b5c29244d017edcaadec43c7ab6..ffd36bdabcef1fe66d4c6b1fc7a3029ad82c0a3d 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -433,10 +433,8 @@ void async_ka_start(void)
 int inkey(void)
 {                              /* get a character from the keyboard, with   */
        int a;                  /* the watchdog timer in effect if necessary */
-#ifndef HAVE_CURSES_H /* avoid compiler warning */
        fd_set rfds;
        struct timeval tv;
-#endif
        time_t start_time;
 
        scr_flush();
@@ -444,9 +442,6 @@ int inkey(void)
        time(&start_time);
 
        do {
-#ifdef HAVE_CURSES_H /* IO, maybe you wanna move this to screen.c */
-        a = scr_blockread();
-#else
                /* This loop waits for keyboard input.  If the keepalive
                 * timer expires, it sends a keepalive to the server if
                 * necessary and then waits again.
@@ -466,9 +461,6 @@ int inkey(void)
                 * (There's a hole in the bucket...)
                 */
                a = scr_getc();
-#endif
-
-
                if (a == 127)
                        a = 8;
                if (a > 126)

diff --git a/citadel/screen.c b/citadel/screen.c
index 66dd0ea1e3b67a84a30aa66e679d9c063809b37a..0de6d1fb704bbcebf4bb42049b3ad1d6b87fe1bd 100644 (file)
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -271,7 +271,6 @@ int scr_getc(void)
 {
   char buf;
 #ifdef HAVE_CURSES_H
-    /* This looks scary, the program will hang if mainwindow is null */
        if (mainwindow)
                return wgetch(mainwindow);
 #endif