aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-03-13 23:27:20 +0000
committerUlrich Drepper <drepper@redhat.com>2002-03-13 23:27:20 +0000
commit75bfdfc7df6d3557358fe7f1c01e748ef6b5efc7 (patch)
tree23e021859a45a505834a176c20d2d6fede2cd3fe /stdio-common
parentbf494c7d6b9e45aa5f7bd7667423a3b13dba0da6 (diff)
downloadglibc-75bfdfc7df6d3557358fe7f1c01e748ef6b5efc7.zip
glibc-75bfdfc7df6d3557358fe7f1c01e748ef6b5efc7.tar.gz
glibc-75bfdfc7df6d3557358fe7f1c01e748ef6b5efc7.tar.bz2
Update.
2002-03-13 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (sYSMALLOc): Don't change brk if mmap failed. 2002-03-02 Andreas Schwab <schwab@suse.de> * stdio-common/vfprintf.c (process_arg): Fix decimal format with 'h' flag and positional arg. * stdio-common/tst-printf.c (rfg3): New function to test positional arguments. (main): Fix some warnings. 2002-03-13 Jakub Jelinek <jakub@redhat.com> * elf/dl-minimal.c (_itoa): Use _itoa_lower_digits_internal if SHARED. * elf/dl-reloc.c (_dl_reloc_bad_type): Likewise.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/tst-printf.c32
-rw-r--r--stdio-common/vfprintf.c4
2 files changed, 31 insertions, 5 deletions
diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c
index e991fd2..df73fe2 100644
--- a/stdio-common/tst-printf.c
+++ b/stdio-common/tst-printf.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000, 2002
+ 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
@@ -30,6 +31,7 @@
static void rfg1 (void);
static void rfg2 (void);
+static void rfg3 (void);
static void
@@ -159,7 +161,7 @@ I am ready for my first lesson today.";
printf("long octal negative:\t\"%lo\"\n", -2345L);
printf("long unsigned decimal number:\t\"%lu\"\n", -123456L);
printf("zero-padded LDN:\t\"%010ld\"\n", -123456L);
- printf("left-adjusted ZLDN:\t\"%-010ld\"\n", -123456);
+ printf("left-adjusted ZLDN:\t\"%-010ld\"\n", -123456L);
printf("space-padded LDN:\t\"%10ld\"\n", -123456L);
printf("left-adjusted SLDN:\t\"%-10ld\"\n", -123456L);
@@ -218,8 +220,9 @@ I am ready for my first lesson today.";
char buf[20];
char buf2[512];
printf ("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n",
- snprintf (buf, sizeof (buf), "%30s", "foo"), sizeof (buf), buf);
- printf ("snprintf (\"%%.999999u\", 10)\n",
+ snprintf (buf, sizeof (buf), "%30s", "foo"), (int) sizeof (buf),
+ buf);
+ printf ("snprintf (\"%%.999999u\", 10) == %d\n",
snprintf(buf2, sizeof(buf2), "%.999999u", 10));
}
@@ -269,6 +272,7 @@ I am ready for my first lesson today.";
puts ("--- Should be no further output. ---");
rfg1 ();
rfg2 ();
+ rfg3 ();
{
char bytes[7];
@@ -352,3 +356,23 @@ rfg2 (void)
if (strcmp (buf, " 021") != 0)
printf ("got: '%s', expected: '%s'\n", buf, " 021");
}
+
+static void
+rfg3 (void)
+{
+ char buf[100];
+ double g = 5.0000001;
+ unsigned long l = 1234567890;
+ double d = 321.7654321;
+ char *s = "test-string";
+ int i = 12345;
+ int h = 1234;
+
+ sprintf (buf,
+ "%1$*5$d %2$*6$hi %3$*7$lo %4$*8$f %9$*12$e %10$*13$g %11$*14$s",
+ i, h, l, d, 8, 5, 14, 14, d, g, s, 14, 3, 14);
+ if (strcmp (buf,
+ " 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string") != 0)
+ printf ("got: '%s', expected: '%s'\n", buf,
+ " 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string");
+}
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index c7c3e83..a477346 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -581,8 +581,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
else \
if (is_long_num) \
signed_number = args_value[fspec->data_arg].pa_long_int; \
- else \
+ else if (!is_short) \
signed_number = args_value[fspec->data_arg].pa_int; \
+ else \
+ signed_number = args_value[fspec->data_arg].pa_short_int; \
\
is_negative = signed_number < 0; \
number.word = is_negative ? (- signed_number) : signed_number; \