aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-01-10 14:03:28 +0000
committerChristian Grothoff <christian@grothoff.org>2011-01-10 14:03:28 +0000
commit22913a818047f1188a7ee4dadb406b9dc41efe84 (patch)
treee823b33bdbca8af13a6cf1e2a92b7c5a73b7ef85 /src/fs
parent280bf613c23688203e0e9ee60348d64acf93640f (diff)
downloadgnunet-22913a818047f1188a7ee4dadb406b9dc41efe84.tar.gz
gnunet-22913a818047f1188a7ee4dadb406b9dc41efe84.zip
fix
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/gnunet-directory.c2
-rw-r--r--src/fs/gnunet-search.c2
-rwxr-xr-xsrc/fs/test_gnunet_fs_rec.py.in4
3 files changed, 6 insertions, 2 deletions
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 6de8206f1..ba280db7a 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -51,6 +51,8 @@ item_printer (void *cls,
51 if ( (format != EXTRACTOR_METAFORMAT_UTF8) && 51 if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
52 (format != EXTRACTOR_METAFORMAT_C_STRING) ) 52 (format != EXTRACTOR_METAFORMAT_C_STRING) )
53 return 0; 53 return 0;
54 if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
55 return 0;
54 printf ("\t%20s: %s\n", 56 printf ("\t%20s: %s\n",
55 dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, 57 dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
56 EXTRACTOR_metatype_to_string (type)), data); 58 EXTRACTOR_metatype_to_string (type)), data);
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index e48bc8512..505d88aa3 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -75,6 +75,8 @@ item_printer (void *cls,
75 if ( (format != EXTRACTOR_METAFORMAT_UTF8) && 75 if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
76 (format != EXTRACTOR_METAFORMAT_C_STRING) ) 76 (format != EXTRACTOR_METAFORMAT_C_STRING) )
77 return 0; 77 return 0;
78 if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
79 return 0;
78 printf ("\t%20s: %s\n", 80 printf ("\t%20s: %s\n",
79 dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, 81 dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
80 EXTRACTOR_metatype_to_string (type)), 82 EXTRACTOR_metatype_to_string (type)),
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index a36d89736..25c108e70 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -40,8 +40,8 @@ try:
40 down.expect (pexpect.EOF); 40 down.expect (pexpect.EOF);
41 41
42 dir = pexpect.spawn ('gnunet-directory -c test_gnunet_fs_rec_data.conf rdir/a.gnd') 42 dir = pexpect.spawn ('gnunet-directory -c test_gnunet_fs_rec_data.conf rdir/a.gnd')
43 dir.expect (re.compile (" last: a")); 43# dir.expect (re.compile (" last: a"));
44 dir.expect (re.compile (" last: COPYING")); 44# dir.expect (re.compile (" last: COPYING"));
45# dir.expect (re.compile (" *embedded filename: a")); 45# dir.expect (re.compile (" *embedded filename: a"));
46# dir.expect (re.compile (" *embedded filename: COPYING")); 46# dir.expect (re.compile (" *embedded filename: COPYING"));
47 dir.expect (pexpect.EOF) 47 dir.expect (pexpect.EOF)