diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs.conf.in | 1 | ||||
-rw-r--r-- | src/fs/gnunet-auto-share.c | 1 | ||||
-rw-r--r-- | src/fs/gnunet-directory.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-download.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-fs.c | 11 | ||||
-rw-r--r-- | src/fs/gnunet-helper-fs-publish.c | 17 | ||||
-rw-r--r-- | src/fs/gnunet-pseudonym.c | 10 | ||||
-rw-r--r-- | src/fs/gnunet-publish.c | 15 | ||||
-rw-r--r-- | src/fs/gnunet-search.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-unindex.c | 12 |
10 files changed, 60 insertions, 43 deletions
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in index 007b0fd41..52bb52f5a 100644 --- a/src/fs/fs.conf.in +++ b/src/fs/fs.conf.in | |||
@@ -30,7 +30,6 @@ UNIX_MATCH_UID = NO | |||
30 | 30 | ||
31 | # Do we require users that want to access file-sharing to be in the 'gnunet' group? | 31 | # Do we require users that want to access file-sharing to be in the 'gnunet' group? |
32 | UNIX_MATCH_GID = YES | 32 | UNIX_MATCH_GID = YES |
33 | # DEBUG = YES | ||
34 | 33 | ||
35 | # Maximum number of requests this peer tracks (important for | 34 | # Maximum number of requests this peer tracks (important for |
36 | # memory consumption; 2k RAM/request is not unusual) | 35 | # memory consumption; 2k RAM/request is not unusual) |
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index 073b768db..e0514bc8f 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c | |||
@@ -788,6 +788,7 @@ main (int argc, char *const *argv) | |||
788 | sigpipe = NULL; | 788 | sigpipe = NULL; |
789 | GNUNET_free (cfg_filename); | 789 | GNUNET_free (cfg_filename); |
790 | cfg_filename = NULL; | 790 | cfg_filename = NULL; |
791 | GNUNET_free ((void*) argv); | ||
791 | return ok; | 792 | return ok; |
792 | } | 793 | } |
793 | 794 | ||
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index 4122cb154..2f25e282e 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c | |||
@@ -177,11 +177,13 @@ main (int argc, char *const *argv) | |||
177 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 177 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
178 | return 2; | 178 | return 2; |
179 | 179 | ||
180 | return (GNUNET_OK == | 180 | ret = (GNUNET_OK == |
181 | GNUNET_PROGRAM_run (argc, argv, "gnunet-directory [OPTIONS] FILENAME", | 181 | GNUNET_PROGRAM_run (argc, argv, "gnunet-directory [OPTIONS] FILENAME", |
182 | gettext_noop | 182 | gettext_noop |
183 | ("Display contents of a GNUnet directory"), | 183 | ("Display contents of a GNUnet directory"), |
184 | options, &run, NULL)) ? ret : 1; | 184 | options, &run, NULL)) ? ret : 1; |
185 | GNUNET_free ((void*) argv); | ||
186 | return ret; | ||
185 | } | 187 | } |
186 | 188 | ||
187 | /* end of gnunet-directory.c */ | 189 | /* end of gnunet-directory.c */ |
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index 093dd7bdc..04edc66c8 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c | |||
@@ -333,11 +333,13 @@ main (int argc, char *const *argv) | |||
333 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 333 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
334 | return 2; | 334 | return 2; |
335 | 335 | ||
336 | return (GNUNET_OK == | 336 | ret = (GNUNET_OK == |
337 | GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI", | 337 | GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI", |
338 | gettext_noop | 338 | gettext_noop |
339 | ("Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)"), | 339 | ("Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)"), |
340 | options, &run, NULL)) ? ret : 1; | 340 | options, &run, NULL)) ? ret : 1; |
341 | GNUNET_free ((void*) argv); | ||
342 | return ret; | ||
341 | } | 343 | } |
342 | 344 | ||
343 | /* end of gnunet-download.c */ | 345 | /* end of gnunet-download.c */ |
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c index ce6284aa4..1d791377c 100644 --- a/src/fs/gnunet-fs.c +++ b/src/fs/gnunet-fs.c | |||
@@ -122,11 +122,12 @@ main (int argc, char *const *argv) | |||
122 | 122 | ||
123 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 123 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
124 | return 2; | 124 | return 2; |
125 | 125 | ret = (GNUNET_OK == | |
126 | return (GNUNET_OK == | 126 | GNUNET_PROGRAM_run (argc, argv, "gnunet-fs [OPTIONS]", |
127 | GNUNET_PROGRAM_run (argc, argv, "gnunet-fs [OPTIONS]", | 127 | gettext_noop ("Special file-sharing operations"), |
128 | gettext_noop ("Special file-sharing operations"), | 128 | options, &run, NULL)) ? ret : 1; |
129 | options, &run, NULL)) ? ret : 1; | 129 | GNUNET_free ((void*) argv); |
130 | return ret; | ||
130 | } | 131 | } |
131 | 132 | ||
132 | /* end of gnunet-fs.c */ | 133 | /* end of gnunet-fs.c */ |
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 8df53a6c3..d429f603d 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c | |||
@@ -364,8 +364,7 @@ extract_files (struct ScanTreeNode *item) | |||
364 | 364 | ||
365 | /* this is the expensive operation, *afterwards* we'll check for aborts */ | 365 | /* this is the expensive operation, *afterwards* we'll check for aborts */ |
366 | meta = GNUNET_CONTAINER_meta_data_create (); | 366 | meta = GNUNET_CONTAINER_meta_data_create (); |
367 | if (NULL != plugins) | 367 | EXTRACTOR_extract (plugins, item->filename, NULL, 0, &add_to_md, meta); |
368 | EXTRACTOR_extract (plugins, item->filename, NULL, 0, &add_to_md, meta); | ||
369 | slen = strlen (item->filename) + 1; | 368 | slen = strlen (item->filename) + 1; |
370 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); | 369 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); |
371 | if (-1 == size) | 370 | if (-1 == size) |
@@ -462,6 +461,7 @@ int main(int argc, | |||
462 | FPRINTF (stderr, | 461 | FPRINTF (stderr, |
463 | "%s", | 462 | "%s", |
464 | "gnunet-helper-fs-publish needs exactly one or two arguments\n"); | 463 | "gnunet-helper-fs-publish needs exactly one or two arguments\n"); |
464 | GNUNET_free ((void*) argv); | ||
465 | return 1; | 465 | return 1; |
466 | } | 466 | } |
467 | filename_expanded = argv[1]; | 467 | filename_expanded = argv[1]; |
@@ -480,13 +480,19 @@ int main(int argc, | |||
480 | &root)) | 480 | &root)) |
481 | { | 481 | { |
482 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0); | 482 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0); |
483 | EXTRACTOR_plugin_remove_all (plugins); | ||
484 | GNUNET_free ((void*) argv); | ||
483 | return 2; | 485 | return 2; |
484 | } | 486 | } |
485 | /* signal that we're done counting files, so that a percentage of | 487 | /* signal that we're done counting files, so that a percentage of |
486 | progress can now be calculated */ | 488 | progress can now be calculated */ |
487 | if (GNUNET_OK != | 489 | if (GNUNET_OK != |
488 | write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE, NULL, 0)) | 490 | write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE, NULL, 0)) |
491 | { | ||
492 | EXTRACTOR_plugin_remove_all (plugins); | ||
493 | GNUNET_free ((void*) argv); | ||
489 | return 3; | 494 | return 3; |
495 | } | ||
490 | if (NULL != root) | 496 | if (NULL != root) |
491 | { | 497 | { |
492 | if (GNUNET_OK != | 498 | if (GNUNET_OK != |
@@ -494,15 +500,16 @@ int main(int argc, | |||
494 | { | 500 | { |
495 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0); | 501 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0); |
496 | free_tree (root); | 502 | free_tree (root); |
503 | EXTRACTOR_plugin_remove_all (plugins); | ||
504 | GNUNET_free ((void*) argv); | ||
497 | return 4; | 505 | return 4; |
498 | } | 506 | } |
499 | free_tree (root); | 507 | free_tree (root); |
500 | } | 508 | } |
501 | /* enable "clean" shutdown by telling parent that we are done */ | 509 | /* enable "clean" shutdown by telling parent that we are done */ |
502 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED, NULL, 0); | 510 | (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED, NULL, 0); |
503 | if (NULL != plugins) | 511 | EXTRACTOR_plugin_remove_all (plugins); |
504 | EXTRACTOR_plugin_remove_all (plugins); | 512 | GNUNET_free ((void*) argv); |
505 | |||
506 | return 0; | 513 | return 0; |
507 | } | 514 | } |
508 | 515 | ||
diff --git a/src/fs/gnunet-pseudonym.c b/src/fs/gnunet-pseudonym.c index 02b71b513..a692917da 100644 --- a/src/fs/gnunet-pseudonym.c +++ b/src/fs/gnunet-pseudonym.c | |||
@@ -317,10 +317,12 @@ main (int argc, char *const *argv) | |||
317 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 317 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
318 | return 2; | 318 | return 2; |
319 | 319 | ||
320 | return (GNUNET_OK == | 320 | ret = (GNUNET_OK == |
321 | GNUNET_PROGRAM_run (argc, argv, "gnunet-pseudonym [OPTIONS]", | 321 | GNUNET_PROGRAM_run (argc, argv, "gnunet-pseudonym [OPTIONS]", |
322 | gettext_noop ("Manage GNUnet pseudonyms."), | 322 | gettext_noop ("Manage GNUnet pseudonyms."), |
323 | options, &run, NULL)) ? ret : 1; | 323 | options, &run, NULL)) ? ret : 1; |
324 | GNUNET_free ((void*) argv); | ||
325 | return ret; | ||
324 | } | 326 | } |
325 | 327 | ||
326 | /* end of gnunet-pseudonym.c */ | 328 | /* end of gnunet-pseudonym.c */ |
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index eb64cc4cc..dbbdfda8c 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -734,19 +734,18 @@ main (int argc, char *const *argv) | |||
734 | 0, &GNUNET_GETOPT_set_one, &verbose}, | 734 | 0, &GNUNET_GETOPT_set_one, &verbose}, |
735 | GNUNET_GETOPT_OPTION_END | 735 | GNUNET_GETOPT_OPTION_END |
736 | }; | 736 | }; |
737 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
738 | "GNUnet publish starts\n"); | ||
739 | bo.expiration_time = | 737 | bo.expiration_time = |
740 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); | 738 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); |
741 | 739 | ||
742 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 740 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
743 | return 2; | 741 | return 2; |
744 | 742 | ret = (GNUNET_OK == | |
745 | return (GNUNET_OK == | 743 | GNUNET_PROGRAM_run (argc, argv, "gnunet-publish [OPTIONS] FILENAME", |
746 | GNUNET_PROGRAM_run (argc, argv, "gnunet-publish [OPTIONS] FILENAME", | 744 | gettext_noop |
747 | gettext_noop | 745 | ("Publish a file or directory on GNUnet"), |
748 | ("Publish a file or directory on GNUnet"), | 746 | options, &run, NULL)) ? ret : 1; |
749 | options, &run, NULL)) ? ret : 1; | 747 | GNUNET_free ((void*) argv); |
748 | return ret; | ||
750 | } | 749 | } |
751 | 750 | ||
752 | /* end of gnunet-publish.c */ | 751 | /* end of gnunet-publish.c */ |
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index 200dc77ab..e90b761d7 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c | |||
@@ -303,11 +303,13 @@ main (int argc, char *const *argv) | |||
303 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 303 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
304 | return 2; | 304 | return 2; |
305 | 305 | ||
306 | return (GNUNET_OK == | 306 | ret = (GNUNET_OK == |
307 | GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD", | 307 | GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD", |
308 | gettext_noop | 308 | gettext_noop |
309 | ("Search GNUnet for files that were published on GNUnet"), | 309 | ("Search GNUnet for files that were published on GNUnet"), |
310 | options, &run, NULL)) ? ret : 1; | 310 | options, &run, NULL)) ? ret : 1; |
311 | GNUNET_free ((void*) argv); | ||
312 | return ret; | ||
311 | } | 313 | } |
312 | 314 | ||
313 | /* end of gnunet-search.c */ | 315 | /* end of gnunet-search.c */ |
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index be16e9100..094d8868d 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c | |||
@@ -173,11 +173,13 @@ main (int argc, char *const *argv) | |||
173 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 173 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
174 | return 2; | 174 | return 2; |
175 | 175 | ||
176 | return (GNUNET_OK == | 176 | ret = (GNUNET_OK == |
177 | GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", | 177 | GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", |
178 | gettext_noop | 178 | gettext_noop |
179 | ("Unindex a file that was previously indexed with gnunet-publish."), | 179 | ("Unindex a file that was previously indexed with gnunet-publish."), |
180 | options, &run, NULL)) ? ret : 1; | 180 | options, &run, NULL)) ? ret : 1; |
181 | GNUNET_free ((void*) argv); | ||
182 | return ret; | ||
181 | } | 183 | } |
182 | 184 | ||
183 | /* end of gnunet-unindex.c */ | 185 | /* end of gnunet-unindex.c */ |