From b8fe19fa809ac786b7d3dbb464cb1b3f887dc69d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 May 1996 02:11:55 +0000 Subject: Wed May 22 01:48:54 1996 Ulrich Drepper * stdlib/strtol.c [!QUAD] (ULONG_MAX, LONG_MAX): Define these macros if they are not available. (WEAKNAME): New macro to declare argument as weak. Define function with __ prefix and add normal name as weak alias. * sysdeps/posix/euidaccess.c (S_IROTH, S_IWOTH, S_IXOTH): Defines these macros if not already available based on R_OK, W_OK, and X_OK. Tue May 21 18:48:46 1996 Roland McGrath * misc/sys/syslog.h (__need___va_list): Define this instead of __need_va_list before including . * Makerules (o-iterator): Use $(object-suffixes-left) instead of $(object-suffixes) to produce repetitions; this is used for other lists than just that one. [versioned]: Use $(o-iterator) properly. * sysdeps/unix/sysv/linux/Implies: Include `gnu'. * sysdeps/mach/hurd/Implies: Likewise. Sat May 18 02:57:46 1996 Ulrich Drepper * login/Makefile: New file. This directory contains functions for user administration. * Makefile (subdirs): Add login. * misc/Makefile (headers): Remove utmp.h. Now in login/utmp.h. (extra-libs, libutil-routines): Ditto. * misc/login.c, misc/login_tty.c, misc/logout.c, misc/logwtmp.c, misc/utmp.h: Moved to misc/. * login/login.c, login/login_tty.c, login/logout.c, login/logwtmp.c, login/utmp.h: Moved to here from misc/. * login/utmp.h: Split file. Definitions of data structures and constants are now in the system dependent utmpbits.h file. * login/setutent_r.c, login/setutent.c, login/endutent_r.c, login/endutent.c, login/getutent_r.c, login/getutent.c, login/getutid_r.c, login/getutid.c, login/getutline_r.c, login/getutline.c, login/pututline_r.c, login/pututline.c: New files. Routines to handle utmp-style files. * sysdeps/gnu/utmpbits.h: New file. Contains GNU/Linux specific definitions of utmp data structures and constants. * sysdeps/unix/sysv/utmpbits.h: Renamed from sysdeps/unix/sysv/utmp.h. * sysdeps/generic/utmpbits.h: New file. Generic (BSDish) version of definitions of utmp data structures and constants. Fri May 17 00:01:31 1996 Ulrich Drepper * locale/C-monetary.c: Default value for mon_decimal_point should be '.'. * stdio-common/printf.h: Remove Linux libc compatibility stuff. Add `extra' flag. Currently used in __printf_fp. * stdio-common/printf_fp.c (__guess_grouping): Renamed from `guess_grouping' and extend visibility to extern. This function is now used in `strfmon'. (__printf_fp): Recognize new bit flag in info struct. This triggers to use the grouping information and decimal point from the LC_MONETARY category instead of the LC_NUMERIC category. * stdio-common/vfprintf.c (process_arg): Correct major bug. In `complicated' loop we must not use the varargs because the args are already available in the ARGS_VALUE array. * stdlib/Makefile (headers): Add monetary.h. (routines): Add strfmon. * stdlib/monetary.h: New file. Header for strfmon function. * stdlib/strfmon.c: New file. Implement strfmon function to print monetary amounts according to current locale's rules. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: The kernel header is now (>= Linux-1.3.100) called . --- stdio-common/printf.h | 5 +-- stdio-common/printf_fp.c | 56 +++++++++++++++++++------ stdio-common/vfprintf.c | 105 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 119 insertions(+), 47 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/printf.h b/stdio-common/printf.h index dfd96bea1e..c84978cfc9 100644 --- a/stdio-common/printf.h +++ b/stdio-common/printf.h @@ -34,11 +34,7 @@ struct printf_info { int prec; /* Precision. */ int width; /* Width. */ -#ifdef THIS_IS_INCOMPATIBLE_WITH_LINUX_LIBC wchar_t spec; /* Format letter. */ -#else - char spec; /* Format letter. */ -#endif unsigned int is_long_double:1;/* L flag. */ unsigned int is_short:1; /* h flag. */ unsigned int is_long:1; /* l flag. */ @@ -47,6 +43,7 @@ struct printf_info unsigned int left:1; /* - flag. */ unsigned int showsign:1; /* + flag. */ unsigned int group:1; /* ' flag. */ + unsigned int extra:1; /* For special use. */ char pad; /* Padding character. */ }; diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 9e14b67509..9112d467c5 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -121,10 +121,10 @@ extern mp_size_t __mpn_extract_double (mp_ptr res_ptr, mp_size_t size, extern mp_size_t __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size, int *expt, int *is_neg, long double value); +extern unsigned int __guess_grouping (unsigned int intdig_max, + const char *grouping, wchar_t sepchar); -static unsigned int guess_grouping (unsigned int intdig_max, - const char *grouping, wchar_t sepchar); static char *group_number (char *buf, char *bufend, unsigned int intdig_no, const char *grouping, wchar_t thousands_sep); @@ -229,22 +229,51 @@ __printf_fp (FILE *fp, /* Figure out the decimal point character. */ - if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT), - strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0) - decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); + if (info->extra == 0) + { + if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT), + strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0) + decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); + } + else + { + if (mbtowc (&decimal, _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT), + strlen (_NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT))) <= 0) + decimal = (wchar_t) *_NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT); + } if (info->group) { - grouping = _NL_CURRENT (LC_NUMERIC, GROUPING); + if (info->extra == 0) + grouping = _NL_CURRENT (LC_NUMERIC, GROUPING); + else + grouping = _NL_CURRENT (LC_MONETARY, MON_GROUPING); + if (*grouping <= 0 || *grouping == CHAR_MAX) grouping = NULL; else { /* Figure out the thousands seperator character. */ - if (mbtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP), - strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0) - thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP); + if (info->extra == 0) + { + if (mbtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC, + THOUSANDS_SEP), + strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) + <= 0) + thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, + THOUSANDS_SEP); + } + else + { + if (mbtowc (&thousands_sep, _NL_CURRENT (LC_MONETARY, + MON_THOUSANDS_SEP), + strlen (_NL_CURRENT (LC_MONETARY, + MON_THOUSANDS_SEP))) <= 0) + thousands_sep = (wchar_t) *_NL_CURRENT (LC_MONETARY, + MON_THOUSANDS_SEP); + } + if (thousands_sep == L'\0') grouping = NULL; } @@ -726,7 +755,7 @@ __printf_fp (FILE *fp, if (grouping) /* Guess the number of groups we will make, and thus how many spaces we need for separator characters. */ - chars_needed += guess_grouping (intdig_max, grouping, thousands_sep); + chars_needed += __guess_grouping (intdig_max, grouping, thousands_sep); /* Allocate buffer for output. We need two more because while rounding it is possible that we need two more characters in front of all the @@ -933,8 +962,9 @@ __printf_fp (FILE *fp, /* Return the number of extra grouping characters that will be inserted into a number with INTDIG_MAX integer digits. */ -static unsigned int -guess_grouping (unsigned int intdig_max, const char *grouping, wchar_t sepchar) +unsigned int +__guess_grouping (unsigned int intdig_max, const char *grouping, + wchar_t sepchar) { unsigned int groups; @@ -972,7 +1002,7 @@ static char * group_number (char *buf, char *bufend, unsigned int intdig_no, const char *grouping, wchar_t thousands_sep) { - unsigned int groups = guess_grouping (intdig_no, grouping, thousands_sep); + unsigned int groups = __guess_grouping (intdig_no, grouping, thousands_sep); char *p; if (groups == 0) diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 1643f370fd..b27bc493ad 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -414,7 +414,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) { \ long long int signed_number; \ \ - signed_number = va_arg (ap, long long int); \ + if (fspec == NULL) \ + signed_number = va_arg (ap, long long int); \ + else \ + signed_number = args_value[fspec->data_arg].pa_long_long_int; \ \ is_negative = signed_number < 0; \ number.longlong = is_negative ? (- signed_number) : signed_number; \ @@ -425,10 +428,16 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) { \ long int signed_number; \ \ - if (is_long) \ - signed_number = va_arg (ap, long int); \ - else /* `short int' will be promoted to `int'. */ \ - signed_number = va_arg (ap, int); \ + if (fspec == NULL) \ + if (is_long) \ + signed_number = va_arg (ap, long int); \ + else /* `short int' will be promoted to `int'. */ \ + signed_number = va_arg (ap, int); \ + else \ + if (is_long) \ + signed_number = args_value[fspec->data_arg].pa_long_int; \ + else \ + signed_number = args_value[fspec->data_arg].pa_int; \ \ is_negative = signed_number < 0; \ number.word = is_negative ? (- signed_number) : signed_number; \ @@ -463,7 +472,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) \ if (is_longlong) \ { \ - number.longlong = va_arg (ap, unsigned long long int); \ + if (fspec == NULL) \ + number.longlong = va_arg (ap, unsigned long long int); \ + else \ + number.longlong = args_value[fspec->data_arg].pa_u_long_long_int; \ \ LABEL (longlong_number): \ if (prec < 0) \ @@ -493,12 +505,21 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) } \ else \ { \ - if (is_long) \ - number.word = va_arg (ap, unsigned long int); \ - else if (!is_short) \ - number.word = va_arg (ap, unsigned int); \ + if (fspec == NULL) \ + if (is_long) \ + number.word = va_arg (ap, unsigned long int); \ + else if (!is_short) \ + number.word = va_arg (ap, unsigned int); \ + else \ + number.word = (unsigned short int) va_arg (ap, unsigned int); \ else \ - number.word = (unsigned short int) va_arg (ap, unsigned int); \ + if (is_long) \ + number.word = args_value[fspec->data_arg].pa_u_long_int; \ + else if (!is_short) \ + number.word = args_value[fspec->data_arg].pa_u_int; \ + else \ + number.word = (unsigned short int) \ + args_value[fspec->data_arg].pa_u_short_int; \ \ LABEL (number): \ if (prec < 0) \ @@ -617,13 +638,6 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) const void *ptr; \ int function_done; \ \ - if (is_long_double) \ - the_arg.pa_long_double = va_arg (ap, long double); \ - else \ - the_arg.pa_double = va_arg (ap, double); \ - \ - ptr = (const void *) &the_arg; \ - \ if (fspec == NULL) \ { \ struct printf_info info = { prec: prec, \ @@ -637,12 +651,23 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) left: left, \ showsign: showsign, \ group: group, \ - pad: pad }; \ + pad: pad, \ + extra: 0 }; \ + \ + if (is_long_double) \ + the_arg.pa_long_double = va_arg (ap, long double); \ + else \ + the_arg.pa_double = va_arg (ap, double); \ + ptr = (const void *) &the_arg; \ \ function_done = __printf_fp (s, &info, &ptr); \ } \ else \ - function_done = __printf_fp (s, &fspec->info, &ptr); \ + { \ + ptr = (const void *) &args_value[fspec->data_arg]; \ + \ + function_done = __printf_fp (s, &fspec->info, &ptr); \ + } \ \ if (function_done < 0) \ /* Error in print handler. */ \ @@ -657,7 +682,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) --width; /* Account for the character itself. */ \ if (!left) \ PAD (' '); \ - outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \ + if (fspec == NULL) \ + outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \ + else \ + outchar ((unsigned char) args_value[fspec->data_arg].pa_char); \ if (left) \ PAD (' '); \ break; \ @@ -668,7 +696,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) \ /* The string argument could in fact be `char *' or `wchar_t *'. \ But this should not make a difference here. */ \ - string = (char *) va_arg (ap, const char *); \ + if (fspec == NULL) \ + string = (char *) va_arg (ap, const char *); \ + else \ + string = (char *) args_value[fspec->data_arg].pa_string; \ \ /* Entry point for printing other strings. */ \ LABEL (print_string): \ @@ -738,7 +769,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) /* Generic pointer. */ \ { \ const void *ptr; \ - ptr = va_arg (ap, void *); \ + if (fspec == NULL) \ + ptr = va_arg (ap, void *); \ + else \ + ptr = args_value[fspec->data_arg].pa_pointer; \ if (ptr != NULL) \ { \ /* If the pointer is not NULL, write it as a %#x spec. */ \ @@ -765,14 +799,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) \ LABEL (form_number): \ /* Answer the count of characters written. */ \ - if (is_longlong) \ - *(long long int *) va_arg (ap, void *) = done; \ - else if (is_long) \ - *(long int *) va_arg (ap, void *) = done; \ - else if (!is_short) \ - *(int *) va_arg (ap, void *) = done; \ + if (fspec == NULL) \ + if (is_longlong) \ + *(long long int *) va_arg (ap, void *) = done; \ + else if (is_long) \ + *(long int *) va_arg (ap, void *) = done; \ + else if (!is_short) \ + *(int *) va_arg (ap, void *) = done; \ + else \ + *(short int *) va_arg (ap, void *) = done; \ else \ - *(short int *) va_arg (ap, void *) = done; \ + if (is_longlong) \ + *(long long int *) args_value[fspec->data_arg].pa_pointer = done; \ + else if (is_long) \ + *(long int *) args_value[fspec->data_arg].pa_pointer = done; \ + else if (!is_short) \ + *(int *) args_value[fspec->data_arg].pa_pointer = done; \ + else \ + *(short int *) args_value[fspec->data_arg].pa_pointer = done; \ break; \ \ LABEL (form_strerror): \ @@ -827,6 +871,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) STEP0_3_TABLE; STEP4_TABLE; + union printf_arg *args_value; /* This is not used here but ... */ int is_negative; /* Flag for negative number. */ union { -- cgit 1.4.1