More changes to get attachments working.

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index a0b35bb67c41f15ce5199e5fc706d50c1a3d3c5f..5ca24d2db79e2ed1d58a0187e530c507950e8c11 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -32,6 +32,10 @@
 #include <errno.h>
 #include "citadel.h"
 #include "commands.h"
+#include "messages.h"
+#include "citadel_decls.h"
+#include "routines.h"
+#include "routines2.h"
 
 struct citcmd {
        struct citcmd *next;
@@ -43,37 +47,13 @@ struct citcmd {
 #define IFNEXPERT if ((userflags&US_EXPERT)==0)
 
 
-extern unsigned room_flags;
-extern char room_name[];
-extern struct CtdlServInfo serv_info;
-extern char axlevel;
-extern char is_room_aide;
-extern unsigned userflags;
-extern char sigcaught;
-extern char editor_path[];
-extern char printcmd[];
-extern char have_xterm;
-extern char rc_username[];
-extern char rc_password[];
-extern char rc_floor_mode;
-char rc_exp_beep;
+int rc_exp_beep;
 char rc_exp_cmd[256];
-extern int lines_printed;
-extern char express_msgs;
 
 char *gl_string;
 
 struct citcmd *cmdlist = NULL;
 
-void sighandler(int which_sig);
-void logoff(int code);
-int struncmp(char *lstr, char *rstr, int len);
-void formout(char *name);
-int room_prompt(int qrflags);
-void back(int spaces);
-int checkpagin(int lp, int pagin, int height);
-void color(int colornum);
-
 
 /* these variables are local to this module */
 char keepalives_enabled = KA_YES;      /* send NOOPs to server when idle */
@@ -316,6 +296,7 @@ void load_command_set(void) {
        strcpy(rc_password,"");
        rc_floor_mode = 0;
        rc_exp_beep = 1;
+       rc_allow_attachments = 0;
        strcpy(rc_exp_cmd, "");
 
        /* now try to open the citadel.rc file */
@@ -363,6 +344,10 @@ void load_command_set(void) {
                rc_exp_beep = atoi(&buf[5]);
                }
 
+           if (!struncmp(buf,"allow_attachments=", 18)) {
+               rc_allow_attachments = atoi(&buf[18]);
+               }
+
            if (!struncmp(buf,"username=",9))
                strcpy(rc_username,&buf[9]);