From: Michael Hampton Date: Thu, 26 Feb 2004 20:30:36 +0000 (+0000) Subject: * Populate IPC into a few more places to avoid a nasty crash at MORE prompt X-Git-Tag: v7.86~5573 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=747d40395ccc7abd279d533e6f001ee90c75f845;p=citadel.git * Populate IPC into a few more places to avoid a nasty crash at MORE prompt --- diff --git a/citadel/ChangeLog b/citadel/ChangeLog index f7aae480c..7b7d00067 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 614.52 2004/02/26 20:30:36 error + * Populate IPC into a few more places to avoid a nasty crash at MORE prompt + Revision 614.51 2004/02/26 20:17:29 error * Client stability and enhancements: * CtdlServInfo structure moved inside CtdlIPC; eliminates unnecessary @@ -5410,3 +5413,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/commands.c b/citadel/commands.c index c00d389af..26128b995 100644 --- a/citadel/commands.c +++ b/citadel/commands.c @@ -157,7 +157,7 @@ int checkpagin(int lp, unsigned int pagin, unsigned int height) if (!pagin) return(0); if (lp>=(height-1)) { set_keepalives(KA_HALF); - hit_any_key(); + hit_any_key(ipc_for_signal_handlers); /* Cheating -IO */ set_keepalives(KA_YES); return(0); } diff --git a/citadel/rooms.c b/citadel/rooms.c index 431403aa8..91220fedd 100644 --- a/citadel/rooms.c +++ b/citadel/rooms.c @@ -35,7 +35,6 @@ void sttybbs(int cmd); -void hit_any_key(void); void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto); void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax); int pattern(char *search, char *patn); @@ -313,7 +312,7 @@ void knrooms(CtdlIPC *ipc, int kn_floor_mode) }; color(DIM_WHITE); - IFNEXPERT hit_any_key(); + IFNEXPERT hit_any_key(ipc); } @@ -344,7 +343,7 @@ void listzrooms(CtdlIPC *ipc) }; color(DIM_WHITE); - IFNEXPERT hit_any_key(); + IFNEXPERT hit_any_key(ipc); } diff --git a/citadel/rooms.h b/citadel/rooms.h index a103a052d..68d9d6524 100644 --- a/citadel/rooms.h +++ b/citadel/rooms.h @@ -19,7 +19,7 @@ void create_floor(CtdlIPC *ipc); void edit_floor(CtdlIPC *ipc); void kill_floor(CtdlIPC *ipc); void enter_bio(CtdlIPC *ipc); -void hit_any_key(void); +void hit_any_key(CtdlIPC *ipc); int save_buffer(void *file, size_t filelen, const char *pathname); void destination_directory(char *dest, const char *supplied_filename); void do_edit(CtdlIPC *ipc,