Commitbb7a3a7

committed

Use our own snprintf() only if NLS is enabled, and support %qd and %I64d.

1 parent70d4a93 commitbb7a3a7Copy full SHA for bb7a3a7

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14527,7 +14527,8 @@ fi`
`14527`	`14527`
`14528`	`14528`
`14529`	`14529`	`# Force use of our snprintf if system's doesn't do arg control`
`14530`		`-if test $pgac_need_repl_snprintf = no; then`
	`14530`	`+# This feature is used by NLS`
	`14531`	`+if test "$enable_nls" = yes -a $pgac_need_repl_snprintf = no; then`
`14531`	`14532`	`echo "$as_me:$LINENO: checking whether printf supports argument control" >&5`
`14532`	`14533`	`echo $ECHO_N "checking whether printf supports argument control... $ECHO_C" >&6`
`14533`	`14534`	`if test "${pgac_cv_printf_arg_control+set}" = set; then`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.403 2005/02/28 20:55:18 tgl Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.404 2005/03/02 14:48:22 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1067,7 +1067,8 @@ AC_MSG_ERROR([[`
`1067`	`1067`
`1068`	`1068`
`1069`	`1069`	`# Force use of our snprintf if system's doesn't do arg control`
`1070`		`-if test $pgac_need_repl_snprintf = no; then`
	`1070`	`+# This feature is used by NLS`
	`1071`	`+if test "$enable_nls" = yes -a $pgac_need_repl_snprintf = no; then`
`1071`	`1072`	`PGAC_FUNC_PRINTF_ARG_CONTROL`
`1072`	`1073`	`if test $pgac_cv_printf_arg_control != yes ; then`
`1073`	`1074`	`pgac_need_repl_snprintf=yes`

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`* causing nasty effects.`
`66`	`66`	`**************************************************************/`
`67`	`67`
`68`		`-/static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.12 2005/03/0205:22:22 momjian Exp $";/`
	`68`	`+/static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.13 2005/03/0214:48:22 momjian Exp $";/`
`69`	`69`
`70`	`70`	`intsnprintf(charstr,size_tcount,constcharfmt,...);`
`71`	`71`	`intvsnprintf(charstr,size_tcount,constcharfmt,va_listargs);`
`@@ -259,6 +259,23 @@ dopr(char buffer, const char format, va_list args, char *end)`
`259`	`259`	`else`
`260`	`260`	`longflag=1;`
`261`	`261`	`gotonextch;`
	`262`	`+/*`
	`263`	`+ *We might export this to client apps so we should`
	`264`	`+ *support 'qd' and 'I64d'(MinGW) also in case the`
	`265`	`+ *native version does.`
	`266`	`+ */`
	`267`	`+case'q':`
	`268`	`+longlongflag=1;`
	`269`	`+longflag=1;`
	`270`	`+gotonextch;`
	`271`	`+case'I':`
	`272`	`+if ((format+1)=='6'&&(format+2)=='4')`
	`273`	`+{`
	`274`	`+format+=2;`
	`275`	`+longlongflag=1;`
	`276`	`+longflag=1;`
	`277`	`+gotonextch;`
	`278`	`+}`
`262`	`279`	`case'u':`
`263`	`280`	`case'U':`
`264`	`281`	`/* fmtnum(value,base,dosign,ljust,len,zpad,&output) */`

Comments

(0)