diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
commit | 1272be04be0cb803eec87f602edb2e3e6f111aea (patch) | |
tree | bce17f6478cdd9f3c4ec3d751135dc42786d6a56 /text-utils/pg.c | |
parent | Releasing progress-linux version 2.39.3-11~progress7.99u1. (diff) | |
download | util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.tar.xz util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.zip |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'text-utils/pg.c')
-rw-r--r-- | text-utils/pg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/text-utils/pg.c b/text-utils/pg.c index adb3840..30ed046 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -247,9 +247,9 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" +/pattern/ start at the line containing pattern\n"), out); fputs(USAGE_SEPARATOR, out); - printf(USAGE_HELP_OPTIONS(16)); + fprintf(out, USAGE_HELP_OPTIONS(16)); - printf(USAGE_MAN_TAIL("pg(1)")); + fprintf(out, USAGE_MAN_TAIL("pg(1)")); exit(0); } @@ -618,9 +618,9 @@ static void prompt(long long pageno) if ((p = strstr(pstring, "%d")) == NULL) { mesg(pstring); } else { - strcpy(b, pstring); - sprintf(b + (p - pstring), "%lld", pageno); - strcat(b, p + 2); + snprintf(b, sizeof(b), + "%.*s%lld%s", (int) (p - pstring), pstring, + pageno, p + 2); mesg(b); } } |