psql: Add PAGER for \h and \?,\C fix, indices spell fix.

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 469d3ea25995efba35fe2857ad7ecf1778b56f56..a408a38aeee2b14ae91a35f4d4d26d3d23f11c90 100644 (file)
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.77 1997/07/14 22:08:56 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.78 1997/07/24 20:01:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -153,40 +153,52 @@ on(bool f)
 static void
 slashUsage(PsqlSettings * ps)
 {
-    int ch;
-    
-    fprintf(stderr, " \\?           -- help\n");
-    fprintf(stderr, " \\a           -- toggle field-alignment (currenty %s)\n", on(ps->opt.align));
-    fprintf(stderr, " \\C [] -- set html3 caption (currently '%s')\n", ps->opt.caption ? ps->opt.caption : "");
-    fprintf(stderr, " \\connect   -- connect to new database (currently '%s')\n", PQdb(ps->db));
-    fprintf(stderr, " \\copy table {from | to} \n");
-    fprintf(stderr, " \\d [] -- list tables and indicies in database or columns in , * for all\n");-    fprintf(stderr, " \\di          -- list only indicies in database\n");-    fprintf(stderr, " \\ds          -- list only sequences in database\n");-    fprintf(stderr, " \\dt          -- list only tables in database\n");-    fprintf(stderr, " \\e [] -- edit the current query buffer or , \\E execute too\n");-    fprintf(stderr, " \\f []   -- change field separater (currently '%s')\n", ps->opt.fieldSep);-    fprintf(stderr, " \\g [] [|] -- send query to backend [and results in  or pipe]\n");-    fprintf(stderr, " \\h []   -- help on syntax of sql commands, * for all commands\n");-    fprintf(stderr, " \\H           -- toggle html3 output (currently %s)\n", on(ps->opt.html3));-    fprintf(stderr, " \\i    -- read and execute queries from filename\n");-    fprintf(stderr, " \\l           -- list all databases\n");-    fprintf(stderr, " \\m           -- toggle monitor-like table display (currently %s)\n", on(ps->opt.standard));-    fprintf(stderr, " \\o [] [|] -- send all query results to stdout, , or pipe\n");-    fprintf(stderr, " \\p           -- print the current query buffer\n");--    fprintf(stderr, "Press ENTER to continue");-    /* eat up any extra characters typed before ENTER */-    while ((ch = fgetc(stdin)) != '\r' && ch != '\n')-       ;-    fprintf(stderr, " \\q           -- quit\n");-    fprintf(stderr, " \\r           -- reset(clear) the query buffer\n");-    fprintf(stderr, " \\s [] -- print history or save it in \n");-    fprintf(stderr, " \\t           -- toggle table headings and row count (currently %s)\n", on(ps->opt.header));-    fprintf(stderr, " \\T []  -- set html3.0  options (currently '%s')\n", ps->opt.tableOpt ? ps->opt.tableOpt : "");-    fprintf(stderr, " \\x           -- toggle expanded output (currently %s)\n", on(ps->opt.expanded));-    fprintf(stderr, " \\z           -- list current grant/revoke permissions\n");-    fprintf(stderr, " \\! []   -- shell escape or command\n");+    int usePipe = 0;+    char *pagerenv;+    FILE *fout;++    if ((pagerenv = getenv("PAGER")) && (pagerenv[0] != '\0') && \+   (fout = popen(pagerenv, "w")))+    {+   usePipe = 1;+   pqsignal(SIGPIPE, SIG_IGN);+    }+    else+   fout = stderr;++    fprintf(fout, " \\?           -- help\n");+    fprintf(fout, " \\a           -- toggle field-alignment (currenty %s)\n", on(ps->opt.align));+    fprintf(fout, " \\C [] -- set html3 caption (currently '%s')\n", ps->opt.caption ? ps->opt.caption : "");+    fprintf(fout, " \\connect   -- connect to new database (currently '%s')\n", PQdb(ps->db));+    fprintf(fout, " \\copy table {from | to} \n");+    fprintf(fout, " \\d [












































] -- list tables and indices in database or columns in , * for all\n");+    fprintf(fout, " \\di          -- list only indices in database\n");+    fprintf(fout, " \\ds          -- list only sequences in database\n");+    fprintf(fout, " \\dt          -- list only tables in database\n");+    fprintf(fout, " \\e [] -- edit the current query buffer or , \\E execute too\n");+    fprintf(fout, " \\f []   -- change field separater (currently '%s')\n", ps->opt.fieldSep);+    fprintf(fout, " \\g [] [|] -- send query to backend [and results in  or pipe]\n");+    fprintf(fout, " \\h []   -- help on syntax of sql commands, * for all commands\n");+    fprintf(fout, " \\H           -- toggle html3 output (currently %s)\n", on(ps->opt.html3));+    fprintf(fout, " \\i    -- read and execute queries from filename\n");+    fprintf(fout, " \\l           -- list all databases\n");+    fprintf(fout, " \\m           -- toggle monitor-like table display (currently %s)\n", on(ps->opt.standard));+    fprintf(fout, " \\o [] [|] -- send all query results to stdout, , or pipe\n");+    fprintf(fout, " \\p           -- print the current query buffer\n");+    fprintf(fout, " \\q           -- quit\n");+    fprintf(fout, " \\r           -- reset(clear) the query buffer\n");+    fprintf(fout, " \\s [] -- print history or save it in \n");+    fprintf(fout, " \\t           -- toggle table headings and row count (currently %s)\n", on(ps->opt.header));+    fprintf(fout, " \\T []  -- set html3.0  options (currently '%s')\n", ps->opt.tableOpt ? ps->opt.tableOpt : "");+    fprintf(fout, " \\x           -- toggle expanded output (currently %s)\n", on(ps->opt.expanded));+    fprintf(fout, " \\z           -- list current grant/revoke permissions\n");+    fprintf(fout, " \\! []   -- shell escape or command\n");++    if (usePipe)+    {+   pclose(fout);+   pqsignal(SIGPIPE, SIG_DFL);+    } }  static PGresult *@@ -326,12 +338,12 @@ tableList(PsqlSettings * ps, bool deep_tablelist, char info_type)    switch (info_type) {        case 't':   fprintf(stderr, "Couldn't find any tables!\n");                break;-       case 'i':   fprintf(stderr, "Couldn't find any indicies!\n");+       case 'i':   fprintf(stderr, "Couldn't find any indices!\n");                break;        case 'S':   fprintf(stderr, "Couldn't find any sequences!\n");                break;        case 'b':-       default:    fprintf(stderr, "Couldn't find any tables, sequences or indicies!\n");+       default:    fprintf(stderr, "Couldn't find any tables, sequences or indices!\n");                break;    }    return (-1);@@ -1030,18 +1042,38 @@ do_help(const char *topic)    int             i;  /* Index into QL_HELP[] */    bool            help_found; /* We found the help he asked for */ +   int usePipe = 0;+   char *pagerenv;+   FILE *fout;++   if ((pagerenv = getenv("PAGER")) && (pagerenv[0] != '\0') && \+       (fout = popen(pagerenv, "w")))+   {+       usePipe = 1;+       pqsignal(SIGPIPE, SIG_IGN);+   }+   else+       fout = stderr;+    help_found = false; /* Haven't found it yet */    for (i = 0; QL_HELP[i].cmd; i++) {        if (strcmp(QL_HELP[i].cmd, topic) == 0 ||        strcmp(topic, "*") == 0) {        help_found = true;-       printf("Command: %s\n", QL_HELP[i].cmd);-       printf("Description: %s\n", QL_HELP[i].help);-       printf("Syntax:\n");-       printf("%s\n", QL_HELP[i].syntax);-       printf("\n");+       fprintf(fout, "Command: %s\n", QL_HELP[i].cmd);+       fprintf(fout, "Description: %s\n", QL_HELP[i].help);+       fprintf(fout, "Syntax:\n");+       fprintf(fout, "%s\n", QL_HELP[i].syntax);+       fprintf(fout, "\n");        }    }++   if (usePipe)+   {+       pclose(fout);+       pqsignal(SIGPIPE, SIG_DFL);+   }+    if (!help_found)        printf("command not found, "           "try \\h with no arguments to see available help\n");@@ -1145,14 +1177,11 @@ HandleSlashCmds(PsqlSettings * settings,    break;     case 'C':          /* define new caption */    if (settings->opt.caption)-       free(settings->opt.caption);-   if (!optarg)    {-       if (settings->opt.caption)-           free(settings->opt.caption);+       free(settings->opt.caption);        settings->opt.caption = NULL;    }-   else if (!(settings->opt.caption = strdup(optarg))) {+   if (optarg && !(settings->opt.caption = strdup(optarg))) {        perror("malloc");        exit(1);    }@@ -1198,11 +1227,11 @@ HandleSlashCmds(PsqlSettings * settings,     case 'd':          /* \d describe tables or columns in a table */    if (strncmp(cmd, "dt", 2) == 0) {       /* only tables */        tableList(settings, 0, 't');-   } else if (strncmp(cmd, "di", 2) == 0) {    /* only indicies */+   } else if (strncmp(cmd, "di", 2) == 0) {    /* only indices */        tableList(settings, 0, 'i');    } else if (strncmp(cmd, "ds", 2) == 0) {    /* only sequences */        tableList(settings, 0, 'S');-   } else if (!optarg) {               /* show tables, sequences and indicies */+   } else if (!optarg) {               /* show tables, sequences and indices */        tableList(settings, 0, 'b');    } else if (strcmp(optarg, "*") == 0) {      /* show everything */        tableList(settings, 0, 'b');
This is the main PostgreSQL git repository.
RSS
Atom































































































































window.onload = function () {
	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
	onloadTZSetup('local', tz_cookie, 'datetime');
};