Make sure all of the utilities carry the new and improved version of the GPL declarat...

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 8c1f18a5383b01ebadedde4727947bdb77683f54..87ce92ffd2bf7bce5169647deb10c5b663553e0c 100644 (file)
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -2,13 +2,9 @@
 //
 // Copyright (c) 2009-2022 citadel.org
 //
-// 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.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// 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.
 
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index 6971d60a4d25b4d33a0f9adacb3dec54052eb205..e2a3a29c1ca3f05203f8217477d9f852505c823d 100644 (file)
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -2,13 +2,9 @@
 //
 // Copyright (c) 1987-2022 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.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// 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.
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index dbcd2a3016fe033555dd460ee20e3a99d3857ade..2099418bf765d1d3017c65576e4235a05532d537 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -2,13 +2,9 @@
 //
 // Copyright (c) 1987-2022 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.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// 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>
@@ -236,7 +232,7 @@ int yesno(const char *question, int default_value) {
        char buf[SIZ];
 
        do {
-               printf("%s\n%s [%s] --> ", question, _("Yes/No"), ( default_value ? _("Yes") : _("No") ));
+               printf("\033[31m\033[32m%s\n%s [\033[33m%s\033[32m]\033[0m --> ", question, _("Yes/No"), ( default_value ? _("Yes") : _("No") ));
                if (fgets(buf, sizeof buf, stdin)) {
                        answer = tolower(buf[0]);
                        if ((buf[0]==0) || (buf[0]==13) || (buf[0]==10)) {
@@ -524,8 +520,7 @@ void set_bool_val(int msgpos, int *ip, char *DefValue) {
 }
 
 
-void set_str_val(int msgpos, char *Target, char *DefValue) 
-{
+void set_str_val(int msgpos, char *Target, char *DefValue) {
        strprompt(setup_titles[msgpos], 
                  setup_text[msgpos], 
                  Target,