[GNUnet-SVN] r19675 - in gnunet/src: fs util

[gnunet]

Author: grothoff
Date: 2012-02-03 22:55:39 +0100 (Fri, 03 Feb 2012)
New Revision: 19675

Modified:
   gnunet/src/fs/fs_dirmetascan.c
   gnunet/src/fs/fs_uri.c
   gnunet/src/util/container_meta_data.c
   gnunet/src/util/pseudonym.c
   gnunet/src/util/strings.c
Log:
-also user gnunet-original filename here more consistently

Modified: gnunet/src/fs/fs_dirmetascan.c
===================================================================
--- gnunet/src/fs/fs_dirmetascan.c      2012-02-03 21:53:02 UTC (rev 19674)
+++ gnunet/src/fs/fs_dirmetascan.c      2012-02-03 21:55:39 UTC (rev 19675)
@@ -194,6 +194,7 @@
             int is_directory)
 {
   struct GNUNET_FS_ShareTreeItem *chld;
+  size_t slen;
 
   chld = GNUNET_malloc (sizeof (struct GNUNET_FS_ShareTreeItem));
   chld->parent = parent;
@@ -202,6 +203,12 @@
                   "%s%s",
                   GNUNET_STRINGS_get_short_name (filename),
                   is_directory ? "/" : "");
+  /* make sure we do not end with '//' */
+  slen = strlen (chld->short_filename);
+  if ( (slen >= 2) &&
+       (chld->short_filename[slen-1] == '/') &&
+       (chld->short_filename[slen-2] == '/') )
+    chld->short_filename[slen-1] = '\0';
   chld->is_directory = is_directory;
   if (NULL != parent)
       GNUNET_CONTAINER_DLL_insert (parent->children_head,
@@ -360,8 +367,9 @@
        GNUNET_CONTAINER_meta_data_delete (ds->pos->meta, 
                                           EXTRACTOR_METATYPE_FILENAME,
                                           NULL, 0);
+       /* instead, put in our 'safer' original filename */
        GNUNET_CONTAINER_meta_data_insert (ds->pos->meta, "<libgnunetfs>",
-                                          EXTRACTOR_METATYPE_FILENAME,
+                                          
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                           EXTRACTOR_METAFORMAT_UTF8, 
"text/plain",
                                           ds->pos->short_filename, 
                                           strlen (ds->pos->short_filename) + 
1);

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2012-02-03 21:53:02 UTC (rev 19674)
+++ gnunet/src/fs/fs_uri.c      2012-02-03 21:55:39 UTC (rev 19675)
@@ -1805,7 +1805,7 @@
   if (ent > 0)
   {
     full_name = GNUNET_CONTAINER_meta_data_get_first_by_types (md,
-        EXTRACTOR_METATYPE_FILENAME, -1);
+        EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, -1);
     if (NULL != full_name)
     {
       filename = full_name;

Modified: gnunet/src/util/container_meta_data.c
===================================================================
--- gnunet/src/util/container_meta_data.c       2012-02-03 21:53:02 UTC (rev 
19674)
+++ gnunet/src/util/container_meta_data.c       2012-02-03 21:55:39 UTC (rev 
19675)
@@ -315,7 +315,8 @@
   i->data = GNUNET_malloc (data_len);
   memcpy (i->data, data, data_len);
   /* change OS native dir separators to unix '/' and others to '_' */
-  if (type == EXTRACTOR_METATYPE_FILENAME)
+  if ( (type == EXTRACTOR_METATYPE_FILENAME) ||
+       (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) )
   {
     p = i->data;
     while ((*p != '\0') && (p < i->data + data_len))

Modified: gnunet/src/util/pseudonym.c
===================================================================
--- gnunet/src/util/pseudonym.c 2012-02-03 21:53:02 UTC (rev 19674)
+++ gnunet/src/util/pseudonym.c 2012-02-03 21:55:39 UTC (rev 19675)
@@ -319,6 +319,7 @@
       name =
           GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
                                                          
EXTRACTOR_METATYPE_TITLE,
+                                                         
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                                          
EXTRACTOR_METATYPE_FILENAME,
                                                          
EXTRACTOR_METATYPE_DESCRIPTION,
                                                          
EXTRACTOR_METATYPE_SUBJECT,

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2012-02-03 21:53:02 UTC (rev 19674)
+++ gnunet/src/util/strings.c   2012-02-03 21:55:39 UTC (rev 19675)
@@ -607,6 +607,7 @@
   return ret;
 }
 
+
 /**
  * "man basename"
  * Returns a pointer to a part of filename (allocates nothing)!