database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix PAGER bug in createuser/etc scripts

Browse Source 
submitted by: Bruce Momjian (root@candle.pha.pa.us)
This commit is contained in:
Marc G. Fournier 1996-07-19 06:36:38 +00:00
parent 6562fa851e
commit de82ece8bd
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/interfaces/libpq/fe-exec.c
View File

@ -7,13 +7,14 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.3 1996/07/18 05:48:56 scrappy Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.4 1996/07/19 06:36:38 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include <errno.h> #include <errno.h>
#include "postgres.h" #include "postgres.h"
#include "libpq/pqcomm.h" #include "libpq/pqcomm.h"
@ -727,6 +728,10 @@ PQprint(FILE *fout,
char *border=NULL; char *border=NULL;
int numFieldName; int numFieldName;
int fs_len=strlen(po->fieldSep); int fs_len=strlen(po->fieldSep);
int total_line_length = 0;
int usePipe = 0;
char *pager;
nTups = PQntuples(res); nTups = PQntuples(res);
if (!(fieldNames=(char **)calloc(nFields, sizeof (char *)))) if (!(fieldNames=(char **)calloc(nFields, sizeof (char *))))
{ {
@ -758,7 +763,37 @@ PQprint(FILE *fout,
len+=fs_len; len+=fs_len;
if (len>fieldMaxLen) if (len>fieldMaxLen)
fieldMaxLen=len; fieldMaxLen=len;
total_line_length += len;
} }
total_line_length += nFields * strlen(po->fieldSep) + 1;
if (fout == NULL)
fout = stdout;
if (fout == stdout) {
/* try to pipe to the pager program if possible */
pager=getenv("PAGER");
if (pager != NULL &&
isatty(fileno(stdout)) &&
!po->html3 &&
((po->expanded && nTups * (nFields+1) >= 24) ||
(!po->expanded && nTups * (total_line_length / 80 + 1) *
( 1 + (po->standard != 0)) >=
24 -
(po->header != 0) * (total_line_length / 80 + 1) * 2
/* - 1 */ /* newline at end of tuple list */
/* - (quiet == 0)
*/ )))
{
fout = popen(pager, "w");
if (fout) {
usePipe = 1;
signal(SIGPIPE, SIG_IGN);
} else
fout = stdout;
}
}
if (!po->expanded && (po->align || po->html3)) if (!po->expanded && (po->align || po->html3))
{ {
if (!(fields=(char **)calloc(nFields*(nTups+1), sizeof(char *)))) if (!(fields=(char **)calloc(nFields*(nTups+1), sizeof(char *))))
@ -977,6 +1012,10 @@ efield:
fputc('\n', fout); fputc('\n', fout);
} }
free(fields); free(fields);
if (usePipe) {
pclose(fout);
signal(SIGPIPE, SIG_DFL);
}
} }
free(fieldMax); free(fieldMax);
free(fieldNotNum); free(fieldNotNum);