[GNUnet-SVN] r20558 - gnunet-fuse/src/ext

[gnunet]

Author: mauricio
Date: 2012-03-16 09:07:55 +0100 (Fri, 16 Mar 2012)
New Revision: 20558

Modified:
   gnunet-fuse/src/ext/Makefile.am
   gnunet-fuse/src/ext/gnunet-fuse.c
Log:
-changes


Modified: gnunet-fuse/src/ext/Makefile.am
===================================================================
--- gnunet-fuse/src/ext/Makefile.am     2012-03-16 08:04:21 UTC (rev 20557)
+++ gnunet-fuse/src/ext/Makefile.am     2012-03-16 08:07:55 UTC (rev 20558)
@@ -9,7 +9,7 @@
 bin_PROGRAMS = gnunet-fuse
 
 gnunet_fuse_SOURCES = \
-  gnunet-fuse.c
+       gnunet-fuse.c 
        directory.c \
        dirent.c \
        file.c \

Modified: gnunet-fuse/src/ext/gnunet-fuse.c
===================================================================
--- gnunet-fuse/src/ext/gnunet-fuse.c   2012-03-16 08:04:21 UTC (rev 20557)
+++ gnunet-fuse/src/ext/gnunet-fuse.c   2012-03-16 08:07:55 UTC (rev 20558)
@@ -25,6 +25,7 @@
  */
 
 #define FUSE_USE_VERSION 26
+#define TESTING GNUNET_YES
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
@@ -218,16 +219,40 @@
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-
+       int argc;
        ret = 0;
+       if (NULL == directory)
+       {
+               printf("ERROR\n-d option for mountpoint required\n");
+               ret = 1;
+               return;
+       }
+       if (NULL == source)
+       {
+               printf("ERROR\n-s option for mountpoint required\n");
+               ret = 2;
+               return;
+       }
 
-       char *a[2];
+       if (GNUNET_YES == TESTING)
+       {
+               argc = 3;
+       }
+       else
+       {
+               argc = 2;
+       }
+       char *a[argc];
        a[0]="gnunet-fuse";
        a[1]= directory;
-       if (a[1] == 0) printf("ERROR\n-d option for mountpoint required\n");
-       else
-       fuse_main(2, a, &fops, NULL);
+       if (GNUNET_YES == TESTING)
+       {
+               a[2] = "-s";
+       }
 
+
+       fuse_main(argc, a, &fops, NULL);
+
 }
 
 /**