Commit25ee7f5

Sergey Petrov

committed

pg_puts added

1 parentb7e2050 commit25ee7f5Copy full SHA for 25ee7f5

File tree

+33

-5

lines changed

+33

-5

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -441,13 +441,13 @@ pipe_read_line(char cmd, char line, int maxsize)`
`441`	`441`	`/* Let's see if we can read */`
`442`	`442`	`if (WaitForSingleObject(childstdoutrddup,10000)!=WAIT_OBJECT_0)`
`443`	`443`	`break;/* Timeout, but perhaps we got a line already */`
`444`		`-`
	`444`	`+`
`445`	`445`	`if (!ReadFile(childstdoutrddup,lineptr,maxsize- (lineptr-line),`
`446`		`-&bytesread,NULL))`
	`446`	`+&bytesread,NULL))`
`447`	`447`	`break;/* Error, but perhaps we got a line already */`
`448`		`-`
	`448`	`+`
`449`	`449`	`lineptr+=strlen(lineptr);`
`450`		`-`
	`450`	`+`
`451`	`451`	`if (!bytesread)`
`452`	`452`	`break;/* EOF */`
`453`	`453`
`@@ -578,6 +578,11 @@ set_pglocale_pgservice(const char argv0, const char app)`
`578`	`578`	`bindtextdomain(app,path);`
`579`	`579`	`textdomain(app);`
`580`	`580`
	`581`	`+#if defined(HAVE_WIN32_LIBEDIT)&& defined(ENABLE_NLS)`
	`582`	`+bind_textdomain_codeset(app,"UTF-8");`
	`583`	`+bind_textdomain_codeset(PG_TEXTDOMAIN("libpq"),"UTF-8");`
	`584`	`+#endif`
	`585`	`+`
`581`	`586`	`if (getenv("PGLOCALEDIR")==NULL)`
`582`	`587`	`{`
`583`	`588`	`/* set for libpq to use */`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ extern intpg_printf(const char *fmt,...) pg_attribute_printf(1, 2);`
`164`	`164`
`165`	`165`	`#ifdefHAVE_WIN32_LIBEDIT`
`166`	`166`	`externintpg_fputs(constchars,FILEstream);`
	`167`	`+externintpg_puts(constchar*s);`
`167`	`168`	`#endif`
`168`	`169`	`/*`
`169`	`170`	`*The GCC-specific code below prevents the pg_attribute_printf above from`
`@@ -188,6 +189,7 @@ extern int pg_fputs(const char s, FILE stream);`
`188`	`189`	`#ifdefHAVE_WIN32_LIBEDIT`
`189`	`190`	`/* Catch fputs as well so we can use WriteConsole for table output */`
`190`	`191`	`#definefputs(s,f)pg_fputs(s,f)`
	`192`	`+#defineputs(s)pg_puts(s)`
`191`	`193`	`#endif`
`192`	`194`	`#endif/* USE_REPL_SNPRINTF */`
`193`	`195`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*`
	`1`	`+/*`
`2`	`2`	`* Copyright (c) 1983, 1995, 1996 Eric P. Allman`
`3`	`3`	`* Copyright (c) 1988, 1993`
`4`	`4`	`*The Regents of the University of California. All rights reserved.`
`@@ -292,6 +292,7 @@ flushbuffer(PrintfTarget *target)`
`292`	`292`	`#endif`
`293`	`293`	`}`
`294`	`294`	`target->bufptr=target->bufstart;`
	`295`	`+fflush(target->stream);`
`295`	`296`	`}`
`296`	`297`
`297`	`298`
`@@ -1182,4 +1183,22 @@ int pg_fputs(const char s, FILE stream)`
`1182`	`1183`	`flushbuffer(&target);`
`1183`	`1184`	`returntarget.failed ?-1 :target.nchars;`
`1184`	`1185`	`}`
	`1186`	`+`
	`1187`	`+/* replacement to puts function which uses flushBuffer */`
	`1188`	`+intpg_puts(constchar*tmps)`
	`1189`	`+{`
	`1190`	`+char*s=NULL;`
	`1191`	`+`
	`1192`	`+s= (char*)malloc(strlen(tmps)+1);`
	`1193`	`+sprintf(s,"%s\n",tmps);`
	`1194`	`+PrintfTargettarget;`
	`1195`	`+target.bufstart=s;`
	`1196`	`+target.nchars=0;`
	`1197`	`+target.bufptr=s+strlen(s);`
	`1198`	`+target.bufend=NULL;`
	`1199`	`+target.failed= false;`
	`1200`	`+target.stream=stdout;`
	`1201`	`+flushbuffer(&target);`
	`1202`	`+returntarget.failed ?-1 :target.nchars;`
	`1203`	`+}`
`1185`	`1204`	`#endif`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`168`	`168`	`print O"#define PG_MAJORVERSION\"$self->{majorver}\"\n";`
`169`	`169`	`print O"#define LOCALEDIR\"/share/locale\"\n"`
`170`	`170`	`if ($self->{options}->{nls});`
	`171`	`+print O"#define LC_MESSAGES 6\n"`
	`172`	`+if ($self->{options}->{nls});`
`171`	`173`	`print O"/* defines added by config steps */\n";`
`172`	`174`	`print O"#ifndef IGNORE_CONFIGURED_SETTINGS\n";`
`173`	`175`	`print O"#define USE_ASSERT_CHECKING 1\n"`

Comments

(0)