Commita490120

committed

Correctly set binary mode for SSH pipe

1 parent16fff38 commita490120Copy full SHA for a490120

File tree

-16

lines changed

-16

lines changed

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -679,16 +679,4 @@ extern bool parse_page(Page page, XLogRecPtr *lsn);`
`679`	`679`	`int32do_compress(voiddst,size_tdst_size,voidconstsrc,size_tsrc_size,`
`680`	`680`	`CompressAlgalg,intlevel,constchar**errormsg);`
`681`	`681`
`682`		`-#ifdefWIN32`
`683`		`-#ifdef_DEBUG`
`684`		`-#definelseek _lseek`
`685`		`-#defineopen _open`
`686`		`-#definefstat _fstat`
`687`		`-#defineread _read`
`688`		`-#defineclose _close`
`689`		`-#definewrite _write`
`690`		`-#definemkdir(dir,mode) _mkdir(dir)`
`691`		`-#endif`
`692`		`-#endif`
`693`		`-`
`694`	`682`	`#endif/* PG_PROBACKUP_H */`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include<sys/stat.h>`
`4`	`4`
`5`	`5`	`#ifdefWIN32`
`6`		`-#define__thread`
	`6`	`+#define__thread __declspec(thread)`
`7`	`7`	`#else`
`8`	`8`	`#include<pthread.h>`
`9`	`9`	`#endif`
`@@ -1258,7 +1258,12 @@ void fio_communicate(int in, int out)`
`1258`	`1258`	`structstatst;`
`1259`	`1259`	`intrc;`
`1260`	`1260`
`1261`		`-/* Main loop until command of processing master command */`
	`1261`	`+#ifdefWIN32`
	`1262`	`+SYS_CHECK(setmode(in,_O_BINARY));`
	`1263`	`+SYS_CHECK(setmode(out,_O_BINARY));`
	`1264`	`+#endif`
	`1265`	`+`
	`1266`	`+/* Main loop until command of processing master command */`
`1262`	`1267`	`while ((rc=fio_read_all(in,&hdr,sizeofhdr))==sizeof(hdr)) {`
`1263`	`1268`	`if (hdr.size!=0) {`
`1264`	`1269`	`if (hdr.size>buf_size) {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ bool launch_agent(void)`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`#ifdefWIN32`
`151`		`-SYS_CHECK(_pipe(infd,PIPE_SIZE,O_BINARY)) ;`
`152`		`-SYS_CHECK(_pipe(outfd,PIPE_SIZE,O_BINARY));`
	`151`	`+SYS_CHECK(_pipe(infd,PIPE_SIZE,_O_BINARY)) ;`
	`152`	`+SYS_CHECK(_pipe(outfd,PIPE_SIZE,_O_BINARY));`
`153`	`153`	`ssh_argv[2]=psprintf("%d",outfd[0]);`
`154`	`154`	`ssh_argv[3]=psprintf("%d",infd[1]);`
`155`	`155`	`{`

Comments

(0)