.

2 files changed, 56 insertions, 50 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 78bd2126c..a63967bda 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-06  Jim Meyering  <jim@meyering.net>
+
+	* canonicalize.c: Include "stat-macros.h".
+	(canonicalize_filename_mode): Remove #ifdef S_ISLNK, now that
+	S_ISLNK is guaranteed to be defined (via stat-macros.h).
+
 2004-04-03  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* Makefile.am (libfetish_a_SOURCES): Add canonicalize.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3e91c90c1..633c2118e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -42,21 +42,20 @@ host_triplet = @host@
 subdir = lib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	ChangeLog TODO __fpending.c alloca.c asnprintf.c asprintf.c \
-	atexit.c calloc.c canonicalize.c chown.c dirfd.c dup2.c \
-	error.c error.h euidaccess.c fchdir-stub.c fchown-stub.c \
-	fileblocks.c fnmatch.c free.c fsusage.c ftruncate.c getcwd.c \
-	getdate.c getgroups.c gethostname.c getline.c getloadavg.c \
-	getndelim2.c getpass.c gettimeofday.c getusershell.c \
-	group-member.c lchown.c lstat.c malloc.c memchr.c memcmp.c \
-	memcpy.c memmove.c memrchr.c memset.c mkdir.c mkstemp.c \
-	mktime.c mountlist.c nanosleep.c obstack.c obstack.h \
-	printf-args.c printf-parse.c putenv.c raise.c readlink.c \
-	readutmp.c realloc.c regex.c rename.c rmdir.c rpmatch.c \
-	sig2str.c stat.c stpcpy.c strcasecmp.c strcspn.c strdup.c \
-	strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c strtod.c \
-	strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \
-	strtoumax.c strverscmp.c tempname.c utime.c vasnprintf.c \
-	vasprintf.c
+	atexit.c calloc.c chown.c dirfd.c dup2.c error.c error.h \
+	euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c \
+	fnmatch.c free.c fsusage.c ftruncate.c getcwd.c getdate.c \
+	getgroups.c gethostname.c getline.c getloadavg.c getndelim2.c \
+	getpass.c gettimeofday.c getusershell.c group-member.c \
+	lchown.c lstat.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \
+	memrchr.c memset.c mkdir.c mkstemp.c mktime.c mountlist.c \
+	nanosleep.c obstack.c obstack.h printf-args.c printf-parse.c \
+	putenv.c raise.c readlink.c readutmp.c realloc.c regex.c \
+	rename.c rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c \
+	strcasecmp.c strcspn.c strdup.c strncasecmp.c strndup.c \
+	strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
+	strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
+	tempname.c utime.c vasnprintf.c vasprintf.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
@@ -171,30 +170,31 @@ am_libfetish_a_OBJECTS = acl.$(OBJEXT) getdate.$(OBJEXT) \
 	getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \
 	hash-pjw.$(OBJEXT) addext.$(OBJEXT) allocsa.$(OBJEXT) \
 	argmatch.$(OBJEXT) backupfile.$(OBJEXT) basename.$(OBJEXT) \
