shishi/src shisa.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/28 17:12:49

Modified files:
        src            : shisa.c 

Log message:
        Use gengetopt.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/src/shisa.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: shishi/src/shisa.c
diff -u shishi/src/shisa.c:1.2 shishi/src/shisa.c:1.3
--- shishi/src/shisa.c:1.2      Fri Nov 28 16:47:00 2003
+++ shishi/src/shisa.c  Fri Nov 28 17:12:49 2003
@@ -29,26 +29,42 @@
 #include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
-#include <locale.h>
+# include <locale.h>
+#else
+# define setlocale(Category, Locale) /* empty */
 #endif
 
 #include <gettext.h>
+#define _(String) gettext (String)
+#define gettext_noop(String) String
+#define N_(String) gettext_noop (String)
 
 #include <shisa.h>
 
+#include "shisa_cmd.h"
+
 int
 main (int argc, char *argv[])
 {
   Shisa *dbh;
+  struct gengetopt_args_info args_info;
   int rc;
 
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  rc = shisa_init (&dbh);
+  if (cmdline_parser (argc, argv, &args_info) != 0)
+    return 1;
+
+  rc = shisa_init_with_paths (&dbh, args_info.configuration_file_arg);
   if (rc != SHISA_OK)
     error (1, 0, "Initialization failed");
+
+  rc = shisa_cfg (dbh, args_info.library_options_arg);
+  if (rc != SHISA_OK)
+    error (1, 0, "Could not read library options: %s\n",
+          args_info.library_options_arg);
 
   shisa_done (dbh);