diff options
Diffstat (limited to 'src/bin/scripts')
| -rw-r--r-- | src/bin/scripts/common.c | 8 | ||||
| -rw-r--r-- | src/bin/scripts/common.h | 18 | ||||
| -rw-r--r-- | src/bin/scripts/createlang.c | 12 | ||||
| -rw-r--r-- | src/bin/scripts/createuser.c | 6 | ||||
| -rw-r--r-- | src/bin/scripts/droplang.c | 34 | ||||
| -rw-r--r-- | src/bin/scripts/reindexdb.c | 96 |
6 files changed, 87 insertions, 87 deletions
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index 7036ef1b1c5..c450df3c6ef 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.18 2005/08/15 21:02:26 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.19 2005/10/15 02:49:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ #include "common.h" #ifndef HAVE_INT_OPTRESET -int optreset; +int optreset; #endif @@ -97,8 +97,8 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport, password = simple_prompt("Password: ", 100, false); /* - * Start the connection. Loop until we have a password if requested - * by backend. + * Start the connection. Loop until we have a password if requested by + * backend. */ do { diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h index eac2674ea6c..48b7214fde3 100644 --- a/src/bin/scripts/common.h +++ b/src/bin/scripts/common.h @@ -4,7 +4,7 @@ * * Copyright (c) 2003-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/common.h,v 1.11 2005/08/15 21:02:26 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/common.h,v 1.12 2005/10/15 02:49:41 momjian Exp $ */ #ifndef COMMON_H #define COMMON_H @@ -14,7 +14,7 @@ #include "getopt_long.h" #ifndef HAVE_INT_OPTRESET -extern int optreset; +extern int optreset; #endif typedef void (*help_handler) (const char *progname); @@ -22,19 +22,19 @@ typedef void (*help_handler) (const char *progname); extern const char *get_user_name(const char *progname); extern void handle_help_version_opts(int argc, char *argv[], - const char *fixed_progname, - help_handler hlp); + const char *fixed_progname, + help_handler hlp); extern PGconn *connectDatabase(const char *dbname, const char *pghost, - const char *pgport, const char *pguser, - bool require_password, const char *progname); + const char *pgport, const char *pguser, + bool require_password, const char *progname); extern PGresult *executeQuery(PGconn *conn, const char *query, - const char *progname, bool echo); + const char *progname, bool echo); extern void executeCommand(PGconn *conn, const char *query, - const char *progname, bool echo); + const char *progname, bool echo); extern int check_yesno_response(const char *string); -#endif /* COMMON_H */ +#endif /* COMMON_H */ diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c index 58e8a3703a6..d66012a51ab 100644 --- a/src/bin/scripts/createlang.c +++ b/src/bin/scripts/createlang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.20 2005/09/05 23:50:49 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.21 2005/10/15 02:49:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,8 +131,8 @@ main(int argc, char *argv[]) progname); printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", " - "(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" " - "FROM pg_catalog.pg_language WHERE lanispl;", + "(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" " + "FROM pg_catalog.pg_language WHERE lanispl;", _("Name"), _("yes"), _("no"), _("Trusted?")); result = executeQuery(conn, sql.data, progname, echo); @@ -163,15 +163,15 @@ main(int argc, char *argv[]) /* * Make sure the language isn't already installed */ - printfPQExpBuffer(&sql, - "SELECT oid FROM pg_catalog.pg_language WHERE lanname = '%s';", + printfPQExpBuffer(&sql, + "SELECT oid FROM pg_catalog.pg_language WHERE lanname = '%s';", langname); result = executeQuery(conn, sql.data, progname, echo); if (PQntuples(result) > 0) { PQfinish(conn); fprintf(stderr, - _("%s: language \"%s\" is already installed in database \"%s\"\n"), + _("%s: language \"%s\" is already installed in database \"%s\"\n"), progname, langname, dbname); /* separate exit status for "already installed" */ exit(2); diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index f3f906049ce..a7de05a75d4 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.20 2005/09/30 07:58:01 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.21 2005/10/15 02:49:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -313,7 +313,7 @@ help(const char *progname) printf(_(" -l, --login role can login (default)\n")); printf(_(" -L, --no-login role cannot login\n")); printf(_(" -i, --inherit role inherits privileges of roles it is a\n" - " member of (default)\n")); + " member of (default)\n")); printf(_(" -I, --no-inherit role does not inherit privileges\n")); printf(_(" -c, --connection-limit=N connection limit for role (default: no limit)\n")); printf(_(" -P, --pwprompt assign a password to new role\n")); @@ -329,6 +329,6 @@ help(const char *progname) printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n")); printf(_(" -W, --password prompt for password to connect\n")); printf(_("\nIf one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n" - "be prompted interactively.\n")); + "be prompted interactively.\n")); printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n")); } diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c index 52eb06986e6..f85c83b4094 100644 --- a/src/bin/scripts/droplang.c +++ b/src/bin/scripts/droplang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.17 2005/08/15 21:02:26 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.18 2005/10/15 02:49:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -137,12 +137,12 @@ main(int argc, char *argv[]) { printQueryOpt popt; - conn = connectDatabase(dbname, host, port, username, password, + conn = connectDatabase(dbname, host, port, username, password, progname); printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", " - "(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" " - "FROM pg_catalog.pg_language WHERE lanispl;", + "(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" " + "FROM pg_catalog.pg_language WHERE lanispl;", _("Name"), _("yes"), _("no"), _("Trusted?")); result = executeQuery(conn, sql.data, progname, echo); @@ -159,9 +159,9 @@ main(int argc, char *argv[]) if (langname == NULL) { - fprintf(stderr, _("%s: missing required argument language name\n"), + fprintf(stderr, _("%s: missing required argument language name\n"), progname); - fprintf(stderr, _("Try \"%s --help\" for more information.\n"), + fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); } @@ -173,18 +173,18 @@ main(int argc, char *argv[]) conn = connectDatabase(dbname, host, port, username, password, progname); /* - * Force schema search path to be just pg_catalog, so that we don't - * have to be paranoid about search paths below. + * Force schema search path to be just pg_catalog, so that we don't have + * to be paranoid about search paths below. */ executeCommand(conn, "SET search_path = pg_catalog;", progname, echo); /* - * Make sure the language is installed and find the OIDs of the - * handler and validator functions + * Make sure the language is installed and find the OIDs of the handler + * and validator functions */ printfPQExpBuffer(&sql, "SELECT lanplcallfoid, lanvalidator " - "FROM pg_language WHERE lanname = '%s' AND lanispl;", + "FROM pg_language WHERE lanname = '%s' AND lanispl;", langname); result = executeQuery(conn, sql.data, progname, echo); if (PQntuples(result) == 0) @@ -221,7 +221,7 @@ main(int argc, char *argv[]) * Check that the handler function isn't used by some other language */ printfPQExpBuffer(&sql, "SELECT count(*) FROM pg_language " - "WHERE lanplcallfoid = %u AND lanname <> '%s';", + "WHERE lanplcallfoid = %u AND lanname <> '%s';", lanplcallfoid, langname); result = executeQuery(conn, sql.data, progname, echo); if (strcmp(PQgetvalue(result, 0, 0), "0") == 0) @@ -237,7 +237,7 @@ main(int argc, char *argv[]) { printfPQExpBuffer(&sql, "SELECT proname, (SELECT nspname " "FROM pg_namespace ns WHERE ns.oid = pronamespace) " - "AS prons FROM pg_proc WHERE oid = %u;", + "AS prons FROM pg_proc WHERE oid = %u;", lanplcallfoid); result = executeQuery(conn, sql.data, progname, echo); handler = strdup(PQgetvalue(result, 0, 0)); @@ -256,7 +256,7 @@ main(int argc, char *argv[]) if (OidIsValid(lanvalidator)) { printfPQExpBuffer(&sql, "SELECT count(*) FROM pg_language " - "WHERE lanvalidator = %u AND lanname <> '%s';", + "WHERE lanvalidator = %u AND lanname <> '%s';", lanvalidator, langname); result = executeQuery(conn, sql.data, progname, echo); if (strcmp(PQgetvalue(result, 0, 0), "0") == 0) @@ -275,7 +275,7 @@ main(int argc, char *argv[]) { printfPQExpBuffer(&sql, "SELECT proname, (SELECT nspname " "FROM pg_namespace ns WHERE ns.oid = pronamespace) " - "AS prons FROM pg_proc WHERE oid = %u;", + "AS prons FROM pg_proc WHERE oid = %u;", lanvalidator); result = executeQuery(conn, sql.data, progname, echo); validator = strdup(PQgetvalue(result, 0, 0)); @@ -293,10 +293,10 @@ main(int argc, char *argv[]) */ printfPQExpBuffer(&sql, "DROP LANGUAGE \"%s\";\n", langname); if (!keephandler) - appendPQExpBuffer(&sql, "DROP FUNCTION \"%s\".\"%s\" ();\n", + appendPQExpBuffer(&sql, "DROP FUNCTION \"%s\".\"%s\" ();\n", handler_ns, handler); if (!keepvalidator) - appendPQExpBuffer(&sql, "DROP FUNCTION \"%s\".\"%s\" (oid);\n", + appendPQExpBuffer(&sql, "DROP FUNCTION \"%s\".\"%s\" (oid);\n", validator_ns, validator); if (echo) printf("%s", sql.data); diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 5b4cbc79f50..b1cdb47ae38 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.3 2005/09/30 09:56:26 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.4 2005/10/15 02:49:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,19 +15,19 @@ static void reindex_one_database(const char *name, const char *dbname, - const char *type, const char *host, - const char *port, const char *username, - bool password, const char *progname, - bool echo, bool quiet); + const char *type, const char *host, + const char *port, const char *username, + bool password, const char *progname, + bool echo, bool quiet); static void reindex_all_databases(const char *host, const char *port, - const char *username, bool password, - const char *progname, bool echo, - bool quiet); + const char *username, bool password, + const char *progname, bool echo, + bool quiet); static void reindex_system_catalogs(const char *dbname, - const char *host, const char *port, - const char *username, bool password, - const char *progname, bool echo, - bool quiet); + const char *host, const char *port, + const char *username, bool password, + const char *progname, bool echo, + bool quiet); static void help(const char *progname); int @@ -48,22 +48,22 @@ main(int argc, char *argv[]) {NULL, 0, NULL, 0} }; - const char *progname; - int optindex; - int c; + const char *progname; + int optindex; + int c; - const char *dbname = NULL; - const char *host = NULL; - const char *port = NULL; - const char *username = NULL; + const char *dbname = NULL; + const char *host = NULL; + const char *port = NULL; + const char *username = NULL; bool password = false; bool syscatalog = false; bool alldb = false; bool echo = false; bool quiet = false; - const char *table = NULL; - const char *index = NULL; - + const char *table = NULL; + const char *index = NULL; + progname = get_progname(argv[0]); set_pglocale_pgservice(argv[0], "pgscripts"); @@ -150,7 +150,7 @@ main(int argc, char *argv[]) } reindex_all_databases(host, port, username, password, - progname, echo, quiet); + progname, echo, quiet); } else if (syscatalog) { @@ -176,7 +176,7 @@ main(int argc, char *argv[]) } reindex_system_catalogs(dbname, host, port, username, password, - progname, echo, quiet); + progname, echo, quiet); } else { @@ -192,14 +192,14 @@ main(int argc, char *argv[]) if (index) reindex_one_database(index, dbname, "INDEX", host, port, - username, password, progname, echo, quiet); + username, password, progname, echo, quiet); if (table) reindex_one_database(table, dbname, "TABLE", host, port, - username, password, progname, echo, quiet); + username, password, progname, echo, quiet); /* reindex database only if index or table is not specified */ if (index == NULL && table == NULL) reindex_one_database(dbname, dbname, "DATABASE", host, port, - username, password, progname, echo, quiet); + username, password, progname, echo, quiet); } exit(0); @@ -207,14 +207,14 @@ main(int argc, char *argv[]) static void reindex_one_database(const char *name, const char *dbname, const char *type, - const char *host, const char *port, const char *username, - bool password, const char *progname, bool echo, - bool quiet) + const char *host, const char *port, const char *username, + bool password, const char *progname, bool echo, + bool quiet) { - PQExpBufferData sql; + PQExpBufferData sql; - PGconn *conn; - PGresult *result; + PGconn *conn; + PGresult *result; initPQExpBuffer(&sql); @@ -228,7 +228,7 @@ reindex_one_database(const char *name, const char *dbname, const char *type, appendPQExpBuffer(&sql, ";\n"); conn = connectDatabase(dbname, host, port, username, password, progname); - + if (echo) printf("%s", sql.data); result = PQexec(conn, sql.data); @@ -261,12 +261,12 @@ reindex_one_database(const char *name, const char *dbname, const char *type, static void reindex_all_databases(const char *host, const char *port, - const char *username, bool password, - const char *progname, bool echo, bool quiet) + const char *username, bool password, + const char *progname, bool echo, bool quiet) { - PGconn *conn; - PGresult *result; - int i; + PGconn *conn; + PGresult *result; + int i; conn = connectDatabase("postgres", host, port, username, password, progname); result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn;", progname, echo); @@ -274,13 +274,13 @@ reindex_all_databases(const char *host, const char *port, for (i = 0; i < PQntuples(result); i++) { - char *dbname = PQgetvalue(result, i, 0); + char *dbname = PQgetvalue(result, i, 0); if (!quiet) fprintf(stderr, _("%s: reindexing database \"%s\"\n"), progname, dbname); reindex_one_database(dbname, dbname, "DATABASE", host, port, username, - password, progname, echo, quiet); + password, progname, echo, quiet); } PQclear(result); @@ -288,20 +288,20 @@ reindex_all_databases(const char *host, const char *port, static void reindex_system_catalogs(const char *dbname, const char *host, const char *port, - const char *username, bool password, - const char *progname, bool echo, bool quiet) + const char *username, bool password, + const char *progname, bool echo, bool quiet) { - PQExpBufferData sql; + PQExpBufferData sql; - PGconn *conn; - PGresult *result; + PGconn *conn; + PGresult *result; initPQExpBuffer(&sql); appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;\n", dbname); conn = connectDatabase(dbname, host, port, username, password, progname); - + if (echo) printf("%s", sql.data); result = PQexec(conn, sql.data); @@ -309,7 +309,7 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port, if (PQresultStatus(result) != PGRES_COMMAND_OK) { fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"), - progname, PQerrorMessage(conn)); + progname, PQerrorMessage(conn)); PQfinish(conn); exit(1); } |