Clean up some messages and fix missing translation support. Option --log

renamed to --log-file for clarity.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 075453d6c774a727ddfe37d5f653d0b60e9c8a2c..b299e937d0dac3037b07a315da3b2ef37e539904 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -224,10 +224,10 @@ PostgreSQL documentation
 
     
       -L filename
-      --log filename
+      --log-file filename
       
       
-      Log all query output into file 
+      Write all query output into file 
       class="parameter">filename in addition to the regular output source.
       
       


diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c

index 61cca004e249e382e039569cb0159cafa8c9d6fb..9b087adf01066ad65fa0e55760e5a47f7edb37ec 100644 (file)

--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.105 2005/09/20 21:43:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.106 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -74,7 +74,7 @@ pg_strdup(const char *string)
 
    if (!string)
    {
-       fprintf(stderr, _("%s: xstrdup: cannot duplicate null pointer (internal error)\n"),
+       fprintf(stderr, _("%s: pg_strdup: cannot duplicate null pointer (internal error)\n"),
                pset.progname);
        exit(EXIT_FAILURE);
    }
@@ -719,15 +719,16 @@ PSQLexec(const char *query, bool start_xact)
    echo_hidden = SwitchVariable(pset.vars, "ECHO_HIDDEN", "noexec", NULL);
    if (echo_hidden != VAR_NOTSET)
    {
-       printf("********* QUERY **********\n"
-              "%s\n"
-              "**************************\n\n", query);
+       printf(_("********* QUERY **********\n"
+                "%s\n"
+                "**************************\n\n"), query);
        fflush(stdout);
        if (pset.logfile)
        {
-           fprintf(pset.logfile, "********* QUERY **********\n"
-              "%s\n"
-              "**************************\n\n", query);
+           fprintf(pset.logfile,
+                   _("********* QUERY **********\n"
+                     "%s\n"
+                     "**************************\n\n"), query);
            fflush(pset.logfile);
        }
 
@@ -987,9 +988,10 @@ SendQuery(const char *query)
 
    if (pset.logfile)
    {
-       fprintf(pset.logfile, "********* QUERY **********\n"
-          "%s\n"
-          "**************************\n\n", query);
+       fprintf(pset.logfile,
+               _("********* QUERY **********\n"
+                 "%s\n"
+                 "**************************\n\n"), query);
        fflush(pset.logfile);
    }
 


diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c

index 33299a6dd32e64cd31c6c0843faa83d9111b6b1e..9cd9858a71404ff11614d58e227aa390424a587c 100644 (file)

--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.125 2005/10/02 23:50:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.126 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1176,13 +1176,13 @@ describeOneTableDetails(const char *schemaname,
                {
                    appendPQExpBuffer(&buf, ", ");
                    appendPQExpBuffer(&buf, tmpbuf.data);
-                   
+
                    count_footers -= 2;
                }
                else
                    count_footers -= 1;
                termPQExpBuffer(&tmpbuf);
-               
+
                footers[count_footers++] = pg_strdup(buf.data);
            }
        }
@@ -1365,15 +1365,15 @@ add_tablespace_footer(char relkind, Oid tablespace, char **footers,
                printfPQExpBuffer(&buf, 
                    newline?_("Tablespace: \"%s\""):_("tablespace \"%s\""),
                    PQgetvalue(result1, 0, 0));
-                   
+
                footers[(*count)++] = pg_strdup(buf.data);
            }
            PQclear(result1);
-           
+
            return true;
        }
    }
-   
+
    return false;
 }
 


diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c

index 10ba0cd43ff2a50666209ee271c61d62f3bba85a..9c8000d7b7127f805b7e0c26e2196ff06653fc6c 100644 (file)

--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.76 2005/09/27 16:30:25 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.77 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -1579,7 +1579,7 @@ printTable(const char *title,
                                    border, output);
            break;
        default:
