From f8d2e0562f12cc7c483df1be34dd5a0c3bf39dc0 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 26 Apr 2016 12:29:26 -0400 Subject: [PATCH] war on cruft continues --- textclient/src/citadel.c | 19 ++++--------------- textclient/src/citadel_ipc.c | 21 +-------------------- textclient/src/client_chat.c | 6 +----- textclient/src/client_passwords.c | 3 +-- textclient/src/commands.c | 4 ---- textclient/src/ecrash.c | 5 ----- textclient/src/include/citadel_ipc.h | 1 - textclient/src/ipc_c_tcp.c | 5 ----- textclient/src/messages.c | 6 +----- textclient/src/rooms.c | 7 +------ textclient/src/routines.c | 1 - textclient/src/routines2.c | 7 +------ textclient/src/screen.c | 6 +----- textclient/src/tuiconfig.c | 6 +----- 14 files changed, 12 insertions(+), 85 deletions(-) diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c index bd6f88cbd..9e6fc86c2 100644 --- a/textclient/src/citadel.c +++ b/textclient/src/citadel.c @@ -1,7 +1,7 @@ /* * Main source module for the client program. * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -41,9 +41,7 @@ #include #include #include -///#include "citadel.h" #include "citadel_ipc.h" -//#include "axdefs.h" #include "routines.h" #include "routines2.h" #include "tuiconfig.h" @@ -58,7 +56,6 @@ #include "snprintf.h" #endif #include "screen.h" -///#include "citadel_dirs.h" #include "ecrash.h" #include "md5.h" @@ -1418,20 +1415,13 @@ int main(int argc, char **argv) #ifdef HAVE_BACKTRACE bzero(¶ms, sizeof(params)); -// params.filename = file_pid_paniclog; -// panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT); -/// params.filep = fopen(file_pid_paniclog, "a+"); params.debugLevel = ECRASH_DEBUG_VERBOSE; params.dumpAllThreads = TRUE; params.useBacktraceSymbols = 1; -/// BuildSymbolTable(&symbol_table); -// params.symbolTable = &symbol_table; params.signals[0]=SIGSEGV; params.signals[1]=SIGILL; params.signals[2]=SIGBUS; params.signals[3]=SIGABRT; - -/// eCrash_Init(¶ms); #endif setIPCErrorPrintf(scr_printf); setCryptoStatusHook(statusHook); @@ -1445,10 +1435,9 @@ int main(int argc, char **argv) logoff(NULL, 3); } - stty_ctdl(SB_SAVE); /* Store the old terminal parameters */ - load_command_set(); /* parse the citadel.rc file */ - stty_ctdl(SB_NO_INTR); /* Install the new ones */ - /* signal(SIGHUP, dropcarr);FIXME */ /* Cleanup gracefully if carrier is dropped */ + stty_ctdl(SB_SAVE); /* Store the old terminal parameters */ + load_command_set(); /* parse the citadel.rc file */ + stty_ctdl(SB_NO_INTR); /* Install the new ones */ signal(SIGPIPE, dropcarr); /* Cleanup gracefully if local conn. dropped */ signal(SIGTERM, dropcarr); /* Cleanup gracefully if terminated */ signal(SIGCONT, catch_sigcont); /* Catch SIGCONT so we can reset terminal */ diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c index ec23b1626..1225bf987 100644 --- a/textclient/src/citadel_ipc.c +++ b/textclient/src/citadel_ipc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -40,10 +40,7 @@ #include #endif #include -///#include "citadel.h" #include "citadel_ipc.h" -//#include "citadel_decls.h" -//#include "citadel_dirs.h" #ifdef THREADED_CLIENT pthread_mutex_t rwlock; #endif @@ -2277,22 +2274,6 @@ int CtdlIPCInternalProgram(CtdlIPC *ipc, int secret, char *cret) -/* - * Not implemented: - * - * CHAT - * ETLS - * EXPI - * GTLS - * IGAB - * MSG3 - * MSG4 - * NDOP - * NETP - * NUOP - * SMTP - */ - /* ************************************************************************** */ /* Stuff below this line is not for public consumption */ diff --git a/textclient/src/client_chat.c b/textclient/src/client_chat.c index 29f3e267d..8933687bf 100644 --- a/textclient/src/client_chat.c +++ b/textclient/src/client_chat.c @@ -1,7 +1,7 @@ /* * front end for multiuser chat * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -39,7 +39,6 @@ #endif #include #include -//#include "citadel.h" #include "citadel_ipc.h" #include "client_chat.h" #include "commands.h" @@ -47,9 +46,6 @@ #include "citadel_decls.h" #include "rooms.h" #include "messages.h" -//#ifndef HAVE_SNPRINTF -//#include "snprintf.h" -//#endif #include "screen.h" #define MIN(a, b) ((a) < (b) ? (a) : (b)) diff --git a/textclient/src/client_passwords.c b/textclient/src/client_passwords.c index 3e864a41a..2de25792e 100644 --- a/textclient/src/client_passwords.c +++ b/textclient/src/client_passwords.c @@ -2,7 +2,7 @@ * Functions which allow the client to remember usernames and passwords for * various sites. * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -24,7 +24,6 @@ #include #include #include -///#include "citadel.h" #include "citadel_ipc.h" #include "commands.h" #include "client_passwords.h" diff --git a/textclient/src/commands.c b/textclient/src/commands.c index fecdd8c53..54219f31f 100644 --- a/textclient/src/commands.c +++ b/textclient/src/commands.c @@ -51,7 +51,6 @@ #include #include #include -///#include "citadel.h" #include "citadel_ipc.h" #include "commands.h" #include "messages.h" @@ -62,9 +61,6 @@ #include "client_chat.h" #include "help.h" #include "tuiconfig.h" -//#ifndef HAVE_SNPRINTF -//#include "snprintf.h" -///#endif #include "screen.h" #include "ecrash.h" diff --git a/textclient/src/ecrash.c b/textclient/src/ecrash.c index 9ec53f0ef..a43f1b6ce 100644 --- a/textclient/src/ecrash.c +++ b/textclient/src/ecrash.c @@ -38,11 +38,6 @@ #include #include #include -///#include "server.h" -/// #include "sysdep_decls.h" -//#include "support.h" -///#include "config.h" -//#include "citserver.h" #include "ecrash.h" #define NIY() printf("function not implemented yet!\n"); diff --git a/textclient/src/include/citadel_ipc.h b/textclient/src/include/citadel_ipc.h index cad578b61..4094b6e21 100644 --- a/textclient/src/include/citadel_ipc.h +++ b/textclient/src/include/citadel_ipc.h @@ -9,7 +9,6 @@ #include #include -////#include "sysdep.h" #ifdef HAVE_PTHREAD_H #include #endif diff --git a/textclient/src/ipc_c_tcp.c b/textclient/src/ipc_c_tcp.c index d87cdf5b7..53b209321 100644 --- a/textclient/src/ipc_c_tcp.c +++ b/textclient/src/ipc_c_tcp.c @@ -21,12 +21,7 @@ #include #include #include -//#include "citadel.h" #include "citadel_ipc.h" -//#include "citadel_decls.h" -//#ifndef HAVE_SNPRINTF -//#include "snprintf.h" -//#endif #include "commands.h" #include #include diff --git a/textclient/src/messages.c b/textclient/src/messages.c index 5b694e85c..2e0d18ca5 100644 --- a/textclient/src/messages.c +++ b/textclient/src/messages.c @@ -1,7 +1,7 @@ /* * Text client functions for reading and writing of messages * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -43,16 +43,12 @@ #include #include -///#include "citadel.h" #include "citadel_ipc.h" #include "citadel_decls.h" #include "messages.h" #include "commands.h" #include "tuiconfig.h" #include "rooms.h" -//#ifndef HAVE_SNPRINTF -///#include "snprintf.h" -//#endif #include "screen.h" #define MAXWORDBUF SIZ diff --git a/textclient/src/rooms.c b/textclient/src/rooms.c index b58db20ae..7754316b0 100644 --- a/textclient/src/rooms.c +++ b/textclient/src/rooms.c @@ -1,7 +1,7 @@ /* * Client-side functions which perform room operations * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -26,18 +26,13 @@ #include #include #include -//#include "citadel.h" #include "citadel_ipc.h" #include "citadel_decls.h" #include "rooms.h" #include "commands.h" #include "messages.h" #include "tuiconfig.h" -//#ifndef HAVE_SNPRINTF -//#include "snprintf.h" -//#endif #include "screen.h" -//#include "citadel_dirs.h" #define IFNEXPERT if ((userflags&US_EXPERT)==0) diff --git a/textclient/src/routines.c b/textclient/src/routines.c index 856475911..3f0e4d8f1 100644 --- a/textclient/src/routines.c +++ b/textclient/src/routines.c @@ -57,7 +57,6 @@ #define IFNAIDE if (axlevel #include #include "sysdep.h" -///#include "citadel.h" #include "citadel_ipc.h" #include "citadel_decls.h" #include "routines2.h" #include "routines.h" #include "commands.h" -//#include "messages.h" -//#ifndef HAVE_SNPRINTF -//#include "snprintf.h" -//#endif #include "screen.h" /* work around solaris include files */ diff --git a/textclient/src/screen.c b/textclient/src/screen.c index 4144c2404..a8baa3046 100644 --- a/textclient/src/screen.c +++ b/textclient/src/screen.c @@ -1,7 +1,7 @@ /* * Screen output handling * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -23,11 +23,7 @@ #include #include #include "sysdep.h" -///#ifndef HAVE_SNPRINTF -///#include "snprintf.h" -///#endif #include -///#include "citadel.h" #include "citadel_ipc.h" #include "citadel_decls.h" #include "commands.h" diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c index 2748035c7..5a56915bf 100644 --- a/textclient/src/tuiconfig.c +++ b/textclient/src/tuiconfig.c @@ -1,7 +1,7 @@ /* * Configuration screens that are part of the text mode client. * - * Copyright (c) 1987-2014 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -39,16 +39,12 @@ #include #include #include "sysdep.h" -///#include "citadel.h" #include "citadel_ipc.h" #include "citadel_decls.h" #include "tuiconfig.h" #include "messages.h" #include "routines.h" #include "commands.h" -///#ifndef HAVE_SNPRINTF -///#include "snprintf.h" -///#endif #include "screen.h" /* work around solaris include files */ -- 2.30.2