Patches from Matt with slight mod from me to do without strlen. Also modified lprintf...

[citadel.git] / citadel / screen.c

diff --git a/citadel/screen.c b/citadel/screen.c
index 2acfcd2d1d93c69fd78fed258a015f397674c623..a1d8abd7546f0c477d62725f061458e36fc40684 100644 (file)
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -4,13 +4,14 @@
  * Handle full-screen curses stuff
  */
 
-#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include "sysdep.h"
 #ifdef HAVE_VW_PRINTW
 #define _vwprintw vw_printw
 #else
@@ -32,8 +33,8 @@ static WINDOW *mainwindow = NULL;
 static WINDOW *statuswindow = NULL;
 
 char rc_screen;
-char arg_screen;
 #endif
+char arg_screen;
 
 extern int screenheight;
 extern int screenwidth;
@@ -55,7 +56,7 @@ int is_curses_enabled(void) {
  * status_line() is a convenience function for writing a "typical"
  * status line to the window.
  */
-void status_line(const char *humannode, const char *bbs_city,
+void status_line(const char *humannode, const char *site_location,
                 const char *room_name, int secure, int newmailcount)
 {
 #if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
@@ -85,7 +86,7 @@ void status_line(const char *humannode, const char *bbs_city,
 #if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
 void wait_indicator(int state) {
 
-       if (!isendwin() && statuswindow) {
+       if (statuswindow && !isendwin()) {
 
                mvwinch(statuswindow, 0, screenwidth - 2);
                switch (state) {
@@ -108,6 +109,8 @@ void wait_indicator(int state) {
                wrefresh(mainwindow);   /* this puts the cursor back */
        }
 }
+#else
+void wait_indicator(int state) {}
 #endif
 
 
@@ -476,7 +479,7 @@ int scr_set_windowsize(CtdlIPC* ipc)
                wresize(statuswindow, 1, screenwidth);
 #endif
                mvwin(statuswindow, screenheight, 0);
-               status_line(ipc->ServInfo.humannode, ipc->ServInfo.bbs_city,
+               status_line(ipc->ServInfo.humannode, ipc->ServInfo.site_location,
                                room_name, secure, -1);
                wnoutrefresh(mainwindow);
                wnoutrefresh(statuswindow);