*** pgsql/src/bin/scripts/createlang.c 2009/02/25 13:03:07 1.33 --- pgsql/src/bin/scripts/createlang.c 2009/02/26 16:02:39 1.34 *************** *** 5,11 **** * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.32 2009/01/01 17:23:55 momjian Exp $ * *------------------------------------------------------------------------- */ --- 5,11 ---- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.33 2009/02/25 13:03:07 petere Exp $ * *------------------------------------------------------------------------- */ *************** main(int argc, char *argv[]) *** 25,30 **** --- 25,31 ---- {"host", required_argument, NULL, 'h'}, {"port", required_argument, NULL, 'p'}, {"username", required_argument, NULL, 'U'}, + {"no-password", no_argument, NULL, 'w'}, {"password", no_argument, NULL, 'W'}, {"dbname", required_argument, NULL, 'd'}, {"echo", no_argument, NULL, 'e'}, *************** main(int argc, char *argv[]) *** 40,46 **** char *host = NULL; char *port = NULL; char *username = NULL; ! bool password = false; bool echo = false; char *langname = NULL; --- 41,47 ---- char *host = NULL; char *port = NULL; char *username = NULL; ! enum trivalue prompt_password = TRI_DEFAULT; bool echo = false; char *langname = NULL; *************** main(int argc, char *argv[]) *** 56,62 **** handle_help_version_opts(argc, argv, "createlang", help); ! while ((c = getopt_long(argc, argv, "lh:p:U:Wd:e", long_options, &optindex)) != -1) { switch (c) { --- 57,63 ---- handle_help_version_opts(argc, argv, "createlang", help); ! while ((c = getopt_long(argc, argv, "lh:p:U:wWd:e", long_options, &optindex)) != -1) { switch (c) { *************** main(int argc, char *argv[]) *** 72,79 **** case 'U': username = optarg; break; case 'W': ! password = true; break; case 'd': dbname = optarg; --- 73,83 ---- case 'U': username = optarg; break; + case 'w': + prompt_password = TRI_NO; + break; case 'W': ! prompt_password = TRI_YES; break; case 'd': dbname = optarg; *************** main(int argc, char *argv[]) *** 127,133 **** printQueryOpt popt; static const bool translate_columns[] = {false, true}; ! conn = connectDatabase(dbname, host, port, username, password, progname); printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", " --- 131,137 ---- printQueryOpt popt; static const bool translate_columns[] = {false, true}; ! conn = connectDatabase(dbname, host, port, username, prompt_password, progname); printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", " *************** main(int argc, char *argv[]) *** 164,170 **** if (*p >= 'A' && *p <= 'Z') *p += ('a' - 'A'); ! conn = connectDatabase(dbname, host, port, username, password, progname); /* * Make sure the language isn't already installed --- 168,174 ---- if (*p >= 'A' && *p <= 'Z') *p += ('a' - 'A'); ! conn = connectDatabase(dbname, host, port, username, prompt_password, progname); /* * Make sure the language isn't already installed *************** help(const char *progname) *** 220,225 **** --- 224,230 ---- printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); + printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt\n")); printf(_("\nReport bugs to .\n")); }