From: Brian Koropoff <bkoropoff@gmail.com>
To: dash@vger.kernel.org
Subject: [PATCH 1/2] Fix additional use of 'j' printf length modifier.
Date: Fri, 15 Apr 2011 19:34:39 -0700 [thread overview]
Message-ID: <1302921279.2620.6.camel@gemini> (raw)
In-Reply-To: <1302921010.2620.3.camel@gemini>
The printf builtin modifies the user's format strings
by prefixing integer conversion specifications with the
'j' (intmax_t) length modifier. Since this is not portable,
instead prefix them with the length modifier extracted from
the PRIdMAX constant.
Signed-off-by: Brian Koropoff <bkoropoff@gmail.com>
---
src/bltin/printf.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/bltin/printf.c b/src/bltin/printf.c
index b0c3774..4ac2ee8 100644
--- a/src/bltin/printf.c
+++ b/src/bltin/printf.c
@@ -317,15 +317,16 @@ static char *
mklong(const char *str, const char *ch)
{
char *copy;
- size_t len;
+ size_t len;
+ size_t pridmax_len = strlen(PRIdMAX);
- len = ch - str + 3;
+ len = ch - str + pridmax_len;
STARTSTACKSTR(copy);
- copy = makestrspace(len, copy);
- memcpy(copy, str, len - 3);
- copy[len - 3] = 'j';
- copy[len - 2] = *ch;
- copy[len - 1] = '\0';
+ copy = makestrspace(len + 1, copy);
+ memcpy(copy, str, len - pridmax_len);
+ memcpy(copy + len - pridmax_len, PRIdMAX, pridmax_len - 1);
+ copy[len - 1] = *ch;
+ copy[len] = '\0';
return (copy);
}
--
1.7.1
next prev parent reply other threads:[~2011-04-16 2:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-16 2:30 Fix for Solaris patch and new HP-UX patch Brian Koropoff
2011-04-16 2:34 ` Brian Koropoff [this message]
2011-04-16 4:54 ` [PATCH 1/2] Fix additional use of 'j' printf length modifier Jonathan Nieder
2011-04-16 18:25 ` Brian Koropoff
2011-07-07 6:41 ` Herbert Xu
2011-07-07 7:12 ` Jonathan Nieder
2011-07-07 7:32 ` Brian Koropoff
2011-07-07 7:44 ` Herbert Xu
2011-04-16 2:34 ` [PATCH 2/2] Port to HP-UX Brian Koropoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302921279.2620.6.camel@gemini \
--to=bkoropoff@gmail.com \
--cc=dash@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).