* provide replacement for lstat in a convoluted way,

   to workaround AC_REPLACE_FUNC / gnulib shortcomings

11 files changed, 168 insertions, 140 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ecb675..a57af17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,33 @@
 2006-07-22  Claudio Fontana  <claudio@gnu.org>
 
-	* configure.ac: add check for sbrk
+	* configure.ac: add check for lstat, bumped to 4.2
+
+	* libidu/idfile.c: replace include sys/stat.h with lstat.h.
+	* libidu/scanners.c: likewise.
+	* libidu/walker.c: likewise.
+	* src/mkid.c: likewise.
+
+	* libidu/walker.c: provide replacement function for lstat
+	  in a somewhat convoluted way, using plain stat.
+	
 	* src/mkid.c (get_process_heap): new function.
 	  Calls sbrk() if available, or NULL if unsupported.
 
 	* src/mkid.c (report_statistics): (nochange)
 	  the reported heap usage is 0+0 if sbrk is
 	  not available.
+
+2006-07-22  Claudio Fontana  <claudio@gnu.org>
+
+	* configure.ac: add check for sbrk
 	
+	* src/mkid.c (get_process_heap): new function.
+	  Calls sbrk() if available, or NULL if unsupported.
+
+	* src/mkid.c (report_statistics): (nochange)
+	  the reported heap usage is 0+0 if sbrk is
+	  not available.
+
 2006-07-22  Claudio Fontana  <claudio@gnu.org>
 
 	upgraded gnulib.
diff --git a/configure.ac b/configure.ac
index c0bc3c3..5d25e99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([idutils], [4.1], [bug-idutils@gnu.org])
+AC_INIT([idutils], [4.2], [bug-idutils@gnu.org])
 AC_GNU_SOURCE
 
 AM_INIT_AUTOMAKE
@@ -32,7 +32,7 @@ AM_GNU_GETTEXT
 # if HAVE_LINK, then in the code we look for file aliases
 # if HAVE_SBRK, then we can generate statistics on memory usage
 
-AC_CHECK_FUNCS([link sbrk])
+AC_CHECK_FUNCS([link sbrk lstat])
 
 AM_PATH_LISPDIR
 
diff --git a/libidu/idfile.c b/libidu/idfile.c
index 6d2d539..f4d2dce 100644
--- a/libidu/idfile.c
+++ b/libidu/idfile.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strsep.h>
-#include <sys/stat.h>
+#include "lstat.h"
 #include <obstack.h>
 #include <error.h>
 
diff --git a/libidu/scanners.c b/libidu/scanners.c
index 714a5c3..b0b0b31 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
-#include <sys/stat.h>
+#include "lstat.h"
 #include <string.h>
 #include <strsep.h>
 #include <errno.h>
diff --git a/libidu/walker.c b/libidu/walker.c
index 914905b..eeaf81f 100644
--- a/libidu/walker.c
+++ b/libidu/walker.c
@@ -18,7 +18,7 @@
 */
 
 #include <config.h>
-#include <sys/stat.h>
+#include "lstat.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -73,6 +73,14 @@ unsigned long dev_ino_hash_2 (void const *key);
 int dev_ino_hash_compare (void const *x, void const *y);
 int symlink_ancestry (struct file_link *flink);
 
+#ifndef HAVE_LSTAT
+#undef lstat
+int lstat(const char *filename, struct stat *sbuf)
+{
+  return stat(filename, sbuf);
+}
+#endif
+
 #if HAVE_LINK
 
 struct file_link *find_alias_link (struct file_link *flink, struct stat *stp);
diff --git a/po/de.po b/po/de.po
index bca8af6..fbd69b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2006-07-22 00:45+0200\n"
+"POT-Creation-Date: 2006-07-22 04:46+0200\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:229
+#: libidu/idread.c:49 src/mkid.c:485 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -196,55 +196,55 @@ msgstr ""
 msgid "Lisp language:\n"
 msgstr ""
 
-#: libidu/walker.c:113
+#: libidu/walker.c:121
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
 msgstr ""
 
-#: libidu/walker.c:180
+#: libidu/walker.c:188
 #, c-format
 msgid "notice: `%s' was a %s, but is now a %s!"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "file"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "directory"
 msgstr ""
 
-#: libidu/walker.c:311
+#: libidu/walker.c:319
 #, c-format
 msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
 msgstr ""
 
-#: libidu/walker.c:405
+#: libidu/walker.c:413
 #, c-format
 msgid "notice: scan parameters changed for `%s'"
 msgstr ""
 
-#: libidu/walker.c:608
+#: libidu/walker.c:616
 #, fuzzy
 msgid "can't get working directory"
 msgstr "%s: Name des aktuellen Verzeichnisses nicht zu erreichen."
 
