Use mreadlink_with_size (doesn't exit), not xreadlink_with_size.

* bootstrap.conf (gnulib_modules): Add readlink-with-size.
Remove xreadlink and xreadlink-with-size.
* src/copy.c (copy_internal): Use mreadlink_with_size,
not xreadlink_with_size.
* src/ls.c (get_link_name): Likewise.
* src/readlink.c (main): Likewise.
* src/stat.c (print_stat): Likewise.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/copy.c b/src/copy.c
index 0e9f2d791..fd0519096 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -54,7 +54,7 @@
 #include "utimecmp.h"
 #include "utimens.h"
 #include "write-any-file.h"
-#include "xreadlink.h"
+#include "mreadlink.h"
 #include "yesno.h"
 
 #ifndef HAVE_FCHOWN
@@ -1863,7 +1863,7 @@ copy_internal (char const *src_name, char const *dst_name,
     }
   else if (S_ISLNK (src_mode))
     {
-      char *src_link_val = xreadlink_with_size (src_name, src_sb.st_size);
+      char *src_link_val = mreadlink_with_size (src_name, src_sb.st_size);
       if (src_link_val == NULL)
 	{
 	  error (0, errno, _("cannot read symbolic link %s"), quote (src_name));
@@ -1884,8 +1884,8 @@ copy_internal (char const *src_name, char const *dst_name,
 		 in some cases, e.g., if the destination symlink has the
 		 wrong ownership, permissions, or time stamps.  */
 	      char *dest_link_val =
-		xreadlink_with_size (dst_name, dst_sb.st_size);
-	      if (STREQ (dest_link_val, src_link_val))
+		mreadlink_with_size (dst_name, dst_sb.st_size);
+	      if (dest_link_val && STREQ (dest_link_val, src_link_val))
 		same_link = true;
 	      free (dest_link_val);
 	    }
diff --git a/src/ls.c b/src/ls.c
index c0e332b3b..c4cca845f 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -104,7 +104,7 @@
 #include "strverscmp.h"
 #include "wcwidth.h"
 #include "xstrtol.h"
-#include "xreadlink.h"
+#include "mreadlink.h"
 
 #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \
 		      : (ls_mode == LS_MULTI_COL \
@@ -2837,7 +2837,7 @@ is_directory (const struct fileinfo *f)
 static void
 get_link_name (char const *filename, struct fileinfo *f, bool command_line_arg)
 {
-  f->linkname = xreadlink_with_size (filename, f->stat.st_size);
+  f->linkname = mreadlink_with_size (filename, f->stat.st_size);
   if (f->linkname == NULL)
     file_failure (command_line_arg, _("cannot read symbolic link %s"),
 		  filename);
diff --git a/src/readlink.c b/src/readlink.c
index 0961d235c..4a410bb00 100644
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -1,5 +1,5 @@
 /* readlink -- display value of a symbolic link.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-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
@@ -25,7 +25,7 @@
 #include "system.h"
 #include "canonicalize.h"
 #include "error.h"
-#include "xreadlink.h"
+#include "mreadlink.h"
 #include "quote.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
@@ -159,7 +159,7 @@ main (int argc, char **argv)
 
   value = (can_mode != -1
 	   ? canonicalize_filename_mode (fname, can_mode)
-	   : xreadlink (fname));
+	   : mreadlink_with_size (fname, 63));
   if (value)
     {
       printf ("%s%s", value, (no_newline ? "" : "\n"));
diff --git a/src/stat.c b/src/stat.c
index b8cbbf58f..57439a472 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -68,7 +68,7 @@
 #include "quotearg.h"
 #include "stat-time.h"
 #include "strftime.h"
-#include "xreadlink.h"
+#include "mreadlink.h"
 
 #define alignof(type) offsetof (struct { char c; type x; }, x)
 
@@ -524,7 +524,7 @@ print_stat (char *pformat, size_t prefix_len, char m,
       out_string (pformat, prefix_len, quote (filename));
       if (S_ISLNK (statbuf->st_mode))
 	{
-	  char *linkname = xreadlink_with_size (filename, statbuf->st_size);
+	  char *linkname = mreadlink_with_size (filename, statbuf->st_size);
 	  if (linkname == NULL)
 	    {
 	      error (0, errno, _("cannot read symbolic link %s"),