[GNUnet-SVN] r7130 - in GNUnet: doc/man src/applications/fs/tools

[gnunet]

Author: grothoff
Date: 2008-06-10 21:22:18 -0600 (Tue, 10 Jun 2008)
New Revision: 7130

Modified:
   GNUnet/doc/man/gnunet-auto-share.1
   GNUnet/src/applications/fs/tools/gnunet-auto-share.c
Log:
multi-dir support

Modified: GNUnet/doc/man/gnunet-auto-share.1
===================================================================
--- GNUnet/doc/man/gnunet-auto-share.1  2008-06-11 03:20:13 UTC (rev 7129)
+++ GNUnet/doc/man/gnunet-auto-share.1  2008-06-11 03:22:18 UTC (rev 7130)
@@ -3,16 +3,16 @@
 gnunet\-auto\-share \- process to share a directory
 .SH SYNOPSIS
 .B gnunet\-auto\-share
-[\fIOPTIONS\fR] DIRECTORY
+[\fIOPTIONS\fR] DIRECTORY*
 .SH DESCRIPTION
 .PP
 In order to share files with other GNUnet users, the files must first
 be made available to GNUnet.  This tool allows you to automatically
-share all files from a certain directory.
+share all files from certain directories.
 .PP
 In order to start sharing files, invoke gnunet-auto-share with the
-name of the directory.  As long as gnunet-auto-share is running, any
-files placed in the directory will be automatically shared.  
+name of the directories.  As long as gnunet-auto-share is running, any
+files placed in the directories will be automatically shared.  
 Note that files that you share may not always continue to be
 available after you leave the network.
 .PP
@@ -21,7 +21,7 @@
 keywords to search for the appropriate content.  You can manually add keywords
 using the \-K option.
 .PP
-The directory structure of files in the shared directory will be 
+The directory structure of files in the shared directories will be 
 maintained.  gnunet\-auto\-share only supports publishing files
 using indexing.  Indexing a file means that an index is
 added to the local (!)  database with symbolic links to the file
@@ -35,7 +35,9 @@
 a metadata configuration file (by default located in 
 ~/.gnunet/metadata.conf).  The format of this file is just like
 the normal GNUnet configuration files.  Each section name should
-correspond to a filename in the directory.  The keys are the 
+correspond to a filename in one of the directories.  Note that if
+you have the same filename corresponding to different files in
+multiple directories, you cannot specify different meta data.  The keys are 
the 
 various metadata types and the entries correspond to the metadata
 values.  The special type "keyword" can be used to specify a list
 of keywords that should be used for the respective file.  Multiple
@@ -63,7 +65,7 @@
  contributor = "Christian Muellner"
 
 Metadata specification only works for files in the top-level
-directory, all other files will only be listed as part of the
+directories, all other files will only be listed as part of the
 top-level directories and be given metadata using libextractor.
 .PP
 

Modified: GNUnet/src/applications/fs/tools/gnunet-auto-share.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-06-11 
03:20:13 UTC (rev 7129)
+++ GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-06-11 
03:22:18 UTC (rev 7130)
@@ -834,11 +834,11 @@
       errorCode = -1;
       goto end;
     }
-  if (i != argc - 1)
+  if (i > argc - 1)
     {
       fprintf (stderr,
                _
-               ("You must specify one and only one directory for sharing.\n"));
+               ("You must specify at least one directory for sharing.\n"));
       errorCode = -1;
       goto end;
     }