Fix dico/ in accordance with c1f6dc71

3 files changed, 30 insertions, 29 deletions

diff --git a/dico/cmdline.opt b/dico/cmdline.opt
index 3bd2cb3..b8a2742 100644
--- a/dico/cmdline.opt
+++ b/dico/cmdline.opt
@@ -23,7 +23,7 @@ OPTIONS_BEGIN("dico",
 	      [<[URL-or-WORD]>],
 	      [<gnu>],
 	      [<gnupackage>],
-	      [<copyright_year=2005-2012>],
+	      [<copyright_year=2005-2013>],
 	      [<copyright_holder=Free Software Foundation, Inc.>])
 
 GROUP([<Server selection>])
@@ -198,3 +198,32 @@ get_options (int argc, char *argv[], int *index)
     GETOPT(argc, argv, *index)
 }
 
+static char gplv3_text[] = "\
+   GNU Dico is free software; you can redistribute it and/or modify\n\
+   it under the terms of the GNU General Public License as published by\n\
+   the Free Software Foundation; either version 3, or (at your option)\n\
+   any later version.\n\
+\n\
+   GNU Dico is distributed in the hope that it will be useful,\n\
+   but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+   GNU General Public License for more details.\n\
+\n\
+   You should have received a copy of the GNU General Public License\n\
+   along with GNU Dico.  If not, see <http://www.gnu.org/licenses/>.\n";
+
+void
+ds_warranty(int argc, char **argv)
+{
+    grecs_print_version_only(&proginfo, stdout);
+    putchar('\n');
+    printf("%s", gplv3_text);
+}
+
+void
+shell_banner()
+{
+    grecs_print_version(&proginfo, stdout);
+    printf("%s\n\n", _("Type ? for help summary"));
+}
+
diff --git a/dico/func.c b/dico/func.c
index 292234b..ff73f3c 100644
--- a/dico/func.c
+++ b/dico/func.c
@@ -408,24 +408,3 @@ ds_version(int argc, char **argv)
     printf("%s\n", PACKAGE_STRING);
 }
 
-static char gplv3_text[] = "\
-   GNU Dico is free software; you can redistribute it and/or modify\n\
-   it under the terms of the GNU General Public License as published by\n\
-   the Free Software Foundation; either version 3, or (at your option)\n\
-   any later version.\n\
-\n\
-   GNU Dico is distributed in the hope that it will be useful,\n\
-   but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
-   GNU General Public License for more details.\n\
-\n\
-   You should have received a copy of the GNU General Public License\n\
-   along with GNU Dico.  If not, see <http://www.gnu.org/licenses/>.\n";
-
-void
-ds_warranty(int argc, char **argv)
-{
-    print_version_only(PACKAGE_STRING, stdout);
-    putchar('\n');
-    printf("%s", gplv3_text);
-}
diff --git a/dico/shell.c b/dico/shell.c
index f38c462..333b541 100644
--- a/dico/shell.c
+++ b/dico/shell.c
@@ -638,13 +638,6 @@ shell_getline(void *data, char **buf)
 }
 
 void
-shell_banner()
-{
-    print_version(PACKAGE_STRING, stdout);
-    printf("%s\n\n", _("Type ? for help summary"));
-}
-
-void
 dico_shell()
 {
     struct init_script dat;