shishi/src Makefile.am shisa.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/12/02 12:30:45

Modified files:
        src            : Makefile.am shisa.c 

Log message:
        Gengetopt fixes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/src/Makefile.am.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/src/shisa.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: shishi/src/Makefile.am
diff -u shishi/src/Makefile.am:1.33 shishi/src/Makefile.am:1.34
--- shishi/src/Makefile.am:1.33 Tue Dec  2 11:28:48 2003
+++ shishi/src/Makefile.am      Tue Dec  2 12:30:44 2003
@@ -32,7 +32,8 @@
 shisa_LDADD = ../db/libshisa.la ../lib/libshishi.la
 
 $(BUILT_SOURCES): shisa.ggo
-       gengetopt --unamed-opts --input $< --file-name shisa_cmd
+       gengetopt --unamed-opts --no-handle-help --no-handle-error \
+                --input $< --file-name shisa_cmd
        perl -pi -e 's/\[FILES\]/\[REALM \[PRINCIPAL\]\]/g' shisa_cmd.c
 
 sbin_PROGRAMS = shishid
Index: shishi/src/shisa.c
diff -u shishi/src/shisa.c:1.12 shishi/src/shisa.c:1.13
--- shishi/src/shisa.c:1.12     Tue Dec  2 11:19:43 2003
+++ shishi/src/shisa.c  Tue Dec  2 12:30:44 2003
@@ -318,7 +318,10 @@
   program_name = argv[0];
 
   if (cmdline_parser (argc, argv, &args_info) != 0)
-    return 1;
+    {
+      error (1, 0, "Try `%s --help' for more information.", argv[0]);
+      return 1;
+    }
 
   if (args_info.add_given + args_info.dump_given + args_info.list_given +
       args_info.modify_given + args_info.remove_given > 1 ||
@@ -332,6 +335,9 @@
       args_info.modify_given + args_info.remove_given != 1)
     {
       cmdline_parser_print_help ();
+      printf("\nMandatory arguments to long options are "
+            "mandatory for short options too.\n\n"
+            "Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
       return 1;
     }