Still working on sixel

[citadel.git] / citadel / utils / setup.c

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 619b8b27e168ee02eadec2067833bc858cf91dbf..a2839ca72d7a237dfa79d4d8f972d14d7a9ff941 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1,10 +1,9 @@
 // Citadel setup utility
 //
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
-// The program is distributed without any warranty, expressed or implied.
 
 #define SHOW_ME_VAPPEND_PRINTF
 #include <stdlib.h>
@@ -26,7 +25,8 @@
 #include <sys/un.h>
 #include <assert.h>
 #include <libcitadel.h>
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
+#include "../server/server.h"
 #include "axdefs.h"
 #include "../server/sysdep.h"
 #include "../server/citadel_dirs.h"
@@ -62,8 +62,8 @@ typedef enum _SetupStep {
        eMaxQuestions = 12
 } eSetupStep;
 
-///"CREATE_XINETD_ENTRY";
-/* Environment variables, don't translate! */
+// "CREATE_XINETD_ENTRY";
+// Environment variables, don't translate!
 const char *EnvNames [eMaxQuestions] = {
         "HOME_DIRECTORY",
        "SYSADMIN_NAME",
@@ -643,18 +643,21 @@ void edit_value(int curr) {
 
 // Messages that are no longer in use.
 // We keep them here so we don't lose the translations if we need them later.
-#if 0
-important_message(_("Setup finished"),
-_("Setup of the Citadel server is complete.\n"
-"If you will be using WebCit, please run its\n"
-"setup program now; otherwise, run './citadel'\n"
-"to log in.\n"));
-important_message(_("Setup failed"),
-_("Setup is finished, but the Citadel server failed to start.\n"
-"Go back and check your configuration.\n");
-important_message(_("Setup finished"),
-_("Setup is finished.  You may now start the server."));
-#endif
+void unused_messages(void) {
+       important_message(_("Setup finished"),
+               _("Setup of the Citadel server is complete.\n"
+               "If you will be using WebCit, please run its\n"
+               "setup program now; otherwise, run './citadel'\n"
+               "to log in.\n")
+       );
+       important_message(_("Setup failed"),
+               _("Setup is finished, but the Citadel server failed to start.\n"
+               "Go back and check your configuration.\n")
+       );
+       important_message(_("Setup finished"),
+               _("Setup is finished.  You may now start the server.")
+       );
+}
 
 
 int main(int argc, char *argv[]) {
@@ -819,7 +822,7 @@ int main(int argc, char *argv[]) {
        long original_start_time = extract_long(&buf[4], 3);
 
        progress(activity, 1, 51);
-       serv_puts("DOWN 1");
+       serv_puts("DOWN");
        progress(activity, 2, 51);
        serv_gets(buf);
        if (buf[0] != '2') {