From c370a7e62f651006b9b1816eada98c8a23961431 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 28 Aug 2007 09:11:36 +0200 Subject: Reflect renaming: mreadlink-with-size -> areadlink-with-size. * bootstrap.conf: Update module name. * src/copy.c (copy_internal): Update header and function names. * src/ls.c (get_link_name): Likewise. * src/readlink.c (main): Likewise. * src/stat.c (print_stat): Likewise. --- ChangeLog | 7 +++++++ bootstrap.conf | 2 +- src/copy.c | 6 +++--- src/ls.c | 4 ++-- src/readlink.c | 4 ++-- src/stat.c | 4 ++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79c7808c9..62bcc74a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-08-28 Jim Meyering + Reflect renaming: mreadlink-with-size -> areadlink-with-size. + * bootstrap.conf: Update module name. + * src/copy.c (copy_internal): Update header and function names. + * src/ls.c (get_link_name): Likewise. + * src/readlink.c (main): Likewise. + * src/stat.c (print_stat): Likewise. + Add file system type names and magic numbers from "man 2 statfs". * src/stat.c (human_fstype): Also handle BEFS, BFS, BINFMT_MISC, FUSECTL, HUGETLBFS, NFSD and OPENPROM. diff --git a/bootstrap.conf b/bootstrap.conf index 3fe04972c..93bada9d4 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -62,7 +62,7 @@ gnulib_modules=" memrchr mgetgroups mkancesdirs mkdir mkdir-p mkstemp mktime modechange mountlist mpsort obstack pathmax perl physmem posixtm posixver putenv - quote quotearg raise readlink mreadlink-with-size readtokens + quote quotearg raise readlink areadlink-with-size readtokens readtokens0 readutmp realloc regex rename-dest-slash rmdir rmdir-errno root-dev-ino diff --git a/src/copy.c b/src/copy.c index c1d8519d5..92588bf14 100644 --- a/src/copy.c +++ b/src/copy.c @@ -53,7 +53,7 @@ #include "utimecmp.h" #include "utimens.h" #include "write-any-file.h" -#include "mreadlink.h" +#include "areadlink.h" #include "yesno.h" #ifndef HAVE_FCHOWN @@ -1815,7 +1815,7 @@ copy_internal (char const *src_name, char const *dst_name, } else if (S_ISLNK (src_mode)) { - char *src_link_val = mreadlink_with_size (src_name, src_sb.st_size); + char *src_link_val = areadlink_with_size (src_name, src_sb.st_size); if (src_link_val == NULL) { error (0, errno, _("cannot read symbolic link %s"), quote (src_name)); @@ -1836,7 +1836,7 @@ 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 = - mreadlink_with_size (dst_name, dst_sb.st_size); + areadlink_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 84090618d..5eacbad0d 100644 --- a/src/ls.c +++ b/src/ls.c @@ -104,7 +104,7 @@ #include "strftime.h" #include "strverscmp.h" #include "xstrtol.h" -#include "mreadlink.h" +#include "areadlink.h" #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ : (ls_mode == LS_MULTI_COL \ @@ -2840,7 +2840,7 @@ is_directory (const struct fileinfo *f) static void get_link_name (char const *filename, struct fileinfo *f, bool command_line_arg) { - f->linkname = mreadlink_with_size (filename, f->stat.st_size); + f->linkname = areadlink_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 e7d05124e..859e2a30c 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -24,7 +24,7 @@ #include "system.h" #include "canonicalize.h" #include "error.h" -#include "mreadlink.h" +#include "areadlink.h" #include "quote.h" /* The official name of this program (e.g., no `g' prefix). */ @@ -158,7 +158,7 @@ main (int argc, char **argv) value = (can_mode != -1 ? canonicalize_filename_mode (fname, can_mode) - : mreadlink_with_size (fname, 63)); + : areadlink_with_size (fname, 63)); if (value) { printf ("%s%s", value, (no_newline ? "" : "\n")); diff --git a/src/stat.c b/src/stat.c index 183f794ea..912ef87c5 100644 --- a/src/stat.c +++ b/src/stat.c @@ -67,7 +67,7 @@ #include "quotearg.h" #include "stat-time.h" #include "strftime.h" -#include "mreadlink.h" +#include "areadlink.h" #define alignof(type) offsetof (struct { char c; type x; }, x) @@ -579,7 +579,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 = mreadlink_with_size (filename, statbuf->st_size); + char *linkname = areadlink_with_size (filename, statbuf->st_size); if (linkname == NULL) { error (0, errno, _("cannot read symbolic link %s"), -- cgit v1.2.3-54-g00ecf