diff options
| author | Bruce Momjian <bruce@momjian.us> | 2010-06-12 17:05:29 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2010-06-12 17:05:29 +0000 |
| commit | 1dc7c796c982f97fa93ddba530db3b15f1fba676 (patch) | |
| tree | 38dd5ed7dbef3dcc5eb14a11ea50122871e3d49b /contrib/pg_upgrade/dump.c | |
| parent | 99fdb4a9eae673c7697485241bf6062aa6bf26fa (diff) | |
Have pg_upgrade create its output files in the current directory, rather
than in a subdirectory of the $HOME directory, or $TMP in Windows.
Diffstat (limited to 'contrib/pg_upgrade/dump.c')
| -rw-r--r-- | contrib/pg_upgrade/dump.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c index f0f827aeb5b..f3060d54d1b 100644 --- a/contrib/pg_upgrade/dump.c +++ b/contrib/pg_upgrade/dump.c @@ -21,7 +21,7 @@ generate_old_dump(migratorContext *ctx) exec_prog(ctx, true, SYSTEMQUOTE "\"%s/pg_dumpall\" --port %d --schema-only " "--binary-upgrade > \"%s/" ALL_DUMP_FILE "\"" SYSTEMQUOTE, - ctx->new.bindir, ctx->old.port, ctx->output_dir); + ctx->new.bindir, ctx->old.port, ctx->cwd); check_ok(ctx); } @@ -52,13 +52,13 @@ split_old_dump(migratorContext *ctx) char filename[MAXPGPATH]; bool suppressed_username = false; - snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, ALL_DUMP_FILE); + snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, ALL_DUMP_FILE); if ((all_dump = fopen(filename, "r")) == NULL) pg_log(ctx, PG_FATAL, "Cannot open dump file %s\n", filename); - snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, GLOBALS_DUMP_FILE); + snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, GLOBALS_DUMP_FILE); if ((globals_dump = fopen(filename, "w")) == NULL) pg_log(ctx, PG_FATAL, "Cannot write to dump file %s\n", filename); - snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, DB_DUMP_FILE); + snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, DB_DUMP_FILE); if ((db_dump = fopen(filename, "w")) == NULL) pg_log(ctx, PG_FATAL, "Cannot write to dump file %s\n", filename); current_output = globals_dump; |