[GNUnet-SVN] r3796 - in GNUnet: . src/applications/bootstrap_http src/applications/fs/fsui src/util/network_client

[grothoff]

Author: grothoff
Date: 2006-11-19 20:53:16 -0800 (Sun, 19 Nov 2006)
New Revision: 3796

Modified:
   GNUnet/src/applications/bootstrap_http/http.c
   GNUnet/src/applications/fs/fsui/upload.c
   GNUnet/src/util/network_client/tcpio.c
   GNUnet/todo
Log:
eliminating bad warnings, fixing minor FSUI bugs

Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c       2006-11-19 07:09:30 UTC 
(rev 3795)
+++ GNUnet/src/applications/bootstrap_http/http.c       2006-11-20 04:53:16 UTC 
(rev 3796)
@@ -239,17 +239,15 @@
     CURL_EASY_SETOPT(curl,
                     CURLOPT_USERAGENT,
                     "GNUnet");
-#if 1
   CURL_EASY_SETOPT(curl,
                   CURLOPT_CONNECTTIMEOUT,
-                  15L);
+                  150L);
   /* NOTE: use of CONNECTTIMEOUT without also
      setting NOSIGNAL results in really weird
      crashes on my system! */
   CURL_EASY_SETOPT(curl,
                   CURLOPT_NOSIGNAL,
                   1);
-#endif
 #if USE_MULTI
   multi = curl_multi_init();
   if (multi == NULL) {

Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c    2006-11-19 07:09:30 UTC (rev 
3795)
+++ GNUnet/src/applications/fs/fsui/upload.c    2006-11-20 04:53:16 UTC (rev 
3796)
@@ -265,19 +265,24 @@
                         utc->meta,
                         utc->filename,
                         utc->shared->extractors);
-  ECRS_delFromMetaData(utc->meta,
-                      EXTRACTOR_FILENAME,
-                      NULL);
+  while (OK == ECRS_delFromMetaData(utc->meta,
+                                   EXTRACTOR_FILENAME,
+                                   NULL)) ;
   /* only publish the last part of the path
      -- we do not want to publish $HOME or similar
      trivially deanonymizing information */
   tpos = strlen(utc->filename) - 1;
+  if ( (utc->filename[tpos] == '/') &&
+       (tpos > 0) )
+    tpos--;
   while ( (tpos > 0) &&
          (utc->filename[tpos] != '/') )
     tpos--;
   pfn = MALLOC(strlen(&utc->filename[tpos+1]) + 2);
   strcpy(pfn, &utc->filename[tpos+1]);
-  if (utc->child != NULL)
+  if ( (utc->child != NULL) &&
+       ( (strlen(pfn) == 0) ||
+        (pfn[strlen(pfn)-1] != '/') ) )
     strcat(pfn, "/");
   ECRS_addToMetaData(utc->meta,
                     EXTRACTOR_FILENAME,
@@ -539,19 +544,21 @@
   struct FSUI_UploadList * ul;
 
   config = NULL;
+  extractors = NULL;
   if (doExtract) {
     extractors = EXTRACTOR_loadDefaultLibraries();
-    if ( (0 == GC_get_configuration_value_string(ctx->cfg,
-                                                "FS",
-                                                "EXTRACTORS",
-                                                NULL,
-                                                &config)) &&
-        (config != NULL) ) {
-      extractors = EXTRACTOR_loadConfigLibraries(extractors,
-                                                config);
+    if (GC_have_configuration_value(ctx->cfg,
+                                   "FS",
+                                   "EXTRACTORS")) {
+      GC_get_configuration_value_string(ctx->cfg,
+                                       "FS",
+                                       "EXTRACTORS",
+                                       NULL,
+                                       &config);
+      if (config != NULL) 
+       extractors = EXTRACTOR_loadConfigLibraries(extractors,
+                                                  config);
     }
-  } else {
-    extractors = NULL;
   }
   shared = MALLOC(sizeof(FSUI_UploadShared));
   shared->dsc = dsc;

Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c      2006-11-19 07:09:30 UTC (rev 
3795)
+++ GNUnet/src/util/network_client/tcpio.c      2006-11-20 04:53:16 UTC (rev 
3796)
@@ -348,7 +348,6 @@
                            sizeof(unsigned short),
                            &pos)) ||
         (pos != sizeof(unsigned short)) ) {
-      GE_BREAK(sock->ectx, 0);
       MUTEX_UNLOCK(sock->readlock);
       connection_close_temporarily(sock);
       return SYSERR;
@@ -368,7 +367,6 @@
                            size - pos,
                            &pos)) ||
         (pos + sizeof(unsigned short) != size) ) {
-      GE_BREAK(sock->ectx, 0);
       FREE(buf);
       MUTEX_UNLOCK(sock->readlock);
       connection_close_temporarily(sock);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-11-19 07:09:30 UTC (rev 3795)
+++ GNUnet/todo 2006-11-20 04:53:16 UTC (rev 3796)
@@ -36,11 +36,6 @@
     + fs/fsui: capture ectx errors and convert to event error msgs!
   * gnunet-setup: [RCpre1]
     + ncurses wizard
-- insert of tar.gz results in filename INSIDE of TGZ being
-  possibly (?) used for the filename of the archive! [RCpre1]
-- indexing of directories with relative path specification
-  results in empty paths being used for public directory
-  name [RCpre1]
 - update documentation [RCpre2]
 - More testcases: [RCpre3]
   * ecrs_core