-	c-strtod.$(OBJEXT) canon-host.$(OBJEXT) cloexec.$(OBJEXT) \
-	closeout.$(OBJEXT) cycle-check.$(OBJEXT) diacrit.$(OBJEXT) \
-	dirname.$(OBJEXT) dup-safer.$(OBJEXT) exclude.$(OBJEXT) \
-	exitfail.$(OBJEXT) filemode.$(OBJEXT) file-type.$(OBJEXT) \
-	fopen-safer.$(OBJEXT) fts.$(OBJEXT) full-read.$(OBJEXT) \
-	full-write.$(OBJEXT) gettime.$(OBJEXT) getugroups.$(OBJEXT) \
-	hard-locale.$(OBJEXT) human.$(OBJEXT) idcache.$(OBJEXT) \
-	isdir.$(OBJEXT) imaxtostr.$(OBJEXT) linebuffer.$(OBJEXT) \
-	localcharset.$(OBJEXT) long-options.$(OBJEXT) \
-	makepath.$(OBJEXT) mbswidth.$(OBJEXT) md5.$(OBJEXT) \
-	memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) modechange.$(OBJEXT) \
-	offtostr.$(OBJEXT) path-concat.$(OBJEXT) physmem.$(OBJEXT) \
-	quote.$(OBJEXT) quotearg.$(OBJEXT) readtokens0.$(OBJEXT) \
-	readtokens.$(OBJEXT) root-dev-ino.$(OBJEXT) \
-	safe-read.$(OBJEXT) safe-write.$(OBJEXT) same.$(OBJEXT) \
-	save-cwd.$(OBJEXT) savedir.$(OBJEXT) settime.$(OBJEXT) \
-	sha1.$(OBJEXT) stripslash.$(OBJEXT) time_r.$(OBJEXT) \
-	umaxtostr.$(OBJEXT) unicodeio.$(OBJEXT) userspec.$(OBJEXT) \
-	utimecmp.$(OBJEXT) utimens.$(OBJEXT) version-etc.$(OBJEXT) \
-	xfts.$(OBJEXT) xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) \
-	xmalloc.$(OBJEXT) xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) \
-	xreadlink.$(OBJEXT) xstrdup.$(OBJEXT) xstrndup.$(OBJEXT) \
-	xstrtod.$(OBJEXT) xstrtoimax.$(OBJEXT) xstrtol.$(OBJEXT) \
-	xstrtoul.$(OBJEXT) xstrtoumax.$(OBJEXT) yesno.$(OBJEXT)
+	c-strtod.$(OBJEXT) canon-host.$(OBJEXT) canonicalize.$(OBJEXT) \
+	cloexec.$(OBJEXT) closeout.$(OBJEXT) cycle-check.$(OBJEXT) \
+	diacrit.$(OBJEXT) dirname.$(OBJEXT) dup-safer.$(OBJEXT) \
+	exclude.$(OBJEXT) exitfail.$(OBJEXT) filemode.$(OBJEXT) \
+	file-type.$(OBJEXT) fopen-safer.$(OBJEXT) fts.$(OBJEXT) \
+	full-read.$(OBJEXT) full-write.$(OBJEXT) gettime.$(OBJEXT) \
+	getugroups.$(OBJEXT) hard-locale.$(OBJEXT) human.$(OBJEXT) \
+	idcache.$(OBJEXT) isdir.$(OBJEXT) imaxtostr.$(OBJEXT) \
+	linebuffer.$(OBJEXT) localcharset.$(OBJEXT) \
+	long-options.$(OBJEXT) makepath.$(OBJEXT) mbswidth.$(OBJEXT) \
+	md5.$(OBJEXT) memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) \
+	modechange.$(OBJEXT) offtostr.$(OBJEXT) path-concat.$(OBJEXT) \
+	physmem.$(OBJEXT) quote.$(OBJEXT) quotearg.$(OBJEXT) \
+	readtokens0.$(OBJEXT) readtokens.$(OBJEXT) \
+	root-dev-ino.$(OBJEXT) safe-read.$(OBJEXT) \
+	safe-write.$(OBJEXT) same.$(OBJEXT) save-cwd.$(OBJEXT) \
+	savedir.$(OBJEXT) settime.$(OBJEXT) sha1.$(OBJEXT) \
+	stripslash.$(OBJEXT) time_r.$(OBJEXT) umaxtostr.$(OBJEXT) \
+	unicodeio.$(OBJEXT) userspec.$(OBJEXT) utimecmp.$(OBJEXT) \
+	utimens.$(OBJEXT) version-etc.$(OBJEXT) xfts.$(OBJEXT) \
+	xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) xmalloc.$(OBJEXT) \
+	xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) xreadlink.$(OBJEXT) \
+	xstrdup.$(OBJEXT) xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) \
+	xstrtoimax.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \
+	xstrtoumax.$(OBJEXT) yesno.$(OBJEXT)
 libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -336,16 +336,16 @@ libfetish_a_SOURCES = acl.h acl.c getdate.h getdate.y posixtm.c \
 	getopt.h getopt1.c getopt_int.h hash.c hash.h hash-pjw.c \
 	hash-pjw.h __fpending.h addext.c allocsa.c allocsa.h \
 	argmatch.c argmatch.h backupfile.c backupfile.h basename.c \
-	c-strtod.c c-strtod.h canon-host.c canonicalize.h cloexec.c \
-	cloexec.h closeout.c closeout.h cycle-check.c cycle-check.h \
-	dev-ino.h diacrit.c diacrit.h dirname.c dirname.h dirfd.h \
-	dup-safer.c euidaccess.h exclude.c exclude.h exit.h exitfail.c \
-	exitfail.h filemode.c filemode.h file-type.c file-type.h \
-	fopen-safer.c fsusage.h fts.c fts_.h full-read.c full-read.h \
-	full-write.c full-write.h getline.h getpagesize.h gettime.c \
-	gettext.h getugroups.c group-member.h hard-locale.c \
-	hard-locale.h human.c human.h idcache.c isdir.c imaxtostr.c \
-	lchown.h linebuffer.c linebuffer.h localcharset.c \
+	c-strtod.c c-strtod.h canon-host.c canonicalize.c \
+	canonicalize.h cloexec.c cloexec.h closeout.c closeout.h \
+	cycle-check.c cycle-check.h dev-ino.h diacrit.c diacrit.h \
+	dirname.c dirname.h dirfd.h dup-safer.c euidaccess.h exclude.c \
+	exclude.h exit.h exitfail.c exitfail.h filemode.c filemode.h \
+	file-type.c file-type.h fopen-safer.c fsusage.h fts.c fts_.h \
+	full-read.c full-read.h full-write.c full-write.h getline.h \
+	getpagesize.h gettime.c gettext.h getugroups.c group-member.h \
+	hard-locale.c hard-locale.h human.c human.h idcache.c isdir.c \
+	imaxtostr.c lchown.h linebuffer.c linebuffer.h localcharset.c \
 	localcharset.h long-options.c long-options.h makepath.c \
 	makepath.h mbswidth.c mbswidth.h md5.c md5.h memcasecmp.c \
 	memcasecmp.h memcoll.c memcoll.h modechange.c modechange.h \
@@ -434,7 +434,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atexit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/calloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/canonicalize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirfd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@
@@ -514,6 +513,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strtod.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon-host.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cycle-check.Po@am__quote@