Update for xreadlink -> xreadlink-with-size rename.

diff --git a/ChangeLog b/ChangeLog
index 2e3930a3f6ebf31a99507b77659e4ea1d2652628..2382fdee2160c962ae923990ff33fba6cf93c1f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
        * lib/xreadlink-with-size.c: Renamed from lib/xreadlink.c.
        (xreadlink_with_size): Renamed from xreadink.
        * lib/xreadlink.h (xreadlink_with_size): Renamed from xreadink.
+       * modules/canonicalize (Depends-on): Replace xreadlink with
+       xreadlink-with-size.
+       * lib/canonicalize.c (canonicalize_filename_mode): Update.
 
 2007-02-25  Jim Meyering  <jim@meyering.net>
 

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 8c48b4205895348631abac98e8ac0af47819e0ba..48e4a239a355ceeb667018a9c1398ce893b0224d 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -246,7 +246,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode)
                    goto error;
                }
 
-             buf = xreadlink (rname, st.st_size);
+             buf = xreadlink_with_size (rname, st.st_size);
              if (!buf)
                {
                  if (can_mode == CAN_MISSING)

diff --git a/modules/canonicalize b/modules/canonicalize
index 4275f32c6f4c29263b1c5e561fc42cb939b73432..4d7174a3170da532551919915e3b0b1213ce28c3 100644 (file)
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -13,7 +13,7 @@ filenamecat
 sys_stat
 xalloc
 xgetcwd
-xreadlink
+xreadlink-with-size
 
 configure.ac:
 AC_FUNC_CANONICALIZE_FILE_NAME