[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31668 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31668 - gnunet/src/fs |
Date: |
Sun, 22 Dec 2013 01:40:37 +0100 |
Author: amatus
Date: 2013-12-22 01:40:36 +0100 (Sun, 22 Dec 2013)
New Revision: 31668
Modified:
gnunet/src/fs/gnunet-search.c
Log:
Improve search result presentation for directories.
Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c 2013-12-22 00:39:38 UTC (rev 31667)
+++ gnunet/src/fs/gnunet-search.c 2013-12-22 00:40:36 UTC (rev 31668)
@@ -136,8 +136,8 @@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
{
static unsigned int cnt;
+ int is_directory;
char *uri;
- char *dotdot;
char *filename;
switch (info->status)
@@ -156,12 +156,19 @@
GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.
specifics.result.meta,
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
+ is_directory =
+ GNUNET_FS_meta_data_test_for_directory (info->value.search.
+ specifics.result.meta);
if (filename != NULL)
{
- while (NULL != (dotdot = strstr (filename, "..")))
- dotdot[0] = dotdot[1] = '_';
- printf ("gnunet-download -o \"%s\" %s\n", filename, uri);
+ GNUNET_DISK_filename_canonicalize (filename);
+ if (GNUNET_YES == is_directory)
+ printf ("gnunet-download -o \"%s%s\" -R %s\n", filename,
GNUNET_FS_DIRECTORY_EXT, uri);
+ else
+ printf ("gnunet-download -o \"%s\" %s\n", filename, uri);
}
+ else if (GNUNET_YES == is_directory)
+ printf ("gnunet-download -o \"collection%s\" -R %s\n",
GNUNET_FS_DIRECTORY_EXT, uri);
else
printf ("gnunet-download %s\n", uri);
if (verbose)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31668 - gnunet/src/fs,
gnunet <=