-#: libidu/walker.c:665
+#: libidu/walker.c:673
 #, c-format
 msgid "can't chdir to `%s'"
 msgstr ""
 
-#: libidu/walker.c:670
+#: libidu/walker.c:678
 #, c-format
 msgid "can't chdir to `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:731
+#: libidu/walker.c:739
 #, c-format
 msgid "can't lstat `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:739
+#: libidu/walker.c:747
 #, c-format
 msgid "can't stat `%s' from `%s'"
 msgstr ""
@@ -506,104 +506,104 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:377
+#: src/mkid.c:386
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:382
+#: src/mkid.c:391
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:459
+#: src/mkid.c:468
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:528
+#: src/mkid.c:537
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", new=%d/%d"
 
-#: src/mkid.c:537
+#: src/mkid.c:546
 #, c-format
 msgid "Name=%ld, "
 msgstr "Name=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:547
 #, c-format
 msgid "Number=%ld, "
 msgstr "Zahl=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:548
 #, c-format
 msgid "String=%ld, "
 msgstr "Zeichenkette=%ld, "
 
 # ist das gemeint? ###
-#: src/mkid.c:540
+#: src/mkid.c:549
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Zeichen=%ld, "
 
-#: src/mkid.c:541
+#: src/mkid.c:550
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Kommentar=%ld\n"
 
-#: src/mkid.c:543
+#: src/mkid.c:552
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Dateien=%d, "
 
-#: src/mkid.c:544
+#: src/mkid.c:553
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Tokens=%ld, "
 
-#: src/mkid.c:545
+#: src/mkid.c:554
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:546
+#: src/mkid.c:555
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "\"Heap\"=%ld Kb, "
 
-#: src/mkid.c:548
+#: src/mkid.c:557
 #, 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:560
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "\"Freq\"=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:575
+#: src/mkid.c:584
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Sortiere \"Token\"...\n"
 
-#: src/mkid.c:581
+#: src/mkid.c:590
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Schreibe '%s'...\n"
 
-#: src/mkid.c:584
+#: src/mkid.c:593
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:652
+#: src/mkid.c:661
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:740
+#: src/mkid.c:749
 #, 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 1572344..73e5e4e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2006-07-22 00:45+0200\n"
+"POT-Creation-Date: 2006-07-22 04:46+0200\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:229
+#: libidu/idread.c:49 src/mkid.c:485 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -207,55 +207,55 @@ msgstr ""
 msgid "Lisp language:\n"
 msgstr ""
 
-#: libidu/walker.c:113
+#: libidu/walker.c:121
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
 msgstr ""
 
-#: libidu/walker.c:180
+#: libidu/walker.c:188
 #, c-format
 msgid "notice: `%s' was a %s, but is now a %s!"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "file"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "directory"
 msgstr ""
 
-#: libidu/walker.c:311
+#: libidu/walker.c:319
 #, c-format
 msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
 msgstr ""
 
-#: libidu/walker.c:405
+#: libidu/walker.c:413
 #, c-format
 msgid "notice: scan parameters changed for `%s'"
 msgstr ""
 
-#: libidu/walker.c:608
+#: libidu/walker.c:616
 #, fuzzy
 msgid "can't get working directory"
 msgstr "%s: Impossible d'obtenir le rpertoire courant."
 
-#: libidu/walker.c:665
+#: libidu/walker.c:673
 #, c-format
 msgid "can't chdir to `%s'"
 msgstr ""
 
-#: libidu/walker.c:670
+#: libidu/walker.c:678
 #, c-format
 msgid "can't chdir to `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:731
+#: libidu/walker.c:739
 #, c-format
 msgid "can't lstat `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:739
+#: libidu/walker.c:747
 #, c-format
 msgid "can't stat `%s' from `%s'"
 msgstr ""
@@ -515,102 +515,102 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:377
+#: src/mkid.c:386
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:382
+#: src/mkid.c:391
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:459
+#: src/mkid.c:468
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:528
+#: src/mkid.c:537
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", nouveau=%d/%d"
 
-#: src/mkid.c:537
+#: src/mkid.c:546
 #, c-format
 msgid "Name=%ld, "
 msgstr "Nom=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:547
 #, c-format
 msgid "Number=%ld, "
 msgstr "Numro=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:548
 #, c-format
 msgid "String=%ld, "
 msgstr "Chane=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:549
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Litral=%ld, "
 
-#: src/mkid.c:541
+#: src/mkid.c:550
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaire=%ld\n"
 
-#: src/mkid.c:543
+#: src/mkid.c:552
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Fichiers=%d, "
 
-#: src/mkid.c:544
+#: src/mkid.c:553
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Units lexicales=%ld, "
 
