aboutsummaryrefslogtreecommitdiff
path: root/src/fs/gnunet-search.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/fs/gnunet-search.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/fs/gnunet-search.c')
-rw-r--r--src/fs/gnunet-search.c46
1 files changed, 18 insertions, 28 deletions
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 8a3e2ed6a..c82a0794c 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -70,11 +70,9 @@ static int local_only;
70 * @return 0 to continue extracting, 1 to abort 70 * @return 0 to continue extracting, 1 to abort
71 */ 71 */
72static int 72static int
73item_printer (void *cls, 73item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
74 const char *plugin_name, 74 enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
75 enum EXTRACTOR_MetaType type, 75 const char *data, size_t data_size)
76 enum EXTRACTOR_MetaFormat format,
77 const char *data_mime_type, const char *data, size_t data_size)
78{ 76{
79 if ((format != EXTRACTOR_METAFORMAT_UTF8) && 77 if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
80 (format != EXTRACTOR_METAFORMAT_C_STRING)) 78 (format != EXTRACTOR_METAFORMAT_C_STRING))
@@ -105,9 +103,7 @@ clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
105 return; 103 return;
106 } 104 }
107 if (dsize != 105 if (dsize !=
108 GNUNET_DISK_fn_write (output_filename, 106 GNUNET_DISK_fn_write (output_filename, ddata, dsize,
109 ddata,
110 dsize,
111 GNUNET_DISK_PERM_USER_READ | 107 GNUNET_DISK_PERM_USER_READ |
112 GNUNET_DISK_PERM_USER_WRITE)) 108 GNUNET_DISK_PERM_USER_WRITE))
113 { 109 {
@@ -154,8 +150,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
154 uri = GNUNET_FS_uri_to_string (info->value.search.specifics.result.uri); 150 uri = GNUNET_FS_uri_to_string (info->value.search.specifics.result.uri);
155 printf ("#%u:\n", cnt++); 151 printf ("#%u:\n", cnt++);
156 filename = 152 filename =
157 GNUNET_CONTAINER_meta_data_get_by_type (info->value.search. 153 GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.specifics.
158 specifics.result.meta, 154 result.meta,
159 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); 155 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
160 if (filename != NULL) 156 if (filename != NULL)
161 { 157 {
@@ -166,8 +162,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
166 else 162 else
167 printf ("gnunet-download %s\n", uri); 163 printf ("gnunet-download %s\n", uri);
168 if (verbose) 164 if (verbose)
169 GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics. 165 GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics.result.
170 result.meta, &item_printer, NULL); 166 meta, &item_printer, NULL);
171 printf ("\n"); 167 printf ("\n");
172 fflush (stdout); 168 fflush (stdout);
173 GNUNET_free_non_null (filename); 169 GNUNET_free_non_null (filename);
@@ -182,14 +178,12 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
182 /* ignore */ 178 /* ignore */
183 break; 179 break;
184 case GNUNET_FS_STATUS_SEARCH_ERROR: 180 case GNUNET_FS_STATUS_SEARCH_ERROR:
185 fprintf (stderr, 181 fprintf (stderr, _("Error searching: %s.\n"),
186 _("Error searching: %s.\n"),
187 info->value.search.specifics.error.message); 182 info->value.search.specifics.error.message);
188 GNUNET_SCHEDULER_shutdown (); 183 GNUNET_SCHEDULER_shutdown ();
189 break; 184 break;
190 case GNUNET_FS_STATUS_SEARCH_STOPPED: 185 case GNUNET_FS_STATUS_SEARCH_STOPPED:
191 GNUNET_SCHEDULER_add_continuation (&clean_task, 186 GNUNET_SCHEDULER_add_continuation (&clean_task, NULL,
192 NULL,
193 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 187 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
194 break; 188 break;
195 default: 189 default:
@@ -220,9 +214,8 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
220 * @param c configuration 214 * @param c configuration
221 */ 215 */
222static void 216static void
223run (void *cls, 217run (void *cls, char *const *args, const char *cfgfile,
224 char *const *args, 218 const struct GNUNET_CONFIGURATION_Handle *c)
225 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
226{ 219{
227 struct GNUNET_FS_Uri *uri; 220 struct GNUNET_FS_Uri *uri;
228 unsigned int argc; 221 unsigned int argc;
@@ -240,10 +233,9 @@ run (void *cls,
240 return; 233 return;
241 } 234 }
242 cfg = c; 235 cfg = c;
243 ctx = GNUNET_FS_start (cfg, 236 ctx =
244 "gnunet-search", 237 GNUNET_FS_start (cfg, "gnunet-search", &progress_cb, NULL,
245 &progress_cb, 238 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
246 NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
247 if (NULL == ctx) 239 if (NULL == ctx)
248 { 240 {
249 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); 241 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
@@ -272,8 +264,8 @@ run (void *cls,
272 } 264 }
273 else 265 else
274 { 266 {
275 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, 267 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
276 &shutdown_task, NULL); 268 NULL);
277 } 269 }
278} 270}
279 271
@@ -311,9 +303,7 @@ main (int argc, char *const *argv)
311 GNUNET_GETOPT_OPTION_END 303 GNUNET_GETOPT_OPTION_END
312 }; 304 };
313 return (GNUNET_OK == 305 return (GNUNET_OK ==
314 GNUNET_PROGRAM_run (argc, 306 GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD",
315 argv,
316 "gnunet-search [OPTIONS] KEYWORD",
317 gettext_noop 307 gettext_noop
318 ("Search GNUnet for files that were published on GNUnet"), 308 ("Search GNUnet for files that were published on GNUnet"),
319 options, &run, NULL)) ? ret : 1; 309 options, &run, NULL)) ? ret : 1;