Meow meow! Applied patches sent by LadySerenaKitty for improved FreeBSD compatibility.

[citadel.git] / textclient / commands.c

diff --git a/textclient/commands.c b/textclient/commands.c
index c8d920a3dbac0740395a92fbfa43d3bd1c98b4df..c2f9f77bd0ce882f4bae8a2eebafbcad0a318de6 100644 (file)
--- a/textclient/commands.c
+++ b/textclient/commands.c
@@ -627,10 +627,8 @@ static void really_do_keepalive(void) {
                }
        }
 
-       // If half keepalives are enabled, send a QNOP to the server (if the
-       // server supports it) and then do nothing.
-       if ((keepalives_enabled == KA_HALF)
-           && (ipc_for_signal_handlers->ServInfo.supports_qnop > 0)) {
+       // If half keepalives are enabled, send a QNOP to the server, then do nothing.
+       if (keepalives_enabled == KA_HALF) {
                CtdlIPC_chat_send(ipc_for_signal_handlers, "QNOP");
        }
 }
@@ -934,9 +932,16 @@ void load_command_set(void)
                snprintf(buf, sizeof buf, "%s/.citadelrc", getenv("HOME"));
                ccfile = fopen(buf, "r");
        }
+       if (getenv("APPDIR") != NULL) {
+               snprintf(buf, sizeof buf, "%s/citadel.rc", getenv("APPDIR"));
+               ccfile = fopen(buf, "r");
+       }
        if (ccfile == NULL) {
                ccfile = fopen(file_citadel_rc, "r");
        }
+       if (ccfile == NULL) {
+               ccfile = fopen("/usr/local/etc/citadel.rc", "r");
+       }
        if (ccfile == NULL) {
                ccfile = fopen("/etc/citadel.rc", "r");
        }