summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/version.texi8
-rw-r--r--po/de.po46
-rw-r--r--po/fr.po46
-rw-r--r--po/nl.po46
-rw-r--r--po/pl.po46
-rw-r--r--src/mkid.c15
6 files changed, 103 insertions, 104 deletions
diff --git a/doc/version.texi b/doc/version.texi
index b46c1b3..5dcd64f 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 9 November 2005
-@set UPDATED-MONTH November 2005
-@set EDITION 4.1rc2
-@set VERSION 4.1rc2
+@set UPDATED 6 January 2006
+@set UPDATED-MONTH January 2006
+@set EDITION 4.1rc3
+@set VERSION 4.1rc3
diff --git a/po/de.po b/po/de.po
index 7433033..1b27170 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU mkid 3.0.8\n"
-"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 07:15+0100\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2006-01-10 08:31+0100\n"
"PO-Revision-Date: 1996-03-23 22:34 MET\n"
"Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -43,7 +43,7 @@ msgstr ""
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
#, c-format
msgid "can't open `%s'"
msgstr ""
@@ -475,104 +475,104 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:378
+#: src/mkid.c:376
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:382
+#: src/mkid.c:381
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:459
+#: src/mkid.c:458
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:528
+#: src/mkid.c:527
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", new=%d/%d"
-#: src/mkid.c:537
+#: src/mkid.c:536
#, c-format
msgid "Name=%ld, "
msgstr "Name=%ld, "
-#: src/mkid.c:538
+#: src/mkid.c:537
#, c-format
msgid "Number=%ld, "
msgstr "Zahl=%ld, "
-#: src/mkid.c:539
+#: src/mkid.c:538
#, c-format
msgid "String=%ld, "
msgstr "Zeichenkette=%ld, "
# ist das gemeint? ###
-#: src/mkid.c:540
+#: src/mkid.c:539
#, c-format
msgid "Literal=%ld, "
msgstr "Zeichen=%ld, "
-#: src/mkid.c:541
+#: src/mkid.c:540
#, c-format
msgid "Comment=%ld\n"
msgstr "Kommentar=%ld\n"
-#: src/mkid.c:543
+#: src/mkid.c:542
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Dateien=%d, "
-#: src/mkid.c:544
+#: src/mkid.c:543
#, c-format
msgid "Tokens=%ld, "
msgstr "Tokens=%ld, "
-#: src/mkid.c:545
+#: src/mkid.c:544
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bytes=%ld Kb, "
-#: src/mkid.c:546
+#: src/mkid.c:545
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "\"Heap\"=%ld Kb, "
-#: src/mkid.c:548
+#: src/mkid.c:547
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n"
# Frequenz übersetzen? ke
-#: src/mkid.c:551
+#: src/mkid.c:550
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "\"Freq\"=%ld/%ld=%.2f\n"
-#: src/mkid.c:575
+#: src/mkid.c:574
#, c-format
msgid "Sorting tokens...\n"
msgstr "Sortiere \"Token\"...\n"
-#: src/mkid.c:581
+#: src/mkid.c:580
#, c-format
msgid "Writing `%s'...\n"
msgstr "Schreibe '%s'...\n"
-#: src/mkid.c:584
+#: src/mkid.c:583
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:652
+#: src/mkid.c:651
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:740
+#: src/mkid.c:739
#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "level %d: %ld == %ld\n"
diff --git a/po/fr.po b/po/fr.po
index b34a5d5..ac64d17 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU mkid 3.0.8\n"
-"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 07:15+0100\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2006-01-10 08:31+0100\n"
"PO-Revision-Date: 1996-03-23 22:34 MET\n"
"Last-Translator: Unknown <unknown@unknown.fr>\n"
"Language-Team: French <fr@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
#, c-format
msgid "can't open `%s'"
msgstr ""
@@ -484,102 +484,102 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:378
+#: src/mkid.c:376
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:382
+#: src/mkid.c:381
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:459
+#: src/mkid.c:458
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:528
+#: src/mkid.c:527
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", nouveau=%d/%d"
-#: src/mkid.c:537
+#: src/mkid.c:536
#, c-format
msgid "Name=%ld, "
msgstr "Nom=%ld, "
-#: src/mkid.c:538
+#: src/mkid.c:537
#, c-format
msgid "Number=%ld, "
msgstr "Numro=%ld, "
-#: src/mkid.c:539
+#: src/mkid.c:538
#, c-format
msgid "String=%ld, "
msgstr "Chane=%ld, "
-#: src/mkid.c:540
+#: src/mkid.c:539
#, c-format
msgid "Literal=%ld, "
msgstr "Litral=%ld, "
-#: src/mkid.c:541
+#: src/mkid.c:540
#, c-format
msgid "Comment=%ld\n"
msgstr "Commentaire=%ld\n"
-#: src/mkid.c:543
+#: src/mkid.c:542
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Fichiers=%d, "
-#: src/mkid.c:544
+#: src/mkid.c:543
#, c-format
msgid "Tokens=%ld, "
msgstr "Units lexicales=%ld, "
-#: src/mkid.c:545
+#: src/mkid.c:544
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Octets=%ld Kb, "
-#: src/mkid.c:546
+#: src/mkid.c:545
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "tas=%ld Kb, "
-#: src/mkid.c:548
+#: src/mkid.c:547
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Sortie=%ld (%ld units lexicales, %ld Touches)\n"
-#: src/mkid.c:551
+#: src/mkid.c:550
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "Freq=%ld/%ld=%.2f\n"
-#: src/mkid.c:575
+#: src/mkid.c:574
#, c-format
msgid "Sorting tokens...\n"
msgstr "Tri units lexicales...\n"
-#: src/mkid.c:581
+#: src/mkid.c:580
#, c-format
msgid "Writing `%s'...\n"
msgstr "criture `%s'...\n"
-#: src/mkid.c:584
+#: src/mkid.c:583
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:652
+#: src/mkid.c:651
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:740
+#: src/mkid.c:739
#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "niveau %d: %ld == %ld\n"
diff --git a/po/nl.po b/po/nl.po
index 7c993e0..14ca347 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: id-utils 3.2\n"
-"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 07:15+0100\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2006-01-10 08:31+0100\n"
"PO-Revision-Date: 1998-09-30 13:31+02:00\n"
"Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "Botsingen=%ld/%ld=%.0f%%"
msgid "can't determine the io_size of a string!"
msgstr "kan de io_size van een letterreeks niet vaststellen!"
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
#, c-format
msgid "can't open `%s'"
msgstr "kan `%s' niet openen"
@@ -584,102 +584,102 @@ msgstr ""
"\n"
"The following arguments apply to the language-specific scanners:\n"
-#: src/mkid.c:378
+#: src/mkid.c:376
#, c-format
msgid "can't create `%s' in `%s'"
msgstr "kan `%s' niet aanmaken in `%s'"
-#: src/mkid.c:382
+#: src/mkid.c:381
#, c-format
msgid "can't modify `%s'"
msgstr "kan `%s' niet veranderen"
-#: src/mkid.c:459
+#: src/mkid.c:458
#, c-format
msgid "can't stat `%s'"
msgstr "kan de status van `%s' niet opvragen"
-#: src/mkid.c:528
+#: src/mkid.c:527
#, c-format
msgid " new = %d/%d"
msgstr " nieuw = %d/%d"
-#: src/mkid.c:537
+#: src/mkid.c:536
#, c-format
msgid "Name=%ld, "
msgstr "Naam=%ld, "
-#: src/mkid.c:538
+#: src/mkid.c:537
#, c-format
msgid "Number=%ld, "
msgstr "Nummer = %ld, "
-#: src/mkid.c:539
+#: src/mkid.c:538
#, c-format
msgid "String=%ld, "
msgstr "Letterreeks=%ld, "
-#: src/mkid.c:540
+#: src/mkid.c:539
#, c-format
msgid "Literal=%ld, "
msgstr "Letterlijk=%ld, "
-#: src/mkid.c:541
+#: src/mkid.c:540
#, c-format
msgid "Comment=%ld\n"
msgstr "Commentaar=%ld\n"
-#: src/mkid.c:543
+#: src/mkid.c:542
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Bestanden=%d, "
-#: src/mkid.c:544
+#: src/mkid.c:543
#, c-format
msgid "Tokens=%ld, "
msgstr "Eenheden=%ld, "
-#: src/mkid.c:545
+#: src/mkid.c:544
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bytes=%ld Kb, "
-#: src/mkid.c:546
+#: src/mkid.c:545
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "Data=%ld+%ld Kb, "
-#: src/mkid.c:548
+#: src/mkid.c:547
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Uitvoer=%ld (%ld eenheden, %ld gevonden)\n"
-#: src/mkid.c:551
+#: src/mkid.c:550
#, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr ", Freq=%ld/%ld=%.2f\n"
-#: src/mkid.c:575
+#: src/mkid.c:574
#, c-format
msgid "Sorting tokens...\n"
msgstr "Eenheden sorteren...\n"
-#: src/mkid.c:581
+#: src/mkid.c:580
#, c-format
msgid "Writing `%s'...\n"
msgstr "`%s' schrijven...\n"
-#: src/mkid.c:584
+#: src/mkid.c:583
#, c-format
msgid "can't create `%s'"
msgstr "kan `%s' niet aanmaken"
-#: src/mkid.c:652
+#: src/mkid.c:651
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:740
+#: src/mkid.c:739
#, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "niveau %d: %ld/%ld = %.0f%%\n"
diff --git a/po/pl.po b/po/pl.po
index 2550100..ae4b343 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: id-utils 3.0.8\n"
-"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 07:15+0100\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2006-01-10 08:31+0100\n"
"PO-Revision-Date: 1997-03-26 23:59 +0100\n"
"Last-Translator: Wojciech Marek Gałązka <wgalazka@chem.uw.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "Próby=%ld/%ld=%.2f, "
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
#, c-format
msgid "can't open `%s'"
msgstr ""
@@ -473,102 +473,102 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:378
+#: src/mkid.c:376
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:382
+#: src/mkid.c:381
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:459
+#: src/mkid.c:458
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:528
+#: src/mkid.c:527
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", nowy=%d/%d"
-#: src/mkid.c:537
+#: src/mkid.c:536
#, c-format
msgid "Name=%ld, "
msgstr "Nazwa=%ld, "
-#: src/mkid.c:538
+#: src/mkid.c:537
#, c-format
msgid "Number=%ld, "
msgstr "Numer=%ld, "
-#: src/mkid.c:539
+#: src/mkid.c:538
#, c-format
msgid "String=%ld, "
msgstr "Łańcuch=%ld, "
-#: src/mkid.c:540
+#: src/mkid.c:539
#, c-format
msgid "Literal=%ld, "
msgstr "Literał=%ld, "
-#: src/mkid.c:541
+#: src/mkid.c:540
#, c-format
msgid "Comment=%ld\n"
msgstr "Komentarz=%ld\n"
-#: src/mkid.c:543
+#: src/mkid.c:542
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Pliki=%d, "
-#: src/mkid.c:544
+#: src/mkid.c:543
#, c-format
msgid "Tokens=%ld, "
msgstr "Znaczniki=%ld, "
-#: src/mkid.c:545
+#: src/mkid.c:544
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bajty=%ld Kb, "
-#: src/mkid.c:546
+#: src/mkid.c:545
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "Sterta=%ld Kb, "
-#: src/mkid.c:548
+#: src/mkid.c:547
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Wynik=%ld (%ld tok, %ld hit)\n"
-#: src/mkid.c:551
+#: src/mkid.c:550
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "Częstość=%ld/%ld=%.2f\n"
-#: src/mkid.c:575
+#: src/mkid.c:574
#, c-format
msgid "Sorting tokens...\n"
msgstr "Sortowanie znaczników...\n"
-#: src/mkid.c:581
+#: src/mkid.c:580
#, c-format
msgid "Writing `%s'...\n"
msgstr "Zapisuję `%s'...\n"
-#: src/mkid.c:584
+#: src/mkid.c:583
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:652
+#: src/mkid.c:651
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:740
+#: src/mkid.c:739
#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "poziom %d: %ld == %ld\n"
diff --git a/src/mkid.c b/src/mkid.c
index 6b5cef6..2a945e6 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -365,21 +365,20 @@ ceil_log_2 (unsigned long n)
with a diagnostic if this is not so. */
void
-assert_writeable (char const *file_name)
+assert_writeable (char const *filename)
{
- if (access (file_name, 06) < 0)
+ if (access (filename, 06) < 0)
{
if (errno == ENOENT)
{
- char const *dir_name = dirname ((char*)file_name);
- if (!dir_name || !*dir_name)
- dir_name = ".";
- if (access (dir_name, 06) < 0)
+ char const *dirname = dir_name ((char*)filename);
+ if (access (dirname, 06) < 0)
error (1, errno, _("can't create `%s' in `%s'"),
- basename (file_name), dir_name);
+ base_name (filename), dirname);
+ free(dirname);
}
else
- error (1, errno, _("can't modify `%s'"), file_name);
+ error (1, errno, _("can't modify `%s'"), filename);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 05:56:06 +0000