[prev in list] [next in list] [prev in thread] [next in thread]
List: glibc-cvs
Subject: [glibc] Account for octal marker in %#o format
From: Andreas Schwab via Glibc-cvs <glibc-cvs () sourceware ! org>
Date: 2023-01-30 15:59:47
Message-ID: 20230130160015.4D7563858D1E () sourceware ! org
[Download RAW message or body]
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f39e44a8417b4186a7f15bfeac5d0b557e63e03
commit 2f39e44a8417b4186a7f15bfeac5d0b557e63e03
Author: Andreas Schwab <schwab@suse.de>
Date: Fri Jan 27 23:25:59 2023 +0100
Account for octal marker in %#o format
Diff:
---
stdio-common/Makefile | 1 +
stdio-common/tst-printf-oct.c | 49 +++++++++++++++++++++++++++++++++++++
stdio-common/vfprintf-process-arg.c | 6 +++++
3 files changed, 56 insertions(+)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 6e9d104524..da3034d847 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -206,6 +206,7 @@ tests := \
tst-printf-bz25691 \
tst-printf-fp-free \
tst-printf-fp-leak \
+ tst-printf-oct \
tst-printf-round \
tst-printfsz \
tst-put-error \
diff --git a/stdio-common/tst-printf-oct.c b/stdio-common/tst-printf-oct.c
new file mode 100644
index 0000000000..6588bb4585
--- /dev/null
+++ b/stdio-common/tst-printf-oct.c
@@ -0,0 +1,49 @@
+/* Test printf width padding with octal format
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <support/check.h>
+#include <support/support.h>
+
+static int
+do_test (void)
+{
+ char buf[80];
+
+ sprintf (buf, "%-7o", 123);
+ TEST_COMPARE_STRING (buf, "173 ");
+
+ sprintf (buf, "%#-7o", 123);
+ TEST_COMPARE_STRING (buf, "0173 ");
+
+ sprintf (buf, "%7o", 123);
+ TEST_COMPARE_STRING (buf, " 173");
+
+ sprintf (buf, "%#7o", 123);
+ TEST_COMPARE_STRING (buf, " 0173");
+
+ sprintf (buf, "%07o", 123);
+ TEST_COMPARE_STRING (buf, "0000173");
+
+ sprintf (buf, "%#07o", 123);
+ TEST_COMPARE_STRING (buf, "0000173");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/stdio-common/vfprintf-process-arg.c b/stdio-common/vfprintf-process-arg.c
index 2c651946df..24c9125f9f 100644
--- a/stdio-common/vfprintf-process-arg.c
+++ b/stdio-common/vfprintf-process-arg.c
@@ -196,6 +196,9 @@ LABEL (unsigned_number): /* Unsigned number of base BASE. */
/* Account for 0X, 0x, 0B or 0b hex or binary marker. */
width -= 2;
+ if (octal_marker)
+ --width;
+
if (is_negative || showsign || space)
--width;
@@ -257,6 +260,9 @@ LABEL (unsigned_number): /* Unsigned number of base BASE. */
width -= 2;
}
+ if (octal_marker)
+ --width;
+
width -= workend - string + prec;
Xprintf_buffer_pad (buf, L_('0'), prec);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic