1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From f855b534ca2c34c3691a0c89d1be482a33a3610c Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 4 Jun 2020 21:36:11 -0700
Subject: [PATCH] pax: Fix some incorrect format specifiers
---
bin/pax/cpio.c | 2 +-
bin/pax/gen_subs.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 3832b1e87aa..769a9dfb990 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -214,7 +214,7 @@ rd_ln_nm(ARCHD *arcn)
*/
if ((arcn->sb.st_size <= 0) ||
(arcn->sb.st_size >= (off_t)sizeof(arcn->ln_name))) {
- paxwarn(1, "Cpio link name length is invalid: %lld",
+ paxwarn(1, "Cpio link name length is invalid: %zu",
arcn->sb.st_size);
return(-1);
}
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 405dd2c24ed..7eb82007e3b 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -109,7 +109,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
if (strftime(f_date, sizeof(f_date), TIMEFMT(sbp->st_mtime, now),
localtime(&(sbp->st_mtime))) == 0)
f_date[0] = '\0';
- (void)fprintf(fp, "%s%2u %-*.*s %-*.*s ", f_mode, sbp->st_nlink,
+ (void)fprintf(fp, "%s%2u %-*.*s %-*.*s ", f_mode, (unsigned)sbp->st_nlink,
NAME_WIDTH, UT_NAMESIZE, user_from_uid(sbp->st_uid, 0),
NAME_WIDTH, UT_NAMESIZE, group_from_gid(sbp->st_gid, 0));
@@ -121,7 +121,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
(unsigned long)MAJOR(sbp->st_rdev),
(unsigned long)MINOR(sbp->st_rdev));
else {
- (void)fprintf(fp, "%9llu ", sbp->st_size);
+ (void)fprintf(fp, "%9zu ", sbp->st_size);
}
/*
--
2.27.0
|