-           fprintf(stderr, _("illegal output format: %d"), opt->format);
+           fprintf(stderr, _("invalid output format (internal error): %d"), opt->format);
            exit(EXIT_FAILURE);
    }
 


diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c

index d1c90d2b95b0e0e173cbe17e314b23bc60086eae..89b136c8c033886b93a7460a7369a4513257db0c 100644 (file)

--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.123 2005/09/20 18:59:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.124 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -191,14 +191,14 @@ main(int argc, char *argv[])
    }
 
    if (options.username == NULL)
-       password_prompt = strdup("Password: ");
+       password_prompt = pg_strdup(_("Password: "));
    else
    {
-       password_prompt = malloc(strlen("Password for user %s: ") - 2 +
+       password_prompt = malloc(strlen(_("Password for user %s: ")) - 2 +
                                 strlen(options.username) + 1);
-       sprintf(password_prompt,"Password for user %s: ", options.username);
+       sprintf(password_prompt, _("Password for user %s: "), options.username);
    }
-   
+
    if (pset.getPassword)
        password = simple_prompt(password_prompt, 100, false);
 
@@ -252,7 +252,8 @@ main(int argc, char *argv[])
    {
        pset.logfile = fopen(options.logfilename, "a");
        if (!pset.logfile)
-           fprintf(stderr, gettext("logfile open failed for %s\n\n"), options.logfilename);
+           fprintf(stderr, _("%s: could not open log file \"%s\": %s\n"),
+                   pset.progname, options.logfilename, strerror(errno));
    }
 
    /*
@@ -422,7 +423,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
        {"host", required_argument, NULL, 'h'},
        {"html", no_argument, NULL, 'H'},
        {"list", no_argument, NULL, 'l'},
-       {"log", required_argument, NULL, 'L'},
+       {"log-file", required_argument, NULL, 'L'},
        {"no-readline", no_argument, NULL, 'n'},
        {"output", required_argument, NULL, 'o'},
        {"port", required_argument, NULL, 'p'},
@@ -528,7 +529,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 
                    if (!result)
                    {
-                       fprintf(stderr, _("%s: couldn't set printing parameter \"%s\"\n"), pset.progname, value);
+                       fprintf(stderr, _("%s: could not set printing parameter \"%s\"\n"), pset.progname, value);
                        exit(EXIT_FAILURE);
                    }
 

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 61cca004e249e382e039569cb0159cafa8c9d6fb..9b087adf01066ad65fa0e55760e5a47f7edb37ec 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.105 2005/09/20 21:43:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.106 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -74,7 +74,7 @@ pg_strdup(const char *string)
 
    if (!string)
    {
-       fprintf(stderr, _("%s: xstrdup: cannot duplicate null pointer (internal error)\n"),
+       fprintf(stderr, _("%s: pg_strdup: cannot duplicate null pointer (internal error)\n"),
                pset.progname);
        exit(EXIT_FAILURE);
    }
@@ -719,15 +719,16 @@ PSQLexec(const char *query, bool start_xact)
    echo_hidden = SwitchVariable(pset.vars, "ECHO_HIDDEN", "noexec", NULL);
    if (echo_hidden != VAR_NOTSET)
    {
-       printf("********* QUERY **********\n"
-              "%s\n"
-              "**************************\n\n", query);
+       printf(_("********* QUERY **********\n"
+                "%s\n"
+                "**************************\n\n"), query);
        fflush(stdout);
        if (pset.logfile)
        {
-           fprintf(pset.logfile, "********* QUERY **********\n"
-              "%s\n"
-              "**************************\n\n", query);
+           fprintf(pset.logfile,
+                   _("********* QUERY **********\n"
+                     "%s\n"
+                     "**************************\n\n"), query);
            fflush(pset.logfile);
        }
 
@@ -987,9 +988,10 @@ SendQuery(const char *query)
 
    if (pset.logfile)
    {
-       fprintf(pset.logfile, "********* QUERY **********\n"
-          "%s\n"
-          "**************************\n\n", query);
+       fprintf(pset.logfile,
+               _("********* QUERY **********\n"
+                 "%s\n"
+                 "**************************\n\n"), query);
        fflush(pset.logfile);
    }
 

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 33299a6dd32e64cd31c6c0843faa83d9111b6b1e..9cd9858a71404ff11614d58e227aa390424a587c 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.125 2005/10/02 23:50:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.126 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1176,13 +1176,13 @@ describeOneTableDetails(const char *schemaname,
                {
                    appendPQExpBuffer(&buf, ", ");
                    appendPQExpBuffer(&buf, tmpbuf.data);
-                   
+
                    count_footers -= 2;
                }
                else
                    count_footers -= 1;
                termPQExpBuffer(&tmpbuf);
-               
+
                footers[count_footers++] = pg_strdup(buf.data);
            }
        }
@@ -1365,15 +1365,15 @@ add_tablespace_footer(char relkind, Oid tablespace, char **footers,
                printfPQExpBuffer(&buf, 
                    newline?_("Tablespace: \"%s\""):_("tablespace \"%s\""),
                    PQgetvalue(result1, 0, 0));
-                   
+
                footers[(*count)++] = pg_strdup(buf.data);
            }
            PQclear(result1);
-           
+
            return true;
        }
    }
-   
+
    return false;
 }
 

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 10ba0cd43ff2a50666209ee271c61d62f3bba85a..9c8000d7b7127f805b7e0c26e2196ff06653fc6c 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.76 2005/09/27 16:30:25 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.77 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -1579,7 +1579,7 @@ printTable(const char *title,
                                    border, output);
            break;
        default:
-           fprintf(stderr, _("illegal output format: %d"), opt->format);
+           fprintf(stderr, _("invalid output format (internal error): %d"), opt->format);
            exit(EXIT_FAILURE);
    }
 

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index d1c90d2b95b0e0e173cbe17e314b23bc60086eae..89b136c8c033886b93a7460a7369a4513257db0c 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.123 2005/09/20 18:59:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.124 2005/10/04 19:01:18 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -191,14 +191,14 @@ main(int argc, char *argv[])
    }
 
    if (options.username == NULL)
-       password_prompt = strdup("Password: ");
+       password_prompt = pg_strdup(_("Password: "));
    else
    {
-       password_prompt = malloc(strlen("Password for user %s: ") - 2 +
+       password_prompt = malloc(strlen(_("Password for user %s: ")) - 2 +
                                 strlen(options.username) + 1);
-       sprintf(password_prompt,"Password for user %s: ", options.username);
+       sprintf(password_prompt, _("Password for user %s: "), options.username);
    }
-   
+
    if (pset.getPassword)
        password = simple_prompt(password_prompt, 100, false);
 
@@ -252,7 +252,8 @@ main(int argc, char *argv[])
    {
        pset.logfile = fopen(options.logfilename, "a");
        if (!pset.logfile)
-           fprintf(stderr, gettext("logfile open failed for %s\n\n"), options.logfilename);
+           fprintf(stderr, _("%s: could not open log file \"%s\": %s\n"),
+                   pset.progname, options.logfilename, strerror(errno));
    }
 
    /*
@@ -422,7 +423,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
        {"host", required_argument, NULL, 'h'},
        {"html", no_argument, NULL, 'H'},
        {"list", no_argument, NULL, 'l'},
-       {"log", required_argument, NULL, 'L'},
+       {"log-file", required_argument, NULL, 'L'},
        {"no-readline", no_argument, NULL, 'n'},
        {"output", required_argument, NULL, 'o'},
        {"port", required_argument, NULL, 'p'},
@@ -528,7 +529,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 
                    if (!result)
                    {
-                       fprintf(stderr, _("%s: couldn't set printing parameter \"%s\"\n"), pset.progname, value);
+                       fprintf(stderr, _("%s: could not set printing parameter \"%s\"\n"), pset.progname, value);
                        exit(EXIT_FAILURE);
                    }