Fixes for Cygwin (see ChangeLog)

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index 24537952cbcb94ae28b2083bc795825d88e09239..e68c4436ca43c47f831b7e7f824b50410dcc685c 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -32,12 +32,16 @@
 
 #include <signal.h>
 #include <errno.h>
+#include <stdarg.h>
 #include "citadel.h"
 #include "commands.h"
 #include "messages.h"
 #include "citadel_decls.h"
 #include "routines.h"
 #include "routines2.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
 
 struct citcmd {
        struct citcmd *next;
@@ -77,7 +81,6 @@ void print_express(void) {
        FILE *outpipe;
 
        if (express_msgs == 0) return;
-       printf("printing express messages\n");
        express_msgs = 0;
        serv_puts("PEXP");
        serv_gets(buf);
@@ -368,6 +371,9 @@ void load_command_set(void) {
                snprintf(buf,sizeof buf,"%s/citadel.rc",BBSDIR);
                ccfile = fopen(buf,"r");
                }
+       if (ccfile==NULL) {
+               ccfile = fopen("./citadel.rc","r");
+               }
        if (ccfile==NULL) {
                perror("commands: cannot open citadel.rc");
                logoff(errno);