[GNUnet-SVN] r3500 - in GNUnet: . m4 src/applications/fs/fsui src/applications/fs/tools src/include

[grothoff]

Author: grothoff
Date: 2006-10-19 17:17:45 -0700 (Thu, 19 Oct 2006)
New Revision: 3500

Modified:
   GNUnet/INSTALL
   GNUnet/ltmain.sh
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/fs/fsui/download.c
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/fsui.c
   GNUnet/src/applications/fs/fsui/fsuitest.c
   GNUnet/src/applications/fs/fsui/searchtest.c
   GNUnet/src/applications/fs/fsui/unindex.c
   GNUnet/src/applications/fs/fsui/upload.c
   GNUnet/src/applications/fs/tools/gnunet-download.c
   GNUnet/src/applications/fs/tools/gnunet-insert.c
   GNUnet/src/applications/fs/tools/gnunet-unindex.c
   GNUnet/src/include/gnunet_fsui_lib.h
Log:
fixes

Modified: GNUnet/INSTALL
===================================================================
--- GNUnet/INSTALL      2006-10-20 00:09:31 UTC (rev 3499)
+++ GNUnet/INSTALL      2006-10-20 00:17:45 UTC (rev 3500)
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -70,9 +67,9 @@
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -85,7 +82,7 @@
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -102,19 +99,19 @@
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -125,7 +122,7 @@
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -140,11 +137,11 @@
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -159,7 +156,7 @@
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -170,9 +167,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -189,18 +186,14 @@
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'

Modified: GNUnet/ltmain.sh
===================================================================
--- GNUnet/ltmain.sh    2006-10-20 00:09:31 UTC (rev 3499)
+++ GNUnet/ltmain.sh    2006-10-20 00:17:45 UTC (rev 3500)
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       link)
+         libs="$deplibs %DEPLIBS%"
+         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+         ;;
        esac
       fi
       if test "$pass" = dlopen; then
@@ -3201,6 +3204,11 @@
            age="$number_minor"
            revision="$number_minor"
            ;;
+         *)
+           $echo "$modename: unknown library version type \`$version_type'" 
1>&2
+           $echo "Fatal configuration error.  See the $PACKAGE docs for more 
information." 1>&2
+           exit $EXIT_FAILURE
+           ;;
          esac
          ;;
        no)

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2006-10-20 00:09:31 UTC (rev 3499)
+++ GNUnet/m4/Makefile.in       2006-10-20 00:17:45 UTC (rev 3500)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,6 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -94,6 +93,7 @@
 GMSGFMT = @GMSGFMT@
 GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
 GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GUILE = @GUILE@
@@ -173,15 +173,9 @@
 XFREEBSD_TRUE = @XFREEBSD_TRUE@
 XGETTEXT = @XGETTEXT@
 _libcurl_config = @_libcurl_config@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -189,8 +183,6 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -198,23 +190,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
@@ -356,7 +355,7 @@
 clean-generic:
 
 distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/applications/fs/fsui/download.c  2006-10-20 00:17:45 UTC (rev 
3500)
@@ -222,7 +222,7 @@
                          dl);  
   if (ret == OK) {
     dl->state = FSUI_COMPLETED;
-    event.type = FSUI_download_complete;
+    event.type = FSUI_download_completed;
     event.data.DownloadCompleted.total = dl->total;
     event.data.DownloadCompleted.filename = dl->filename;
     event.data.DownloadCompleted.uri = dl->uri;

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-20 00:09:31 UTC 
(rev 3499)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-20 00:17:45 UTC 
(rev 3500)
@@ -72,17 +72,17 @@
   char * fn;
 
   switch(event->type) {
-  case FSUI_search_resuming:
+  case FSUI_search_resumed:
 #if DEBUG_VERBOSE
     printf("Search resuming\n"); 
 #endif
-    search = event->data.SearchResuming.sc.pos;
+    search = event->data.SearchResumed.sc.pos;
     break;
-  case FSUI_download_resuming: 
+  case FSUI_download_resumed: 
 #if DEBUG_VERBOSE
     printf("Download resuming\n");
 #endif
-   download = event->data.DownloadResuming.dc.pos;
+   download = event->data.DownloadResumed.dc.pos;
     break;
   case FSUI_search_result:
 #if DEBUG_VERBOSE
@@ -124,13 +124,13 @@
           event->data.UploadProgress.total);
 #endif
     break;
-  case FSUI_upload_complete:
-    upURI = ECRS_dupUri(event->data.UploadComplete.uri);
+  case FSUI_upload_completed:
+    upURI = ECRS_dupUri(event->data.UploadCompleted.uri);
 #if DEBUG_VERBOSE
     printf("Upload complete.\n");
 #endif
     break;
-  case FSUI_download_complete:
+  case FSUI_download_completed:
 #if DEBUG_VERBOSE
     printf("Download complete.\n");
 #endif
@@ -149,7 +149,7 @@
           event->data.UnindexProgress.total);
 #endif
     break;
