war on cruft continues

diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c
index bd6f88cbddc8491c81ff3684d977df85a5aa4256..9e6fc86c29c4cadac4aa40e45c2562c1301afec4 100644 (file)
--- 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 <stdarg.h>
 #include <errno.h>
 #include <libcitadel.h>
-///#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(&params, 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(&params);
 #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 ec23b1626829ecb2e1be9b1ca6d6d6ffc9a8df51..1225bf9877a3bd87a106e0af2dfd3b1a43ae8b7a 100644 (file)
--- 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 <pthread.h>
 #endif
 #include <libcitadel.h>
-///#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 29f3e267da0f6118a6b423b8620b78e344935593..8933687bfc55dc694b662262d592e38495c64cef 100644 (file)
--- 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 <stdarg.h>
 #include <libcitadel.h>
-//#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 3e864a41a3328d509e3d04b8258289202c86aa5d..2de25792eb20a96f5030f0ae59c7068c2595ae81 100644 (file)
--- 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 <limits.h>
 #include <stdio.h>
 #include <libcitadel.h>
-///#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 fecdd8c534ef39478c3d998c1c4e390c5eddd5f9..54219f31fd31ab8ef5e27fcbd202a28cce945ad7 100644 (file)
--- a/textclient/src/commands.c
+++ b/textclient/src/commands.c
@@ -51,7 +51,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <libcitadel.h>
-///#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 9ec53f0ef54c58ef553dffcc686099f9caa4571c..a43f1b6ceef1816f20ae702249a1e233831374d0 100644 (file)
--- a/textclient/src/ecrash.c
+++ b/textclient/src/ecrash.c
@@ -38,11 +38,6 @@
 #include <sys/stat.h>
 #include <pthread.h>
 #include <libcitadel.h>
-///#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 cad578b618f3d784d4794dfa0d4b8929fc89d01d..4094b6e21073f38fae0093a3a96f0f62220479ef 100644 (file)
--- a/textclient/src/include/citadel_ipc.h
+++ b/textclient/src/include/citadel_ipc.h
@@ -9,7 +9,6 @@
 
 #include <libcitadel.h>
 #include <limits.h>
-////#include "sysdep.h"
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif

diff --git a/textclient/src/ipc_c_tcp.c b/textclient/src/ipc_c_tcp.c
index d87cdf5b7157dd9e9748c20b9f1d74d6e6e45252..53b2093210e438491622af90564f081270337205 100644 (file)
--- a/textclient/src/ipc_c_tcp.c
+++ b/textclient/src/ipc_c_tcp.c
@@ -21,12 +21,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <libcitadel.h>
-//#include "citadel.h"
 #include "citadel_ipc.h"
-//#include "citadel_decls.h"
-//#ifndef HAVE_SNPRINTF
-//#include "snprintf.h"
-//#endif
 #include "commands.h"
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/textclient/src/messages.c b/textclient/src/messages.c
index 5b694e85c58543c8d5ace6be545678625e5f84ca..2e0d18ca5955bfbe089b9e040152b3f052c8916e 100644 (file)
--- 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 <stdarg.h>
 #include <libcitadel.h>
-///#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 b58db20ae57142d20088c478e498562d3cdae5cb..7754316b02c5838c3d927936efd9f92e4e127d26 100644 (file)
--- 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 <errno.h>
 #include <stdarg.h>
 #include <libcitadel.h>
-//#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 856475911db64986b97639edb7f043bb5522ad90..3f0e4d8f15e2a55d5806c081e4805d8a00c6419a 100644 (file)
--- a/textclient/src/routines.c
+++ b/textclient/src/routines.c
@@ -57,7 +57,6 @@
 #define IFNAIDE if (axlevel<AxAideU)
 
 extern unsigned userflags;
-//extern char *axdefs[8];
 extern char sigcaught;
 extern char rc_floor_mode;
 extern int rc_ansi_color;

diff --git a/textclient/src/routines2.c b/textclient/src/routines2.c
index 32ec9fc016d0053c74381fc787e6f17d876d4ac9..bb3e35432ee2966f4ced3ba274b1698eedf0116f 100644 (file)
--- a/textclient/src/routines2.c
+++ b/textclient/src/routines2.c
@@ -2,7 +2,7 @@
  * More client-side support functions.
  * Unlike routines.c, some of these DO use global variables.
  *
- * 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,16 +40,11 @@
 #include <stdarg.h>
 #include <libcitadel.h>
 #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 4144c240413d254e0226857c214d85a271c325f5..a8baa30468b755581d42fa0b3947c87bfc9bb863 100644 (file)
--- 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 <sys/types.h>
 #include <sys/ioctl.h>
 #include "sysdep.h"
-///#ifndef HAVE_SNPRINTF
-///#include "snprintf.h"
-///#endif
 #include <libcitadel.h>
-///#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 2748035c79a5d749a8fb826e0c40e4003f3cf0e6..5a56915bfb76caf7feb3b7478ac34d341280912c 100644 (file)
--- 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 <stdarg.h>
 #include <libcitadel.h>
 #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 */