In pg_upgrade, add various logging improvements:

[postgresql] / contrib / pg_upgrade / version.c

diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c
index 46190b11543f1d24d121b27de391b0f5d8eb8985..5d790a0803e2a00cd5fe2e7327dc5963fd6366c0 100644 (file)
--- a/contrib/pg_upgrade/version.c
+++ b/contrib/pg_upgrade/version.c
@@ -3,13 +3,14 @@
  *
  *     Postgres-version-specific routines
  *
- *     Copyright (c) 2010-2011, PostgreSQL Global Development Group
+ *     Copyright (c) 2010-2012, PostgreSQL Global Development Group
  *     contrib/pg_upgrade/version.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
-#include "access/transam.h"
 
 
 /*
@@ -27,8 +28,7 @@ new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, bool check_mode)
 
        prep_status("Checking for large objects");
 
-       snprintf(output_path, sizeof(output_path), "%s/pg_largeobject.sql",
-                        os_info.cwd);
+       snprintf(output_path, sizeof(output_path), "pg_largeobject.sql");
 
        for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
        {
@@ -48,7 +48,7 @@ new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, bool check_mode)
                        found = true;
                        if (!check_mode)
                        {
-                               if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+                               if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
                                        pg_log(PG_FATAL, "could not open file \"%s\": %s\n", output_path, getErrorText(errno));
                                fprintf(script, "\\connect %s\n",
                                                quote_identifier(active_db->db_name));