port to current GNUNET_GETOPT API

1 files changed, 22 insertions, 12 deletions

diff --git a/src/fuse/gnunet-fuse.c b/src/fuse/gnunet-fuse.c
index aeebb46..7d71975 100644
--- a/src/fuse/gnunet-fuse.c
+++ b/src/fuse/gnunet-fuse.c
@@ -496,26 +496,36 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'s', "source", "URI",
-     gettext_noop ("Source you get the URI from"), 1,
-     &GNUNET_GETOPT_set_string, &source},
-    {'d', "directory", "PATH",
-     gettext_noop ("path to your mountpoint"), 1,
-     &GNUNET_GETOPT_set_string, &directory},
-    {'t', "single-threaded", NULL,
-     gettext_noop ("run in single-threaded mode"), 0,
-     &GNUNET_GETOPT_set_one, &single_threaded},
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('s',
+                                 "source",
+                                 "URI",
+                                 gettext_noop ("Source you get the URI from"), 
+                                 &source),
+    GNUNET_GETOPT_option_filename ('d',
+                                   "directory",
+                                   "PATH",
+                                   gettext_noop ("path to your mountpoint"), 
+                                   &directory),
+    GNUNET_GETOPT_option_flag ('t',
+                               "single-threaded",
+                               gettext_noop ("run in single-threaded mode"), 
+                               &single_threaded),
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_log_setup ("gnunet-fuse", "DEBUG", NULL);
+  GNUNET_log_setup ("gnunet-fuse",
+                    "DEBUG",
+                    NULL);
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run2 (argc,
                                argv,
                                "gnunet-fuse -s URI [-- FUSE-OPTIONS] DIRECTORYNAME",
                                gettext_noop
                                ("fuse"),
-                               options, &run, NULL, GNUNET_YES)) ? ret : 1;
+                               options,
+                               &run,
+                               NULL,
+                               GNUNET_YES)) ? ret : 1;
 }
 
 /* end of gnunet-fuse.c */