Commit416e82c

committed

Simplify new pg_ctl newline termination code.

1 parentaaa6e1d commit416e82cCopy full SHA for 416e82c

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1934,8 +1934,10 @@ adjust_data_dir(void)`
`1934`	`1934`	`pclose(fd);`
`1935`	`1935`	`free(my_exec_path);`
`1936`	`1936`
`1937`		`-if (strlen(filename)>0&&filename[strlen(filename)-1]=='\n')`
`1938`		`-filename[strlen(filename)-1]='\0';`
	`1937`	`+/* Remove trailing newline */`
	`1938`	`+if (strchr(filename,'\n')!=NULL)`
	`1939`	`+*strchr(filename,'\n')='\0';`
	`1940`	`+`
`1939`	`1941`	`free(pg_data);`
`1940`	`1942`	`pg_data=xstrdup(filename);`
`1941`	`1943`	`canonicalize_path(pg_data);`

Comments

(0)