diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/gnunet-publish.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 9e0602862..d745074d4 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -506,7 +506,6 @@ static void | |||
506 | run (void *cls, char *const *args, const char *cfgfile, | 506 | run (void *cls, char *const *args, const char *cfgfile, |
507 | const struct GNUNET_CONFIGURATION_Handle *c) | 507 | const struct GNUNET_CONFIGURATION_Handle *c) |
508 | { | 508 | { |
509 | struct EXTRACTOR_PluginList *plugins; | ||
510 | char *ex; | 509 | char *ex; |
511 | char *emsg; | 510 | char *emsg; |
512 | 511 | ||
@@ -600,23 +599,14 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
600 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); | 599 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); |
601 | return; | 600 | return; |
602 | } | 601 | } |
602 | if (GNUNET_OK != | ||
603 | GNUNET_CONFIGURATION_get_value_string (cfg, "FS", "EXTRACTORS", &ex)) | ||
604 | ex = NULL; | ||
605 | |||
603 | ds = GNUNET_FS_directory_scan_start (args[0], | 606 | ds = GNUNET_FS_directory_scan_start (args[0], |
604 | GNUNET_NO, NULL, directory_scan_cb, NULL); | 607 | disable_extractor, |
605 | 608 | ex, | |
606 | plugins = NULL; | 609 | &directory_scan_cb, NULL); |
607 | if (!disable_extractor) | ||
608 | { | ||
609 | plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY); | ||
610 | if (GNUNET_OK == | ||
611 | GNUNET_CONFIGURATION_get_value_string (cfg, "FS", "EXTRACTORS", &ex)) | ||
612 | { | ||
613 | if (strlen (ex) > 0) | ||
614 | plugins = | ||
615 | EXTRACTOR_plugin_add_config (plugins, ex, | ||
616 | EXTRACTOR_OPTION_DEFAULT_POLICY); | ||
617 | GNUNET_free (ex); | ||
618 | } | ||
619 | } | ||
620 | kill_task = | 610 | kill_task = |
621 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_stop_task, | 611 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_stop_task, |
622 | NULL); | 612 | NULL); |