-#: src/mkid.c:545
+#: src/mkid.c:554
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Octets=%ld Kb, "
 
-#: src/mkid.c:546
+#: src/mkid.c:555
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "tas=%ld Kb, "
 
-#: src/mkid.c:548
+#: src/mkid.c:557
 #, 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:560
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:575
+#: src/mkid.c:584
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Tri units lexicales...\n"
 
-#: src/mkid.c:581
+#: src/mkid.c:590
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "criture `%s'...\n"
 
-#: src/mkid.c:584
+#: src/mkid.c:593
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:652
+#: src/mkid.c:661
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:740
+#: src/mkid.c:749
 #, 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 f9843e0..2977e6d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.2\n"
 "Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2006-07-22 00:45+0200\n"
+"POT-Creation-Date: 2006-07-22 04:46+0200\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:229
+#: libidu/idread.c:49 src/mkid.c:485 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr "kan `%s' niet openen"
@@ -235,56 +235,56 @@ msgstr ""
 msgid "Lisp language:\n"
 msgstr ""
 
-#: libidu/walker.c:113
+#: libidu/walker.c:121
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
 msgstr "kan map `%s' niet lezen (`.' van `%s')"
 
-#: libidu/walker.c:180
+#: libidu/walker.c:188
 #, c-format
 msgid "notice: `%s' was a %s, but is now a %s!"
 msgstr "opmerking: `%s' was een %s, maar is nu een %s!"
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "file"
 msgstr "bestand"
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "directory"
 msgstr "map"
 
-#: libidu/walker.c:311
+#: libidu/walker.c:319
 #, c-format
 msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
 msgstr ""
 "waarschuwing: `%s' en `%s' zijn het zelfde bestand, maar leveren "
 "verschillende resultaten op!"
 
-#: libidu/walker.c:405
+#: libidu/walker.c:413
 #, c-format
 msgid "notice: scan parameters changed for `%s'"
 msgstr "opmerking: leesparameters veranderd voor `%s'"
 
-#: libidu/walker.c:608
+#: libidu/walker.c:616
 msgid "can't get working directory"
 msgstr "kan huidige map niet verkrijgen"
 
-#: libidu/walker.c:665
+#: libidu/walker.c:673
 #, c-format
 msgid "can't chdir to `%s'"
 msgstr "kan niet naar map `%s' gaan"
 
-#: libidu/walker.c:670
+#: libidu/walker.c:678
 #, c-format
 msgid "can't chdir to `%s' from `%s'"
 msgstr "kan niet van map `%s' naar `%s' gaan"
 
-#: libidu/walker.c:731
+#: libidu/walker.c:739
 #, c-format
 msgid "can't lstat `%s' from `%s'"
 msgstr "kan de status van de link `%s' niet opvragen vanuit `%s'"
 
-#: libidu/walker.c:739
+#: libidu/walker.c:747
 #, c-format
 msgid "can't stat `%s' from `%s'"
 msgstr "kan de status van `%s' niet opvragen vanuit `%s'"
@@ -622,102 +622,102 @@ msgstr ""
 "\n"
 "The following arguments apply to the language-specific scanners:\n"
 
-#: src/mkid.c:377
+#: src/mkid.c:386
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr "kan `%s' niet aanmaken in `%s'"
 
-#: src/mkid.c:382
+#: src/mkid.c:391
 #, c-format
 msgid "can't modify `%s'"
 msgstr "kan `%s' niet veranderen"
 
-#: src/mkid.c:459
+#: src/mkid.c:468
 #, c-format
 msgid "can't stat `%s'"
 msgstr "kan de status van `%s' niet opvragen"
 
-#: src/mkid.c:528
+#: src/mkid.c:537
 #, c-format
 msgid "  new = %d/%d"
 msgstr "  nieuw = %d/%d"
 
-#: src/mkid.c:537
+#: src/mkid.c:546
 #, c-format
 msgid "Name=%ld, "
 msgstr "Naam=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:547
 #, c-format
 msgid "Number=%ld, "
 msgstr "Nummer = %ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:548
 #, c-format
 msgid "String=%ld, "
 msgstr "Letterreeks=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:549
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Letterlijk=%ld, "
 
-#: src/mkid.c:541
+#: src/mkid.c:550
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaar=%ld\n"
 
-#: src/mkid.c:543
+#: src/mkid.c:552
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Bestanden=%d, "
 
-#: src/mkid.c:544
+#: src/mkid.c:553
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Eenheden=%ld, "
 
-#: src/mkid.c:545
+#: src/mkid.c:554
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:546
+#: src/mkid.c:555
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "Data=%ld+%ld Kb, "
 
-#: src/mkid.c:548
+#: src/mkid.c:557
 #, 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:560
 #, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr ", Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:575
