gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r2061 - in doodle: . po src/doodle


From: grothoff
Subject: [GNUnet-SVN] r2061 - in doodle: . po src/doodle
Date: Sun, 4 Sep 2005 17:44:17 -0700 (PDT)

Author: grothoff
Date: 2005-09-04 17:44:15 -0700 (Sun, 04 Sep 2005)
New Revision: 2061

Modified:
   doodle/ChangeLog
   doodle/po/de.po
   doodle/po/eu.po
   doodle/po/ga.po
   doodle/po/it.po
   doodle/po/nl.po
   doodle/po/sq.po
   doodle/po/vi.po
   doodle/src/doodle/doodle.c
   doodle/src/doodle/files.c
   doodle/src/doodle/helper2.h
Log:
fixing mantis 926

Modified: doodle/ChangeLog
===================================================================
--- doodle/ChangeLog    2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/ChangeLog    2005-09-05 00:44:15 UTC (rev 2061)
@@ -1,3 +1,8 @@
+Sun Sep  4 17:56:10 PDT 2005
+       Fixed -P option (short form did not work, Mantis #927).
+       Made prune-paths much faster by not iterating over the pruned
+       directories (Mantis #926).
+
 Wed Aug  3 11:01:18 PDT 2005
        Updated Vietnamese translation.
 

Modified: doodle/po/de.po
===================================================================
--- doodle/po/de.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/de.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.6.2\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2005-02-06 10:02+0100\n"
 "Last-Translator: Karl Eichwalder <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -112,24 +112,24 @@
 msgid "Pruned: %s\n"
 msgstr "Bereinigt: %s\n"
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Aufruf von »%s« für Datei »%s« fehlgeschlagen: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "»%s« wird bearbeitet\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Keine Datenbank angegeben.  Abbruch.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
@@ -138,52 +138,52 @@
 "»%s« ist ein ungültiger Datenbank-Dateiname (mit einem Doppelpunkt) für das\n"
 "Erstellen einer Datenbank (Option »%s«).\n"
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "libextractor-Standarderweiterungen werden geladen.\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "libextractor-Erweiterungen werden geladen: »%s'\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr "libextractor-Erweiterungen konnten nicht geladen werden. Abbruch.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "»%s« konnte für die Protokollerstellung nicht geöffnet werden: %s\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "»%s« wird indiziert\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Schlüsselwörter für die passende Datei »%s«:\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Keine Datenbank angegeben. Abbruch.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Aufruf von »%s« für Datei »%s« fehlgeschlagen: %s.\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Suche nach »%s«:\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
@@ -192,7 +192,7 @@
 "nicht\n"
 "funktionieren.\n"
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
@@ -201,44 +201,44 @@
 "Warnung: die Suchzeichenkette ist länger als %d Zeichen; die Suche wird\n"
 "möglicherweise nicht richtig funktionieren.\n"
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tNicht gefunden!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "Die Option »%s« benötigt eine Zahl als Argument.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr ""
 "Die Optionen »%s« und »%s« können nicht gleichzeitig verwendet werden!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr "Die angegebene Speichergrenze ist zu hoch.\n"
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Version %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Mit »--help« kann eine Liste der Optionen angezeigt werden.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr "Programm mit zu indizierenden Datei- und Verzeichnisnamen aufrufen!\n"
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Programm mit Suchbegriff aufrufen!\n"
@@ -352,7 +352,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Programm mit zu indizierenden Datei- und Verzeichnisnamen aufrufen!\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -360,12 +360,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Annahme fehlgeschlagen in %s:%d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "»%s« wird gelesen\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Zugriff auf das Verzeichnis »%s« ist untersagt.\n"

Modified: doodle/po/eu.po
===================================================================
--- doodle/po/eu.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/eu.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.3.0\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2004-09-09 00:23-0500\n"
 "Last-Translator: Mikel Olasagasti <address@hidden>\n"
 "Language-Team: Basque <address@hidden>\n"
@@ -103,125 +103,125 @@
 msgid "Pruned: %s\n"
 msgstr ""
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, fuzzy, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "'%s'-i deiak huts egin du '%s' fitxategiarentzat: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "'%s' prezesatzen\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Ez da datubaserik espezifikatu.  Abortatzen.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
 "(option '%s').\n"
 msgstr ""
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "Lehenetsitako libextractor plugin-ak kargatzen.\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "Libextraktor-en plugin-ak kargatzen: '%s'\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr "Huts egin da libextractor-en plugin-ak kargatzen. Abortatzen.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, fuzzy, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "Ezin izan da '%s' ireki: %s\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "'%s' indexatzen\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Hitz-gakoa '%s' fitxategia aurkitzeko:\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Ez da datubaserik espezifikatu. Abortatzen.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, fuzzy, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "'%s'-i deiak huts egin du '%s' fitxategiarentzat: %s\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "'%s' bilatzen:\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
 "properly.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tEz da aurkitu!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "Zenbaki bat pasa behar diozu '%s' aukerari.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "'%s' eta '%s' aukerak ezin dira batera erabili!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "%s bertsioa\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Erabili '--help' aukera zerrenda bat erakusteko.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr ""
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr ""
@@ -335,7 +335,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr ""
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -343,12 +343,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "'%s' eskaneatzen\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "'%s' direktoriora sarrera debekatua izan da.\n"

Modified: doodle/po/ga.po
===================================================================
--- doodle/po/ga.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/ga.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.6.1\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2004-12-28 10:11-0500\n"
 "Last-Translator: Kevin Patrick Scannell <address@hidden>\n"
 "Language-Team: Irish <address@hidden>\n"
@@ -106,24 +106,24 @@
 msgid "Pruned: %s\n"
 msgstr "Bearrtha: %s\n"
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Theip ar glao '%s' do chomhad '%s': %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "Ag pr�ise�il '%s'\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "N�l aon bhunachar sonra� tugtha.  Ag tobscor.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
@@ -132,52 +132,52 @@
 "N�l '%s' ina ainm comhaid bail� (t� idirstad ann) le haghaidh t�g�la (rogha "
 "'%s').\n"
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "Breise�in asbhainteora r�amhshocraithe � lucht�.\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "Ag lucht� breise�n libextractor: '%s'\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr "Theip ar lucht� breise�n asbhainteora.  Ag tobscor.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "N�orbh fh�idir '%s' a oscailt chun log�il: %s.\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "'%s' � inn�acs�\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Eochairfhocail do chomhad comhoiri�naithe '%s':\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "N�l aon bhunachar sonra� ceaptha.  Ag tobscor.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Theip ar glao '%s' do chomhad '%s': %s.\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Ag d�anamh cuardach ar '%s':\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
@@ -185,7 +185,7 @@
 "Rabhadh: t� an teaghr�n cuardaigh n�os faide n� %d carachtar, n� "
 "fheidhmeoidh an cuardach.\n"
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
@@ -194,44 +194,44 @@
 "Rabhadh: t� an teaghr�n cuardaigh n�os faide n� %d carachtar, is f�idir nach "
 "bhfeidhmeoidh an cuardach go ceart.\n"
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tAr iarraidh!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "N� fol�ir rogha uimhri�il leis an rogha '%s'.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "n� cheada�tear na roghanna '%s' agus '%s' le ch�ile!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr "Is r�-ard an t-uasmh�id cuimhne tugtha.\n"
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Leagan %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Bain �s�id as '--help' le haghaidh n�os m� roghanna.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr ""
 "Cuir ar si�l le hainmneacha comhaid n� comhadlanna chun inn�acs a dh�anamh!\n"
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Cuir ar si�l le focail chun cuardach a dh�anamh!\n"
@@ -340,7 +340,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Cuir ar si�l le hainmneacha comhaid n� comhadlanna le monat�iri�!\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -348,12 +348,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Theip ar dearbh� ag %s:%d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "'%s' � scanadh\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Di�lta�odh cead rochtana ar an chomhadlann '%s'.\n"

Modified: doodle/po/it.po
===================================================================
--- doodle/po/it.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/it.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.6.3\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2005-08-16 12:54+0100\n"
 "Last-Translator: Marco Colombo <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
@@ -18,15 +18,20 @@
 
 #: src/doodle/doodle.c:67
 msgid "consider strings to match if DISTANCE letters are different"
-msgstr "considera le stringhe come corrispondenti se DISTANZA lettere sono 
differenti"
+msgstr ""
+"considera le stringhe come corrispondenti se DISTANZA lettere sono differenti"
 
 #: src/doodle/doodle.c:69
 msgid "build database (default is to search)"
 msgstr "crea il database (azione predefinita: cerca)"
 
 #: src/doodle/doodle.c:71
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG (use when building database)"
-msgstr "usa il generico estrattore di testo semplice per il linguaggio con il 
codice LANG a 2 lettere (usato alla creazione del database)"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG (use when building database)"
+msgstr ""
+"usa il generico estrattore di testo semplice per il linguaggio con il codice "
+"LANG a 2 lettere (usato alla creazione del database)"
 
 #: src/doodle/doodle.c:73 src/doodle/doodled.c:63
 msgid "use location FILENAME to store doodle database"
@@ -38,7 +43,9 @@
 
 #: src/doodle/doodle.c:77
 msgid "add the filename to the list of keywords (use when building database)"
-msgstr "aggiunge il nome del file alla lista di parole chiavi (usato alla 
creazione del database)"
+msgstr ""
+"aggiunge il nome del file alla lista di parole chiavi (usato alla creazione "
+"del database)"
 
 #: src/doodle/doodle.c:79 src/doodle/doodled.c:69
 msgid "print this help page"
@@ -97,129 +104,144 @@
 msgid "Pruned: %s\n"
 msgstr "Rimosso: %s\n"
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Chiamata a '%s' per il file '%s' non riuscita: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "Analisi di '%s' in corso\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Nessun database specificato. Iterrotto.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
-msgid "'%s' is an invalid database filename (has a colon) for building 
database (option '%s').\n"
-msgstr "'%s' non � un nome di database valido (contiene un ':') per la 
creazione del database (opzione '%s').\n"
+msgid ""
+"'%s' is an invalid database filename (has a colon) for building database "
+"(option '%s').\n"
+msgstr ""
+"'%s' non � un nome di database valido (contiene un ':') per la creazione del "
+"database (opzione '%s').\n"
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "Caricamento dei plugin di libextractor predefiniti.\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "Caricamento dei plugin di libextractor: '%s'\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr "Caricamento dei plugin di libextractor non riuscito. Interrotto.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "Impossibile aprire '%s' per il logging: %s.\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "Indicizzazione di '%s' in corso\n"
 
 # FIXME
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Parole chiavi per il file '%s':\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Nessun database specificato. Interrotto.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Chiamata a '%s' per il file '%s' non riuscita: %s.\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Ricerca di '%s':\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
-msgid "Warning: search string is longer than %d characters, search will not 
work.\n"
-msgstr "Attenzione: la stringa di ricerca � pi� lunga di %d caratteri, la 
ricerca non funzioner�.\n"
+msgid ""
+"Warning: search string is longer than %d characters, search will not work.\n"
+msgstr ""
+"Attenzione: la stringa di ricerca � pi� lunga di %d caratteri, la ricerca "
+"non funzioner�.\n"
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
-msgid "Warning: search string is longer than %d characters, search may not 
work properly.\n"
-msgstr "Attenzione: la stringa di ricerca � pi� lunga di %d caratteri, la 
ricerca potrebbe non funzionare correttamente.\n"
+msgid ""
+"Warning: search string is longer than %d characters, search may not work "
+"properly.\n"
+msgstr ""
+"Attenzione: la stringa di ricerca � pi� lunga di %d caratteri, la ricerca "
+"potrebbe non funzionare correttamente.\n"
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tNon trovato!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "Bisogna indicare un numero con l'opzione '%s'.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "Le opzioni '%s' e '%s' non possono essere usate assieme!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr "Il limite di memoria specificato � troppo alto.\n"
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Versione %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Usare '--help' per mostrare una lista di opzioni.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr "Usa nomi di file o directory per indicizzare!\n"
 
 # FIXME
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Indicare i termini da cercare!\n"
 
 #: src/doodle/doodled.c:60
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG"
-msgstr "usa il generico estrattore di testo semplice per il linguaggio con il 
codice LANG a 2 lettere (usato alla creazione del database)"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"usa il generico estrattore di testo semplice per il linguaggio con il codice "
+"LANG a 2 lettere (usato alla creazione del database)"
 
 #: src/doodle/doodled.c:65
 msgid "run in debug mode, do not daemonize"
@@ -318,7 +340,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Chiama con nomi di file o directory da osservare!\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -326,12 +348,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Asserzione fallita in %s:%d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "Analisi di '%s' in corso\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Accesso alla directory '%s' negato.\n"
@@ -414,7 +436,9 @@
 #: src/doodle/grow.c:100
 #, c-format
 msgid "FATAL: can not allocate %u * %d elements (number too large) at %s:%d.\n"
-msgstr "FATALE: impossibile allocare %u * %d elementi (numero troppo grande) a 
%s:%d.\n"
+msgstr ""
+"FATALE: impossibile allocare %u * %d elementi (numero troppo grande) a %s:%"
+"d.\n"
 
 #: src/doodle/help.c:51
 #, c-format
@@ -429,8 +453,11 @@
 
 #: src/doodle/help.c:54
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per 
quelle corte.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
+"corte.\n"
 
 #: src/doodle/tree.c:194
 #, c-format
@@ -463,7 +490,9 @@
 #: src/doodle/tree.c:1024
 #, c-format
 msgid "Memory limit (%u bytes) hit, serializing some data.\n"
-msgstr "Raggiunto il limite di memoria (%u byte), alcuni dati verranno 
serializzati.\n"
+msgstr ""
+"Raggiunto il limite di memoria (%u byte), alcuni dati verranno "
+"serializzati.\n"
 
 #: src/doodle/tree.c:1062
 #, c-format
@@ -492,8 +521,12 @@
 
 #: src/doodle/tree.c:1605
 #, c-format
-msgid "Database file '%s' is from incomplete database build.  I will remove it 
and rebuild the database.\n"
-msgstr "Il file di database '%s' � un database incompleto. Verr� rimosso e il 
database sar� ricostruito.\n"
+msgid ""
+"Database file '%s' is from incomplete database build.  I will remove it and "
+"rebuild the database.\n"
+msgstr ""
+"Il file di database '%s' � un database incompleto. Verr� rimosso e il "
+"database sar� ricostruito.\n"
 
 #: src/doodle/tree.c:1611
 #, c-format
@@ -559,8 +592,12 @@
 msgstr "Rimosse le parole chiavi per il file '%s'.\n"
 
 #: src/doodle/tree.c:2941 src/doodle/tree.c:3002
-msgid "Scanning filesystem in order to remove obsolete entries from existing 
database.\n"
-msgstr "Analisi del filesystem per rimuovere elementi obsoleti dal database 
esistente.\n"
+msgid ""
+"Scanning filesystem in order to remove obsolete entries from existing "
+"database.\n"
+msgstr ""
+"Analisi del filesystem per rimuovere elementi obsoleti dal database "
+"esistente.\n"
 
 #: src/doodle/tree.c:2960 src/doodle/tree.c:3021
 #, c-format

Modified: doodle/po/nl.po
===================================================================
--- doodle/po/nl.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/nl.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.4.0\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2004-10-03 17:26+0200\n"
 "Last-Translator:  Elros Cyriatan <address@hidden>\n"
 "Language-Team: Dutch <address@hidden>\n"
@@ -101,125 +101,125 @@
 msgid "Pruned: %s\n"
 msgstr ""
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Aanroep van '%s' voor bestand '%s' mislukt: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "Bezig met verwerken '%s'\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Geen gegevensbank opgegeven.  Afbreken.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
 "(option '%s').\n"
 msgstr ""
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr ""
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, fuzzy, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "Kon '%s' niet openen: %s\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "Bezig met indexeren '%s'\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Sleutelwoorden voor overeenkomend bestand '%s':\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Geen gegevensbank opgegeven. Afbreken.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, fuzzy, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Aanroep van '%s' voor bestand '%s' mislukt: %s\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Bezig met zoeken naar '%s':\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
 "properly.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tNiet gevonden!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "De '%s' optie vereist een getal.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "De opties '%s' en '%s' kunnen niet tegelijk worden gebruikt!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr ""
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Versie %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Gebruik '--help' voor een lijst met opties.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr "Geef bestandsnamen of mappen op om te indexeren!\n"
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Geef zoektermen op om naar te zoeken!\n"
@@ -329,7 +329,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Geef bestandsnamen of mappen op om te indexeren!\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -337,12 +337,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Bewering mislukt bij %s:%d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "Bezig met doorzoeken '%s'\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Toegang tot map '%s' werd geweigerd.\n"

Modified: doodle/po/sq.po
===================================================================
--- doodle/po/sq.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/sq.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.5.0\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2004-10-16 15:54+0200\n"
 "Last-Translator: Laurent Dhima <address@hidden>\n"
 "Language-Team: Albanian <address@hidden>\n"
@@ -104,24 +104,24 @@
 msgid "Pruned: %s\n"
 msgstr "Pastruar: %s\n"
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Thirrja tek '%s' për file '%s' dështoi: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "Duke proçesuar '%s'\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Nuk është përcaktuar asnjë databazë.  Abortim.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
@@ -130,52 +130,52 @@
 "'%s' është emër i pavlefshëm databaze (ka një kollonë) për krijimin e "
 "databazës (opcioni '%s').\n"
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "Duke ngarkuar rregullimin e prezgjedhur të plugins të libextrator.\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "Duke ngarkuar plugins e libextractor: '%s'\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr "Ngarkimi i çdo plugins të libextractor dështoi. Abortim.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "E pamundur hapja e '%s' për futje: %s.\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "Duke indeksuar '%s'\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Fjalë kyçe për file korrispondues '%s':\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Nuk është përcaktuar asnjë databazë. Abortim.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Thirrja tek '%s' për file '%s' dështoi: %s.\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Duke kërkuar për '%s':\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
@@ -183,7 +183,7 @@
 "Kujdes: fraza e kërkimit është më e gjatë se %d gërma, kërkimi nuk do të "
 "funksionojë.\n"
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
@@ -192,43 +192,43 @@
 "Kujdes: fraza e kërkimit është më e gjatë se %d gërma, kërkimi ndoshta mund "
 "të mos funksionojë si duhet.\n"
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tNuk u gjet!\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "Duhet t'i kaloni një numër opcionit '%s'.\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "Opcionet '%s' dhe '%s' nuk mund të përdoren së bashku!\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr "Limiti i caktuar i memorjes është tepër i lartë.\n"
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Versioni %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Përdor '--help' për të shikuar listën e opcioneve.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr "Thirr me emrat e file apo directories për indeksim!\n"
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Thirr me termet e kërkesës për të cilët duhet kërkuar!\n"
@@ -346,7 +346,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Thirr me emrat e file apo directories për indeksim!\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -354,12 +354,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "I pamundur vërtetimi tek %s: %d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "Duke kontrolluar '%s'\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Ndalohet hyrja tek directory '%s'.\n"

Modified: doodle/po/vi.po
===================================================================
--- doodle/po/vi.po     2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/po/vi.po     2005-09-05 00:44:15 UTC (rev 2061)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: doodle 0.6.3\n"
 "Report-Msgid-Bugs-To: https://gnunet.org/mantis/ or address@hidden"
-"POT-Creation-Date: 2005-04-28 23:26-0500\n"
+"POT-Creation-Date: 2005-09-04 17:55-0700\n"
 "PO-Revision-Date: 2005-08-03 17:10+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -103,24 +103,24 @@
 msgid "Pruned: %s\n"
 msgstr "Xén bớt rồi: %s\n"
 
-#: src/doodle/doodle.c:189 src/doodle/doodled.c:330 src/doodle/doodled.c:347
-#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:77
+#: src/doodle/doodle.c:190 src/doodle/doodled.c:330 src/doodle/doodled.c:347
+#: src/doodle/doodled.c:398 src/doodle/doodled.c:714 src/doodle/files.c:79
 #: src/doodle/tree.c:2269
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s\n"
 msgstr "Không gọi « %s » đối với tập tin « %s » được: %s\n"
 
-#: src/doodle/doodle.c:197
+#: src/doodle/doodle.c:198
 #, c-format
 msgid "Processing '%s'\n"
 msgstr "Đang xử lý « %s ».\n"
 
-#: src/doodle/doodle.c:219 src/doodle/doodled.c:599
+#: src/doodle/doodle.c:220 src/doodle/doodled.c:599
 #, c-format
 msgid "No database specified.  Aborting.\n"
 msgstr "Chưa ghi rõ cơ sở dữ liệu nên hủy bỏ.\n"
 
-#: src/doodle/doodle.c:224 src/doodle/doodled.c:606
+#: src/doodle/doodle.c:225 src/doodle/doodled.c:606
 #, c-format
 msgid ""
 "'%s' is an invalid database filename (has a colon) for building database "
@@ -129,59 +129,59 @@
 "« %s » là một tên tập tin cơ sở dữ liệu không hợp lệ (có dấu hai chấm) để "
 "xây dụng cơ sở dữ liệu (tùy chọn « %s »).\n"
 
-#: src/doodle/doodle.c:250 src/doodle/doodled.c:628
+#: src/doodle/doodle.c:251 src/doodle/doodled.c:628
 #, c-format
 msgid "Loading default set of libextractor plugins.\n"
 msgstr "Tải tập bộ cầm phít libextractor (rút thư viên) mặc định...\n"
 
-#: src/doodle/doodle.c:256 src/doodle/doodled.c:635
+#: src/doodle/doodle.c:257 src/doodle/doodled.c:635
 #, c-format
 msgid "Loading libextractor plugins: '%s'\n"
 msgstr "Đang tải bộ trình cầm phít libextractor (rút thư viên): « %s »\n"
 
-#: src/doodle/doodle.c:262 src/doodle/doodled.c:643
+#: src/doodle/doodle.c:263 src/doodle/doodled.c:643
 #, c-format
 msgid "Failed to load any libextractor plugins. Aborting.\n"
 msgstr ""
 "Không tải trình cầm phít libextractor (rút thư viên) nào được nên hủy bỏ.\n"
 
-#: src/doodle/doodle.c:270 src/doodle/doodled.c:588
+#: src/doodle/doodle.c:271 src/doodle/doodled.c:588
 #, c-format
 msgid "Could not open '%s' for logging: %s.\n"
 msgstr "Không mở được « %s » để ghi nhớ: %s.\n"
 
-#: src/doodle/doodle.c:280 src/doodle/doodled.c:486
+#: src/doodle/doodle.c:281 src/doodle/doodled.c:486
 #, c-format
 msgid "Indexing '%s'\n"
 msgstr "Đang chỉ mục « %s ».\n"
 
-#: src/doodle/doodle.c:342
+#: src/doodle/doodle.c:345
 #, c-format
 msgid "Keywords for matching file '%s':\n"
 msgstr "Từ khóa để khớp với tập tin « %s »:\n"
 
-#: src/doodle/doodle.c:369 src/doodle/doodle.c:408
+#: src/doodle/doodle.c:372 src/doodle/doodle.c:411
 #, c-format
 msgid "No database specified. Aborting.\n"
 msgstr "Chưa ghi rõ cơ sở dữ liệu nên hủy bỏ.\n"
 
-#: src/doodle/doodle.c:374 src/doodle/doodle.c:413
+#: src/doodle/doodle.c:377 src/doodle/doodle.c:416
 #, c-format
 msgid "Call to '%s' for file '%s' failed: %s.\n"
 msgstr "Không gọi « %s » đối với tập tin « %s » được: %s.\n"
 
-#: src/doodle/doodle.c:448
+#: src/doodle/doodle.c:451
 #, c-format
 msgid "Searching for '%s':\n"
 msgstr "Đang tìm kiếm « %s »:\n"
 
-#: src/doodle/doodle.c:451
+#: src/doodle/doodle.c:454
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search will not work.\n"
 msgstr "Cảnh báo: không tìm kiếm được vì chuỗi tìm kiếm dài hơn %d ký tự.\n"
 
-#: src/doodle/doodle.c:456
+#: src/doodle/doodle.c:459
 #, c-format
 msgid ""
 "Warning: search string is longer than %d characters, search may not work "
@@ -189,43 +189,43 @@
 msgstr ""
 "Cảnh báo: có lẽ sẽ không tìm kiếm được vì chuỗi tìm kiếm dài hơn %d ký tự.\n"
 
-#: src/doodle/doodle.c:468 src/doodle/doodle.c:478
+#: src/doodle/doodle.c:471 src/doodle/doodle.c:481
 #, c-format
 msgid "\tNot found!\n"
 msgstr "\tKhông tìm thấy.\n"
 
-#: src/doodle/doodle.c:552 src/doodle/doodle.c:614 src/doodle/doodled.c:900
+#: src/doodle/doodle.c:555 src/doodle/doodle.c:617 src/doodle/doodled.c:900
 #, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr "Phải gởi một con số vào tùy chọn « %s ».\n"
 
-#: src/doodle/doodle.c:557 src/doodle/doodle.c:568 src/doodle/doodle.c:573
-#: src/doodle/doodle.c:578 src/doodle/doodle.c:601 src/doodle/doodle.c:630
+#: src/doodle/doodle.c:560 src/doodle/doodle.c:571 src/doodle/doodle.c:576
+#: src/doodle/doodle.c:581 src/doodle/doodle.c:604 src/doodle/doodle.c:633
 #, c-format
 msgid "The options '%s' and '%s' cannot be used together!\n"
 msgstr "Không thể sử dụng hai tùy chọn « %s » và « %s » với nhau.\n"
 
-#: src/doodle/doodle.c:619 src/doodle/doodled.c:905
+#: src/doodle/doodle.c:622 src/doodle/doodled.c:905
 #, c-format
 msgid "Specified memory limit is too high.\n"
 msgstr "Ghi rõ giới hạn bộ nhớ quá cao.\n"
 
-#: src/doodle/doodle.c:644 src/doodle/doodled.c:922
+#: src/doodle/doodle.c:647 src/doodle/doodled.c:922
 #, c-format
 msgid "Version %s\n"
 msgstr "Phiên bản %s\n"
 
-#: src/doodle/doodle.c:649 src/doodle/doodled.c:927
+#: src/doodle/doodle.c:652 src/doodle/doodled.c:927
 #, c-format
 msgid "Use '--help' to get a list of options.\n"
 msgstr "Hãy sử dụng lệnh « --help » (trợ giúp) để xem danh sách tùy chọn.\n"
 
-#: src/doodle/doodle.c:658
+#: src/doodle/doodle.c:661
 #, c-format
 msgid "Invoke with filenames or directories to index!\n"
 msgstr "Hãy ghi rõ tên tập tin hay thư mục để chỉ mục.\n"
 
-#: src/doodle/doodle.c:659
+#: src/doodle/doodle.c:662
 #, c-format
 msgid "Invoke with query terms to search for!\n"
 msgstr "Hãy ghi rõ chuỗi tìm kiếm. Bạn muốn tìm gì vậy?\n"
@@ -339,7 +339,7 @@
 msgid "Invoke with filenames or directories to monitor!\n"
 msgstr "Cần phải ghi rõ theo dõi tên tập tin hay thư mục nào.\n"
 
-#: src/doodle/files.c:69 src/doodle/tree.c:328 src/doodle/tree.c:688
+#: src/doodle/files.c:71 src/doodle/tree.c:328 src/doodle/tree.c:688
 #: src/doodle/tree.c:1055 src/doodle/tree.c:1362 src/doodle/tree.c:1378
 #: src/doodle/tree.c:1414 src/doodle/tree.c:1429 src/doodle/tree.c:1449
 #: src/doodle/tree.c:2342 src/doodle/tree.c:2371
@@ -347,12 +347,12 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Không khắng định được (bắt lỗi) tại %s:%d.\n"
 
-#: src/doodle/files.c:105
+#: src/doodle/files.c:107
 #, c-format
 msgid "Scanning '%s'\n"
 msgstr "Đang quét « %s ».\n"
 
-#: src/doodle/files.c:113
+#: src/doodle/files.c:115
 #, c-format
 msgid "Access to directory '%s' was denied.\n"
 msgstr "Truy cập thư mục « %s » bị từ chối.\n"

Modified: doodle/src/doodle/doodle.c
===================================================================
--- doodle/src/doodle/doodle.c  2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/src/doodle/doodle.c  2005-09-05 00:44:15 UTC (rev 2061)
@@ -168,7 +168,8 @@
 
 
 static int do_index(const char * filename,
-                   DIC * dic) {
+                   void * cls) {
+  DIC * dic = cls;
   int i;
   int j;
   struct stat sbuf;
@@ -283,7 +284,9 @@
     if (-1 == scanDirectory(exp,
                            &my_log,
                            NULL,
-                           (ScannerCallback) &do_index,
+                           &isPruned,
+                           NULL,
+                           &do_index,
                            &cls)) {
       ret = -1;
       free(exp);

Modified: doodle/src/doodle/files.c
===================================================================
--- doodle/src/doodle/files.c   2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/src/doodle/files.c   2005-09-05 00:44:15 UTC (rev 2061)
@@ -54,6 +54,8 @@
 int scanDirectory(char * dirName,
                  DOODLE_Logger logger,
                  void * context,
+                 PruneCheck pruner,
+                 void * pr_arg,
                  ScannerCallback callback,
                  void * cb_arg) {
   DIR * dinfo;
@@ -126,11 +128,18 @@
     if (dirName[strlen(dirName)-1] != DIR_SEPARATOR)
       strcat(dn, DIR_SEPARATOR_STR);
     strcat(dn, finfo->d_name);
-    ret = scanDirectory(dn,
-                       logger,
-                       context,
-                       callback,
-                       cb_arg);
+    if (0 == pruner(dn,
+                   pr_arg)) {
+      ret = scanDirectory(dn,
+                         logger,
+                         context,
+                         pruner,
+                         pr_arg,
+                         callback,
+                         cb_arg);
+    } else {
+      ret = 0;
+    }
     free(dn);
     if (ret >= 0)
       count += ret;

Modified: doodle/src/doodle/helper2.h
===================================================================
--- doodle/src/doodle/helper2.h 2005-09-05 00:32:33 UTC (rev 2060)
+++ doodle/src/doodle/helper2.h 2005-09-05 00:44:15 UTC (rev 2061)
@@ -1,6 +1,6 @@
 /*
      This file is part of doodle.
-     (C) 2004 Christian Grothoff (and other contributing authors)
+     (C) 2004, 2005 Christian Grothoff (and other contributing authors)
 
      doodle is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -70,6 +70,15 @@
 char * expandFileName(const char * fil);
 
 /**
+ * Function called by scanDirectory to check if a given
+ * directory (and all subdirectories) is "pruned" and
+ * thus should not be considered in the scan.
+ * @return 0 if not pruned, 1 if pruned
+ */
+typedef int (*PruneCheck)(const char * name,
+                         void * cls);
+
+/**
  * Scan a directory for files. The name of the directory
  * must be expanded first (!).
  * @param dirName the name of the directory
@@ -81,6 +90,8 @@
 int scanDirectory(char * dirName,
                  DOODLE_Logger logger,
                  void * context,
+                 PruneCheck pruner,
+                 void * pr_arg,
                  ScannerCallback callback,
                  void * cb_arg);
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]