diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/bltin/printf.c | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 911d31e..46626b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * Propagate EXP_QPAT in subevalvar. +2012-12-03 Harald van Dijk <harald@gigawatt.nl> + + * Use PRIdMAX instead of %j in printf. + 2012-07-20 Kimo Rosenbaum <kimor79@yahoo.com> * Fix typo for wait in manual. diff --git a/src/bltin/printf.c b/src/bltin/printf.c index 893295c..5f9e81c 100644 --- a/src/bltin/printf.c +++ b/src/bltin/printf.c @@ -316,16 +316,24 @@ out: static char * mklong(const char *str, const char *ch) { + /* + * Replace a string like "%92.3u" with "%92.3"PRIuMAX. + * + * Although C99 does not guarantee it, we assume PRIiMAX, + * PRIoMAX, PRIuMAX, PRIxMAX, and PRIXMAX are all the same + * as PRIdMAX with the final 'd' replaced by the corresponding + * character. + */ + char *copy; size_t len; - len = ch - str + 3; + len = ch - str + sizeof(PRIdMAX); STARTSTACKSTR(copy); copy = makestrspace(len, copy); - memcpy(copy, str, len - 3); - copy[len - 3] = 'j'; + memcpy(copy, str, len - sizeof(PRIdMAX)); + memcpy(copy + len - sizeof(PRIdMAX), PRIdMAX, sizeof(PRIdMAX)); copy[len - 2] = *ch; - copy[len - 1] = '\0'; return (copy); } |