From: Bruno Haible <bruno@clisp.org>
Date: Thu, 1 Mar 2007 00:39:40 +0000 (+0000)
Subject: Update for xreadlink -> xreadlink-with-size rename.
X-Git-Tag: cvs-readonly~954
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=304e27459f8078ff1ed65350207f66eab8a6b949;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index 2e3930a3f6..2382fdee21 100644
--- 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 8c48b42058..48e4a239a3 100644
--- 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 4275f32c6f..4d7174a317 100644
--- 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