Commit6259678

committed

Fix bugs in exec.c that prevented pg_upgrade working in Windows.

Backpatch to 9.2 - code before that is quite different and shouldnot have these defects.

1 parentf763b77 commit6259678Copy full SHA for 6259678

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ exec_prog(const char log_file, const char opt_log_file,`
`52`	`52`
`53`	`53`	`old_umask=umask(S_IRWXG \|S_IRWXO);`
`54`	`54`
`55`		`-written=strlcpy(cmd,SYSTEMQUOTE,strlen(SYSTEMQUOTE));`
	`55`	`+written=strlcpy(cmd,SYSTEMQUOTE,sizeof(cmd));`
`56`	`56`	`va_start(ap,fmt);`
`57`	`57`	`written+=vsnprintf(cmd+written,MAXCMDLEN-written,fmt,ap);`
`58`	`58`	`va_end(ap);`
`@@ -95,10 +95,16 @@ exec_prog(const char log_file, const char opt_log_file,`
`95`	`95`	`log_file);`
`96`	`96`	`}`
`97`	`97`
	`98`	`+#ifndefWIN32`
	`99`	`+/*`
	`100`	`+ * Can't do this on Windows, postmaster will still hold the log file`
	`101`	`+ * open if the command was "pg_ctl start".`
	`102`	`+ */`
`98`	`103`	`if ((log=fopen_priv(log_file,"a+"))==NULL)`
`99`	`104`	`pg_log(PG_FATAL,"cannot write to log file %s\n",log_file);`
`100`	`105`	`fprintf(log,"\n\n");`
`101`	`106`	`fclose(log);`
	`107`	`+#endif`
`102`	`108`
`103`	`109`	`returnresult==0;`
`104`	`110`	`}`

Comments

(0)