diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-06-19 13:54:50 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-06-19 13:54:50 +0000 |
| commit | 6de7d4fe91b1f037eb9ad612a22e972037426100 (patch) | |
| tree | 1661370f02a7ce6aa212a35b15d35f344faccad1 /contrib/pg_dumplo/main.c | |
| parent | b2c56574e1a83d4f71f72f9243423eeddbdbbe20 (diff) | |
| download | postgresql-6de7d4fe91b1f037eb9ad612a22e972037426100.tar.gz | |
Update to /contrib from Karel.
Diffstat (limited to 'contrib/pg_dumplo/main.c')
| -rw-r--r-- | contrib/pg_dumplo/main.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/contrib/pg_dumplo/main.c b/contrib/pg_dumplo/main.c index bc75476a1d..eafaed8c65 100644 --- a/contrib/pg_dumplo/main.c +++ b/contrib/pg_dumplo/main.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1999-2000, PostgreSQL, Inc * - * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.1 2000/06/15 19:05:08 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.2 2000/06/19 13:54:01 momjian Exp $ * * Karel Zak 1999-2000 * ------------------------------------------------------------------------- @@ -152,13 +152,18 @@ main(int argc, char **argv) * Check space * ---------- */ - if (! pgLO->space) { + if (! pgLO->space && ! pgLO->action == ACTION_SHOW) { if (!(pgLO->space = getenv("PWD"))) { fprintf(stderr, "%s: not set space for dump-tree (option '-s' or $PWD).\n", progname); exit(RE_ERROR); } } + if (!pgLO->action) { + fprintf(stderr, "%s: What do you want - export or import?\n", progname); + exit(RE_ERROR); + } + /* ---------- * Make connection * ---------- @@ -179,12 +184,8 @@ main(int argc, char **argv) * Init index file * ---------- */ - if (pgLO->action) { + if (pgLO->action != ACTION_SHOW) index_file(pgLO); - } else { - fprintf(stderr, "%s: What do you want - export or import?\n", progname); - exit(RE_ERROR); - } PQexec(pgLO->conn, "BEGIN"); @@ -198,7 +199,7 @@ main(int argc, char **argv) pglo_export(pgLO); if (!pgLO->quiet) { if (pgLO->action == ACTION_SHOW) - printf("\nDatabase '%s' content %d large objects.\n\n", pgLO->db, pgLO->counter); + printf("\nDatabase '%s' contains %d large objects.\n\n", pgLO->db, pgLO->counter); else printf("\nExported %d large objects.\n\n", pgLO->counter); } |