Simplify new pg_ctl newline termination code.

This commit is contained in:
Bruce Momjian 2011-10-06 10:59:50 -04:00
parent aaa6e1def2
commit 416e82ce9f

View File

@ -1934,8 +1934,10 @@ adjust_data_dir(void)
pclose(fd);
free(my_exec_path);
if (strlen(filename) > 0 && filename[strlen(filename) - 1] == '\n')
filename[strlen(filename) - 1] = '\0';
/* Remove trailing newline */
if (strchr(filename, '\n') != NULL)
*strchr(filename, '\n') = '\0';
free(pg_data);
pg_data = xstrdup(filename);
canonicalize_path(pg_data);