Commitc5672bc

committed

Fixed output without pager

1 parent4290269 commitc5672bcCopy full SHA for c5672bc

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1886,6 +1886,11 @@ printSSLInfo(void)`
`1886`	`1886`	`staticvoid`
`1887`	`1887`	`checkWin32Codepage(void)`
`1888`	`1888`	`{`
	`1889`	`+#ifdefHAVE_WIN32_LIBEDIT`
	`1890`	`+if (isatty(fileno(stdout)))`
	`1891`	`+printf(_("WARNING: Unicode mode enabled. "`
	`1892`	`+"You need TTF font in your console window\n"));`
	`1893`	`+#else`
`1889`	`1894`	`unsignedintwincp,`
`1890`	`1895`	`concp;`
`1891`	`1896`
`@@ -1898,6 +1903,7 @@ checkWin32Codepage(void)`
`1898`	`1903`	`" page \"Notes for Windows users\" for details.\n"),`
`1899`	`1904`	`concp,wincp);`
`1900`	`1905`	`}`
	`1906`	`+#endif`
`1901`	`1907`	`}`
`1902`	`1908`	`#endif`
`1903`	`1909`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,19 @@ format_numeric_locale(const char *my_str)`
`316`	`316`	`staticvoid`
`317`	`317`	`fputnbytes(FILEf,constcharstr,size_tn)`
`318`	`318`	`{`
	`319`	`+`
	`320`	`+#ifdefHAVE_WIN32_LIBEDIT`
	`321`	`+charbuffer[1024];`
	`322`	`+char*buf=buffer;`
	`323`	`+if (n>1023)buf=malloc(n+1);`
	`324`	`+strncpy(buf,str,n);`
	`325`	`+buf[n]=0;`
	`326`	`+fputs(buf,f);`
	`327`	`+if (n>1023)free(buf);`
	`328`	`+#else`
`319`	`329`	`while (n-->0)`
`320`	`330`	`fputc(*str++,f);`
	`331`	`+#endif`
`321`	`332`	`}`
`322`	`333`
`323`	`334`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ flushbuffer(PrintfTarget *target)`
`271`	`271`	`{`
`272`	`272`	`/* Convert message from buffer (expected as utf8)`
`273`	`273`	`to widechar */`
`274`		`-HANDLEconsoleHandle=_get_osf_handle(_fileno(target->stream));`
	`274`	`+HANDLEconsoleHandle=_get_osfhandle(_fileno(target->stream));`
`275`	`275`	`DWORDactuallyWritten;`
`276`	`276`	`wchar_twidebuf= (wchar_t)malloc(nc*sizeof(wchar_t));`
`277`	`277`	`written=MultiByteToWideChar(CP_UTF8,0,target->bufstart,nc,widebuf,nc);`
`@@ -280,6 +280,7 @@ flushbuffer(PrintfTarget *target)`
`280`	`280`	`target->nchars+=nc;`
`281`	`281`	`else`
`282`	`282`	`target->failed= true;`
	`283`	`+free(widebuf);`
`283`	`284`	`}else {`
`284`	`285`	`#endif`
`285`	`286`	`written = fwrite(target->bufstart, 1, nc, target->stream);`
`@@ -1172,10 +1173,12 @@ int pg_fputs(const char s, FILE stream)`
`1172`	`1173`	`errno=EINVAL;`
`1173`	`1174`	`return-1;`
`1174`	`1175`	`}`
`1175`		`-target.bufstart=target.bufptr=s;`
`1176`		`-target.nchars=strlen(s);`
	`1176`	`+target.bufstart=s;`
	`1177`	`+target.nchars=0;`
	`1178`	`+target.bufptr=s+strlen(s);`
`1177`	`1179`	`target.bufend=NULL;`
`1178`	`1180`	`target.failed=false;`
	`1181`	`+target.stream=stream;`
`1179`	`1182`	`flushbuffer(&target);`
`1180`	`1183`	`returntarget.failed ?-1 :target.nchars;`
`1181`	`1184`	`}`

Comments

(0)