Simplify new pg_ctl newline termination code.

pull/1/head
Bruce Momjian 14 years ago
parent aaa6e1def2
commit 416e82ce9f
  1. 6
      src/bin/pg_ctl/pg_ctl.c

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

Loading…
Cancel
Save