94 lines
5.5 KiB
Plaintext
94 lines
5.5 KiB
Plaintext
$OpenBSD: patch-gcc_c-format_c,v 1.3 2004/01/31 15:23:58 espie Exp $
|
|
--- gcc/c-format.c.orig 2002-12-01 18:51:44.000000000 +0100
|
|
+++ gcc/c-format.c 2003-11-11 19:49:08.000000000 +0100
|
|
@@ -54,7 +54,7 @@ set_Wformat (setting)
|
|
|
|
/* This must be in the same order as format_types, with format_type_error
|
|
last. */
|
|
-enum format_type { printf_format_type, scanf_format_type,
|
|
+enum format_type { printf_format_type, kprintf_format_type, syslog_format_type, scanf_format_type,
|
|
strftime_format_type, strfmon_format_type,
|
|
format_type_error };
|
|
|
|
@@ -572,6 +572,14 @@ static const format_length_info printf_l
|
|
{ NULL, 0, 0, NULL, 0, 0 }
|
|
};
|
|
|
|
+static const format_length_info kprintf_length_specs[] =
|
|
+{
|
|
+ { "h", FMT_LEN_h, STD_C89, NULL, 0, 0 },
|
|
+ { "l", FMT_LEN_l, STD_C89, NULL, 0, 0 },
|
|
+ { "L", FMT_LEN_L, STD_C89, NULL, 0, 0 },
|
|
+ { NULL, 0, 0, NULL, 0, 0 }
|
|
+};
|
|
+
|
|
|
|
/* This differs from printf_length_specs only in that "Z" is not accepted. */
|
|
static const format_length_info scanf_length_specs[] =
|
|
@@ -765,6 +773,46 @@ static const format_char_info print_char
|
|
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
|
|
};
|
|
|
|
+static const format_char_info kprint_char_table[] =
|
|
+{
|
|
+ /* C89 conversion specifiers. */
|
|
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i" },
|
|
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i" },
|
|
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i" },
|
|
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "" },
|
|
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" },
|
|
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c" },
|
|
+/* Kernel bitmap formatting */
|
|
+ { "b", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "" },
|
|
+/* Kernel recursive format */
|
|
+ { ":", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "" },
|
|
+/* Kernel debugger auto-radix printing */
|
|
+ { "nrz", 0, STD_C89, { T89_I, T89_I, T89_I, T89_L, T9L_LL, TEX_LL, BADLEN, BADLEN, BADLEN }, "-wp0# +", "" },
|
|
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL }
|
|
+};
|
|
+
|
|
+static const format_char_info syslog_char_table[] =
|
|
+{
|
|
+ /* C89 conversion specifiers. */
|
|
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i" },
|
|
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i" },
|
|
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i" },
|
|
+ { "fgG", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "" },
|
|
+ { "eE", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "" },
|
|
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "" },
|
|
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" },
|
|
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c" },
|
|
+ { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM }, "", "W" },
|
|
+ /* C99 conversion specifiers. */
|
|
+ { "F", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "" },
|
|
+ { "aA", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "" },
|
|
+ /* X/Open conversion specifiers. */
|
|
+ { "C", 0, STD_EXT, { TEX_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "" },
|
|
+ { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R" },
|
|
+ { "m", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" },
|
|
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL }
|
|
+};
|
|
+
|
|
static const format_char_info scan_char_table[] =
|
|
{
|
|
/* C89 conversion specifiers. */
|
|
@@ -828,6 +876,18 @@ static const format_kind_info format_typ
|
|
'w', 0, 'p', 0, 'L',
|
|
&integer_type_node, &integer_type_node
|
|
},
|
|
+ { "kprintf", kprintf_length_specs, kprint_char_table, " +#0-'I", NULL,
|
|
+ printf_flag_specs, printf_flag_pairs,
|
|
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
|
|
+ 'w', 0, 'p', 0, 'L',
|
|
+ &integer_type_node, &integer_type_node
|
|
+ },
|
|
+ { "syslog", printf_length_specs, syslog_char_table, " +#0-'I", NULL,
|
|
+ printf_flag_specs, printf_flag_pairs,
|
|
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
|
|
+ 'w', 0, 'p', 0, 'L',
|
|
+ &integer_type_node, &integer_type_node
|
|
+ },
|
|
{ "scanf", scanf_length_specs, scan_char_table, "*'I", NULL,
|
|
scanf_flag_specs, scanf_flag_pairs,
|
|
FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
|