[GNUnet-SVN] r10552 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-03-11 14:48:36 +0100 (Thu, 11 Mar 2010)
New Revision: 10552

Modified:
   gnunet/src/fs/fs_file_information.c
   gnunet/src/fs/fs_publish.c
Log:
 ETA calculations, filename

Modified: gnunet/src/fs/fs_file_information.c
===================================================================
--- gnunet/src/fs/fs_file_information.c 2010-03-11 13:45:58 UTC (rev 10551)
+++ gnunet/src/fs/fs_file_information.c 2010-03-11 13:48:36 UTC (rev 10552)
@@ -213,7 +213,12 @@
       return NULL;
     }
   fi = GNUNET_malloc (sizeof(struct FileInfo));
-  fi->filename = GNUNET_strdup (filename);
+  fi->filename = GNUNET_STRINGS_filename_expand (filename);
+  if (fi->filename == NULL)
+    {
+      GNUNET_free (fi);
+      return NULL;
+    }
   ret = GNUNET_FS_file_information_create_from_reader (client_info,
                                                       sbuf.st_size,
                                                       &data_reader_file,

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-03-11 13:45:58 UTC (rev 10551)
+++ gnunet/src/fs/fs_publish.c  2010-03-11 13:48:36 UTC (rev 10552)
@@ -901,12 +901,15 @@
        hash_for_index_cb (sc,
                           &p->data.file.file_id);
       else
-       GNUNET_CRYPTO_hash_file (sc->h->sched,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                p->data.file.filename,
-                                HASHING_BLOCKSIZE,
-                                &hash_for_index_cb,
-                                sc);
+       {
+         p->start_time = GNUNET_TIME_absolute_get ();
+         GNUNET_CRYPTO_hash_file (sc->h->sched,
+                                  GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                  p->data.file.filename,
+                                  HASHING_BLOCKSIZE,
+                                  &hash_for_index_cb,
+                                  sc);
+       }
       return;
     }
   publish_content (sc);