+#: src/mkid.c:584
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Eenheden sorteren...\n"
 
-#: src/mkid.c:581
+#: src/mkid.c:590
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "`%s' schrijven...\n"
 
-#: src/mkid.c:584
+#: src/mkid.c:593
 #, c-format
 msgid "can't create `%s'"
 msgstr "kan `%s' niet aanmaken"
 
-#: src/mkid.c:652
+#: src/mkid.c:661
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:740
+#: src/mkid.c:749
 #, 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 0573029..49ff5fe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2006-07-22 00:45+0200\n"
+"POT-Creation-Date: 2006-07-22 04:46+0200\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:229
+#: libidu/idread.c:49 src/mkid.c:485 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -196,55 +196,55 @@ msgstr ""
 msgid "Lisp language:\n"
 msgstr ""
 
-#: libidu/walker.c:113
+#: libidu/walker.c:121
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
 msgstr ""
 
-#: libidu/walker.c:180
+#: libidu/walker.c:188
 #, c-format
 msgid "notice: `%s' was a %s, but is now a %s!"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "file"
 msgstr ""
 
-#: libidu/walker.c:181 libidu/walker.c:182
+#: libidu/walker.c:189 libidu/walker.c:190
 msgid "directory"
 msgstr ""
 
-#: libidu/walker.c:311
+#: libidu/walker.c:319
 #, c-format
 msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
 msgstr ""
 
-#: libidu/walker.c:405
+#: libidu/walker.c:413
 #, c-format
 msgid "notice: scan parameters changed for `%s'"
 msgstr ""
 
-#: libidu/walker.c:608
+#: libidu/walker.c:616
 #, fuzzy
 msgid "can't get working directory"
 msgstr "%s: nie mogę pobrać nazwy bieżącego katalogu.\n"
 
-#: libidu/walker.c:665
+#: libidu/walker.c:673
 #, c-format
 msgid "can't chdir to `%s'"
 msgstr ""
 
-#: libidu/walker.c:670
+#: libidu/walker.c:678
 #, c-format
 msgid "can't chdir to `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:731
+#: libidu/walker.c:739
 #, c-format
 msgid "can't lstat `%s' from `%s'"
 msgstr ""
 
-#: libidu/walker.c:739
+#: libidu/walker.c:747
 #, c-format
 msgid "can't stat `%s' from `%s'"
 msgstr ""
@@ -504,102 +504,102 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:377
+#: src/mkid.c:386
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:382
+#: src/mkid.c:391
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:459
+#: src/mkid.c:468
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:528
+#: src/mkid.c:537
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", nowy=%d/%d"
 
-#: src/mkid.c:537
+#: src/mkid.c:546
 #, c-format
 msgid "Name=%ld, "
 msgstr "Nazwa=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:547
 #, c-format
 msgid "Number=%ld, "
 msgstr "Numer=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:548
 #, c-format
 msgid "String=%ld, "
 msgstr "Łańcuch=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:549
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Literał=%ld, "
 
-#: src/mkid.c:541
+#: src/mkid.c:550
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Komentarz=%ld\n"
 
-#: src/mkid.c:543
+#: src/mkid.c:552
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Pliki=%d, "
 
-#: src/mkid.c:544
+#: src/mkid.c:553
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Znaczniki=%ld, "
 
-#: src/mkid.c:545
+#: src/mkid.c:554
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bajty=%ld Kb, "
 
-#: src/mkid.c:546
+#: src/mkid.c:555
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "Sterta=%ld Kb, "
 
-#: src/mkid.c:548
+#: src/mkid.c:557
 #, 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:560
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Częstość=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:575
+#: src/mkid.c:584
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Sortowanie znaczników...\n"
 
-#: src/mkid.c:581
+#: src/mkid.c:590
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Zapisuję `%s'...\n"
 
-#: src/mkid.c:584
+#: src/mkid.c:593
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:652
+#: src/mkid.c:661
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:740
+#: src/mkid.c:749
 #, fuzzy, c-format
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "poziom %d: %ld == %ld\n"
diff --git a/src/lid.c b/src/lid.c
index 517949a..a163686 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -604,7 +604,7 @@ get_editor_argv(char *fullstring, int* argc)
   *argc = 1;
   mark = fullstring;
 
-  while (mark = strchr(mark, ' ')) {
+  while ((mark = strchr(mark, ' '))) {
     (*argc)++;
     mark += strspn(mark, " ");
   }
diff --git a/src/mkid.c b/src/mkid.c
index 8a64530..a304216 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
-#include <sys/stat.h>
+#include "lstat.h"
 #include <stddef.h>
 #include <unistd.h>
 #include <pathmax.h>