Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26f4fc0

Browse files
committed
Fix line end mishandling in pg_upgrade on Windows.
pg_upgrade opened the output from pg_dumpall in text mode andwrote the split files in text mode. This caused unwanted eatingof intended carriage returns on input and production of spuriouscarriage returns on output. To avoid this, open all these filesin binary mode. On non-Windows platforms, this change has noeffect.Backpatch to 9.0. On 9.0 and 9.1, we also switch from redirectingpg_dumpall's output to using pg_dumpall's -f switch, for the samereason.
1 parent5ee0f03 commit26f4fc0

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

‎contrib/pg_upgrade/dump.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ generate_old_dump(void)
2222
*/
2323
exec_prog(true,
2424
SYSTEMQUOTE"\"%s/pg_dumpall\" --port %d --username \"%s\" "
25-
"--schema-only --binary-upgrade> \"%s/"ALL_DUMP_FILE"\""
25+
"--schema-only --binary-upgrade-f \"%s/"ALL_DUMP_FILE"\""
2626
SYSTEMQUOTE,new_cluster.bindir,old_cluster.port,os_info.user,os_info.cwd);
2727
check_ok();
2828
}
@@ -54,14 +54,19 @@ split_old_dump(void)
5454
charfilename[MAXPGPATH];
5555
boolsuppressed_username= false;
5656

57+
/*
58+
* Open all files in binary mode to avoid line end translation on Windows,
59+
* both for input and output.
60+
*/
61+
5762
snprintf(filename,sizeof(filename),"%s/%s",os_info.cwd,ALL_DUMP_FILE);
58-
if ((all_dump=fopen(filename,"r"))==NULL)
63+
if ((all_dump=fopen(filename,PG_BINARY_R))==NULL)
5964
pg_log(PG_FATAL,"Cannot open dump file %s\n",filename);
6065
snprintf(filename,sizeof(filename),"%s/%s",os_info.cwd,GLOBALS_DUMP_FILE);
61-
if ((globals_dump=fopen(filename,"w"))==NULL)
66+
if ((globals_dump=fopen(filename,PG_BINARY_W))==NULL)
6267
pg_log(PG_FATAL,"Cannot write to dump file %s\n",filename);
6368
snprintf(filename,sizeof(filename),"%s/%s",os_info.cwd,DB_DUMP_FILE);
64-
if ((db_dump=fopen(filename,"w"))==NULL)
69+
if ((db_dump=fopen(filename,PG_BINARY_W))==NULL)
6570
pg_log(PG_FATAL,"Cannot write to dump file %s\n",filename);
6671
current_output=globals_dump;
6772

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp