summaryrefslogtreecommitdiff
path: root/src/rm.c
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-11-27 00:51:00 +0000
committerPádraig Brady <P@draigBrady.com>2014-11-27 14:25:00 +0000
commit7d1fe8868e29ae2644831685df4a29638721d6ba (patch)
treedca250b9dd338b191879afd36e115eba244db1ae /src/rm.c
parenta78d85386bf4a55d7ccbd7c03c0075615b3f61d2 (diff)
downloadcoreutils-7d1fe8868e29ae2644831685df4a29638721d6ba.tar.gz
rm: fix prompted number of arguments to remove on some platforms
"zu" was output on solaris 8 for example rather than the number, since coreutils-8.22. * cfg.mk: Disallow %z, since we don't currently use the gnulib fprintf module, so any usage with it is non portable. Also our usage with error() currently works only through an ancillary dependency on the vfprintf gnulib module. * src/rm.c (main): Use %PRIuMAX rather than %zu for portability. * src/dd.c (alloc_[io]buf): Likewise for consistency. * src/od.c (main): Likewise. * src/split.c (set_suffix_length): Likewise. * NEWS: Mention the rm bug fix. Reported in http://bugs.gnu.org/19184
Diffstat (limited to 'src/rm.c')
-rw-r--r--src/rm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rm.c b/src/rm.c
index f7adf5b62..4c8ee6e7c 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -332,18 +332,18 @@ main (int argc, char **argv)
quote ("/"));
}
- size_t n_files = argc - optind;
+ uintmax_t n_files = argc - optind;
char **file = argv + optind;
if (prompt_once && (x.recursive || 3 < n_files))
{
fprintf (stderr,
(x.recursive
- ? ngettext ("%s: remove %zu argument recursively? ",
- "%s: remove %zu arguments recursively? ",
+ ? ngettext ("%s: remove %"PRIuMAX" argument recursively? ",
+ "%s: remove %"PRIuMAX" arguments recursively? ",
select_plural (n_files))
- : ngettext ("%s: remove %zu argument? ",
- "%s: remove %zu arguments? ",
+ : ngettext ("%s: remove %"PRIuMAX" argument? ",
+ "%s: remove %"PRIuMAX" arguments? ",
select_plural (n_files))),
program_name, n_files);
if (!yesno ())