From 416e82ce9f0c8c4ec6d377368d670b8ca74097a6 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 6 Oct 2011 10:59:50 -0400 Subject: [PATCH] Simplify new pg_ctl newline termination code. --- src/bin/pg_ctl/pg_ctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index e633d0c18f..c9007eded9 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -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); -- 2.40.0