about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-06 10:00:20 +0000
committerRoland McGrath <roland@gnu.org>1995-11-06 10:00:20 +0000
commitf797c38303ce47438416a100e4d4671b56ffa528 (patch)
tree8499d4d42757865d078b4ae9c95653d11912ca32
parente380bf624861b38777a52918fceff106ce698d3a (diff)
downloadglibc-f797c38303ce47438416a100e4d4671b56ffa528.tar.gz
glibc-f797c38303ce47438416a100e4d4671b56ffa528.tar.xz
glibc-f797c38303ce47438416a100e4d4671b56ffa528.zip
* stdio-common/vfprintf.c (%c): Count the character itself towards cvs/libc-951106
	the field width in all cases.
-rw-r--r--ChangeLog3
-rw-r--r--stdio-common/vfprintf.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 43e099abb4..eaae358c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Nov  5 16:09:13 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* stdio-common/vfprintf.c (%c): Count the character itself towards
+	the field width in all cases.
+
 	* sysdeps/mach/hurd/getpriority.c (getpriority): Cast
 	__vm_deallocate arg to vm_address_t.
 
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 63a5148463..e22403be22 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -497,11 +497,9 @@ vfprintf (s, format, ap)
 
           case 'c':
             /* Character.  */
+	    --specs[cnt].info.width;/* Account for the character itself.  */
             if (!specs[cnt].info.left)
-              {
-                --specs[cnt].info.width;
-                PAD (' ');
-              }
+	      PAD (' ');
             outchar ((unsigned char) args_value[specs[cnt].data_arg].pa_char);
             if (specs[cnt].info.left)
               PAD (' ');