-  case FSUI_unindex_complete:
+  case FSUI_unindex_completed:
 #if DEBUG_VERBOSE
     printf("Unindex complete.\n");
 #endif
@@ -171,10 +171,10 @@
   case FSUI_gnunetd_connected:
   case FSUI_gnunetd_disconnected:
     break;
-  case FSUI_unindex_suspending:
-  case FSUI_upload_suspending:
-  case FSUI_download_suspending:
-  case FSUI_search_suspending:
+  case FSUI_unindex_suspended:
+  case FSUI_upload_suspended:
+  case FSUI_download_suspended:
+  case FSUI_search_suspended:
 #if DEBUG_VERBOSE
     fprintf(stderr,
            "Received SUSPENDING: %d\n",
@@ -255,9 +255,11 @@
   kuri = ECRS_parseListKeywordURI(ectx,
                                  2,
                                  (const char**)keywords);
-  waitForEvent = FSUI_upload_complete;
+  waitForEvent = FSUI_upload_completed;
   upload = FSUI_startUpload(ctx,
                            fn,
+                           (DirectoryScanCallback) &disk_directory_scan,
+                           NULL,               
                            0,
                            0,
                            YES,
@@ -271,7 +273,7 @@
   kuri = NULL;
   ECRS_freeMetaData(meta);
   prog = 0;
-  while (lastEvent != FSUI_upload_complete) {
+  while (lastEvent != FSUI_upload_completed) {
     prog++;
     CHECK(prog < 1000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -287,13 +289,13 @@
           keywords[1]);
   uri = ECRS_parseCharKeywordURI(ectx,
                                 keyword);
-  waitForEvent = FSUI_download_complete;
+  waitForEvent = FSUI_download_completed;
   search = FSUI_startSearch(ctx,
                            0,
                            uri);
   CHECK(search != NULL);
   prog = 0;
-  while (lastEvent != FSUI_download_complete) {
+  while (lastEvent != FSUI_download_completed) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -328,11 +330,11 @@
   }
   CHECK(search != NULL);
   CHECK(download != NULL);
-  waitForEvent = FSUI_unindex_complete;
+  waitForEvent = FSUI_unindex_completed;
   unindex = FSUI_unindex(ctx, fn);
   CHECK(unindex != NULL);
   prog = 0;
-  while (lastEvent != FSUI_unindex_complete) {
+  while (lastEvent != FSUI_unindex_completed) {
     prog++;
     CHECK(prog < 1000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -340,7 +342,7 @@
     if (GNUNET_SHUTDOWN_TEST() == YES)
       break;
   }
-  CHECK(lastEvent == FSUI_unindex_complete);
+  CHECK(lastEvent == FSUI_unindex_completed);
   /* END OF TEST CODE */
  FAILURE:
   if (fn != NULL) {

Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c      2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/applications/fs/fsui/fsui.c      2006-10-20 00:17:45 UTC (rev 
3500)
@@ -370,7 +370,6 @@
                           FSUI_UploadList * list) {
   FSUI_UploadList *  next;
   FSUI_UploadShared * shared;
-  unsigned int i;
 
   while (list != NULL) {
     freeUploadList(ctx, list->child);

Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c  2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c  2006-10-20 00:17:45 UTC (rev 
3500)
@@ -65,10 +65,10 @@
   char * fn;
 
   switch(event->type) {
-  case FSUI_search_resuming:
-  case FSUI_download_resuming:
-  case FSUI_upload_resuming:
-  case FSUI_unindex_resuming:
+  case FSUI_search_resumed:
+  case FSUI_download_resumed:
+  case FSUI_upload_resumed:
+  case FSUI_unindex_resumed:
     return &unused;
   case FSUI_search_result:
 #if DEBUG_VERBOSE
@@ -82,17 +82,17 @@
                                  fn);    
     FREE(fn);
     break;
-  case FSUI_upload_complete:
+  case FSUI_upload_completed:
 #if DEBUG_VERBOSE
     printf("Upload complete.\n");
 #endif
     break;
-  case FSUI_download_complete:
+  case FSUI_download_completed:
 #if DEBUG_VERBOSE
     printf("Download complete.\n");
 #endif
     break;
-  case FSUI_unindex_complete:
+  case FSUI_unindex_completed:
 #if DEBUG_VERBOSE
     printf("Unindex complete.\n");
 #endif
@@ -162,6 +162,8 @@
                                  (const char**)keywords);
   upload = FSUI_startUpload(ctx,
                            filename,
+                           (DirectoryScanCallback) &disk_directory_scan,
+                           NULL,
                            0, /* anonymity */
                            0, /* priority */
                            YES, 
@@ -174,7 +176,7 @@
   ECRS_freeUri(kuri);
   ECRS_freeMetaData(meta);
   prog = 0;
-  while (lastEvent != FSUI_upload_complete) {
+  while (lastEvent != FSUI_upload_completed) {
     prog++;
     CHECK(prog < 10000)
 
@@ -195,7 +197,7 @@
                            uri);
   CHECK(search != NULL);
   prog = 0;
-  while (lastEvent != FSUI_download_complete) {
+  while (lastEvent != FSUI_download_completed) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -206,7 +208,7 @@
                  search);
   unindex = FSUI_unindex(ctx, filename);
   prog = 0;
-  while (lastEvent != FSUI_unindex_complete) {
+  while (lastEvent != FSUI_unindex_completed) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);

Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c        2006-10-20 00:09:31 UTC 
(rev 3499)
+++ GNUnet/src/applications/fs/fsui/searchtest.c        2006-10-20 00:17:45 UTC 
(rev 3500)
@@ -59,22 +59,22 @@
   static char unused;
  
   switch(event->type) {
-  case FSUI_search_resuming:
-  case FSUI_download_resuming:
-  case FSUI_upload_resuming:
-  case FSUI_unindex_resuming:
+  case FSUI_search_resumed:
+  case FSUI_download_resumed:
+  case FSUI_upload_resumed:
+  case FSUI_unindex_resumed:
     return &unused;
   case FSUI_search_result:
     printf("Received search result\n");
     uri = ECRS_dupUri(event->data.SearchResult.fi.uri);
     break;
-  case FSUI_upload_complete:
+  case FSUI_upload_completed:
     printf("Upload complete.\n");
     break;
-  case FSUI_download_complete:
+  case FSUI_download_completed:
     printf("Download complete.\n");
     break;
-  case FSUI_unindex_complete:
+  case FSUI_unindex_completed:
     printf("Unindex complete.\n");
     break;
   case FSUI_upload_error:
@@ -175,6 +175,8 @@
   upload = 
        FSUI_startUpload(ctx,
                         fn,
+                        (DirectoryScanCallback) &disk_directory_scan,
+                        NULL,          
                         0,
                         0,
                         YES,
@@ -189,7 +191,7 @@
   ECRS_freeUri(kuri);
   ECRS_freeMetaData(meta);
   prog = 0;
-  while (lastEvent != FSUI_upload_complete) {
+  while (lastEvent != FSUI_upload_completed) {
     prog++;
     CHECK(prog < 10000)
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -217,7 +219,7 @@
   ECRS_freeUri(uri);
 
   prog = 0;
-  while (lastEvent != FSUI_download_complete) {
+  while (lastEvent != FSUI_download_completed) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -231,7 +233,7 @@
   fn = NULL;
   CHECK(NULL != unindex);
   prog = 0;
-  while (lastEvent != FSUI_unindex_complete) {
+  while (lastEvent != FSUI_unindex_completed) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);

Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c   2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/applications/fs/fsui/unindex.c   2006-10-20 00:17:45 UTC (rev 
3500)
@@ -78,7 +78,7 @@
                         &tt,
                         utc);
   if (ret == OK) {
-    event.type = FSUI_unindex_complete;
+    event.type = FSUI_unindex_completed;
     if (OK != disk_file_size(utc->ctx->ectx,
                             utc->filename,
                             &event.data.UnindexCompleted.total,

Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c    2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/applications/fs/fsui/upload.c    2006-10-20 00:17:45 UTC (rev 
3500)
@@ -266,7 +266,7 @@
                       utc->shared->expiration,
                       utc->uri,
                       utc->meta);          
-  event.type = FSUI_upload_complete;
+  event.type = FSUI_upload_completed;
   event.data.UploadCompleted.uc.pos = utc;
   event.data.UploadCompleted.uc.cctx = utc->cctx;
   event.data.UploadCompleted.uc.ppos = utc->parent;

Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c  2006-10-20 00:09:31 UTC 
(rev 3499)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c  2006-10-20 00:17:45 UTC 
(rev 3500)
@@ -104,7 +104,7 @@
     *ok = SYSERR;
     GNUNET_SHUTDOWN_INITIATE();
     break;
-  case FSUI_download_complete:
+  case FSUI_download_completed:
     if ( (event->data.DownloadProgress.completed ==
          event->data.DownloadProgress.total) ) {
       PRINTF(_("Download of file `%s' complete.  "

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2006-10-20 00:09:31 UTC 
(rev 3499)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2006-10-20 00:17:45 UTC 
(rev 3500)
@@ -172,7 +172,7 @@
       FREE(ret);
     }
     break;
-  case FSUI_upload_complete:
+  case FSUI_upload_completed:
     if (*verboselevel) {
       delta = get_time() - start_time;
       PRINTF(_("Upload of `%s' complete, "

Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c   2006-10-20 00:09:31 UTC 
(rev 3499)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c   2006-10-20 00:17:45 UTC 
(rev 3500)
@@ -65,7 +65,7 @@
       printf("\r");
     }
     break;
-  case FSUI_unindex_complete:
+  case FSUI_unindex_completed:
     if (*verboselevel) {
       delta = get_time() - start_time;
       PRINTF(

Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h        2006-10-20 00:09:31 UTC (rev 
3499)
+++ GNUnet/src/include/gnunet_fsui_lib.h        2006-10-20 00:17:45 UTC (rev 
3500)
@@ -130,7 +130,7 @@
   FSUI_download_started,
   FSUI_download_stopped,
   FSUI_download_progress,
-  FSUI_download_complete,
+  FSUI_download_completed,
   FSUI_download_aborted,
   FSUI_download_error,
   FSUI_download_suspended,
@@ -138,7 +138,7 @@
   FSUI_upload_started,
   FSUI_upload_stopped,
   FSUI_upload_progress,
-  FSUI_upload_complete,
+  FSUI_upload_completed,
   FSUI_upload_aborted,
   FSUI_upload_error,
   FSUI_upload_suspended,
@@ -146,7 +146,7 @@
   FSUI_unindex_started,
   FSUI_unindex_stopped,
   FSUI_unindex_progress,
-  FSUI_unindex_complete,
+  FSUI_unindex_completed,
   FSUI_unindex_aborted,
   FSUI_unindex_error,
   FSUI_unindex_suspended,
@@ -803,6 +803,19 @@
                      struct FSUI_DownloadList * dl); /* download.c */
 
 /**
+ * Method that can be used to select files that
+ * should be put into a directory when doing an
+ * upload.  For example, "disk_directory_scan"
+ * is a legal implementation that would simply
+ * select all files of the directory for the
+ * upload.
+ */
+typedef int (*DirectoryScanCallback)(void * data,
+                                    const char * filename,
+                                    DirectoryEntryCallback dec,
+                                    void * decClosure);
+
+/**
  * Start uploading a file or directory.
  *
  * @param ctx 
@@ -819,6 +832,8 @@
 struct FSUI_UploadList *
 FSUI_startUpload(struct FSUI_Context * ctx,
                 const char * filename,
+                DirectoryScanCallback dsc,
+                void * dscClosure,
                 unsigned int anonymityLevel,
                 unsigned int priority,
                 int doIndex,
@@ -839,8 +854,8 @@
                     struct FSUI_UploadList * ul);
 
 /**
- * Stop an upload.  If the context is for a recursive
- * upload, all sub-uploads will also be stopped.
+ * Stop an upload.  Only to be called for the top-level
+ * upload.
  *
  * @return SYSERR on error
  */