Re: Proposed patch - psql wraps at window width - Mailing list pgsql-patches
From | Bryce Nesbitt |
---|---|
Subject | Re: Proposed patch - psql wraps at window width |
Date | |
Msg-id | 480848B1.5070402@obviously.com Whole thread Raw |
In response to | Re: Proposed patch - psql wraps at window width (Bruce Momjian <bruce@momjian.us>) |
Responses |
Re: Proposed patch - psql wraps at window width
|
List | pgsql-patches |
Bruce Momjian wrote: > I don't think you need to do that to get it applied --- there is nothing > windows-specific in your code. > > Is this ready to be applied? Do you want to send a final update or are > you still testing? > Looks good, but I suggest adding "give up if the header is too wide": if (tcolumns > 0 && tcolumns >= total_header_width) /* * psql - the PostgreSQL interactive terminal * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.97 2008/03/27 03:57:34 tgl Exp $ */ #include "postgres_fe.h" #include "print.h" #include "catalog/pg_type.h" #include <math.h> #include <signal.h> #include <unistd.h> #ifndef WIN32 #include <sys/ioctl.h> /* for ioctl() */ #endif #ifdef HAVE_TERMIOS_H #include <termios.h> #endif #include <locale.h> #include "pqsignal.h" #include "mbprint.h" /* * We define the cancel_pressed flag in this file, rather than common.c where * it naturally belongs, because this file is also used by non-psql programs * (see the bin/scripts/ directory). In those programs cancel_pressed will * never become set and will have no effect. * * Note: print.c's general strategy for when to check cancel_pressed is to do * so at completion of each row of output. */ volatile bool cancel_pressed = false; static char *decimal_point; static char *grouping; static char *thousands_sep; #define COL_RATIO(col_num) \ ((double) width_wrap[col_num] / width_average[col_num] + \ width_max[col_num] * 0.01) /* Penalize wide columns */ static void * pg_local_malloc(size_t size) { void *tmp; tmp = malloc(size); if (!tmp) { fprintf(stderr, _("out of memory\n")); exit(EXIT_FAILURE); } return tmp; } static void * pg_local_calloc(int count, size_t size) { void *tmp; tmp = calloc(count, size); if (!tmp) { fprintf(stderr, _("out of memory\n")); exit(EXIT_FAILURE); } return tmp; } static int integer_digits(const char *my_str) { int frac_len; if (my_str[0] == '-') my_str++; frac_len = strchr(my_str, '.') ? strlen(strchr(my_str, '.')) : 0; return strlen(my_str) - frac_len; } /* Return additional length required for locale-aware numeric output */ static int additional_numeric_locale_len(const char *my_str) { int int_len = integer_digits(my_str), len = 0; int groupdigits = atoi(grouping); if (int_len > 0) /* Don't count a leading separator */ len = (int_len / groupdigits - (int_len % groupdigits == 0)) * strlen(thousands_sep); if (strchr(my_str, '.') != NULL) len += strlen(decimal_point) - strlen("."); return len; } static int strlen_with_numeric_locale(const char *my_str) { return strlen(my_str) + additional_numeric_locale_len(my_str); } /* Returns the appropriately formatted string in a new allocated block, caller must free */ static char * format_numeric_locale(const char *my_str) { int i, j, int_len = integer_digits(my_str), leading_digits; int groupdigits = atoi(grouping); int new_str_start = 0; char *new_str = new_str = pg_local_malloc( strlen_with_numeric_locale(my_str) + 1); leading_digits = (int_len % groupdigits != 0) ? int_len % groupdigits : groupdigits; if (my_str[0] == '-') /* skip over sign, affects grouping * calculations */ { new_str[0] = my_str[0]; my_str++; new_str_start = 1; } for (i = 0, j = new_str_start;; i++, j++) { /* Hit decimal point? */ if (my_str[i] == '.') { strcpy(&new_str[j], decimal_point); j += strlen(decimal_point); /* add fractional part */ strcpy(&new_str[j], &my_str[i] + 1); break; } /* End of string? */ if (my_str[i] == '\0') { new_str[j] = '\0'; break; } /* Add separator? */ if (i != 0 && (i - leading_digits) % groupdigits == 0) { strcpy(&new_str[j], thousands_sep); j += strlen(thousands_sep); } new_str[j] = my_str[i]; } return new_str; } /*************************/ /* Unaligned text */ /*************************/ static void print_unaligned_text(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { const char *opt_fieldsep = opt->fieldSep; const char *opt_recordsep = opt->recordSep; bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned int col_count = 0; unsigned int i; const char *const * ptr; bool need_recordsep = false; if (cancel_pressed) return; if (!opt_fieldsep) opt_fieldsep = ""; if (!opt_recordsep) opt_recordsep = ""; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) fprintf(fout, "%s%s", title, opt_recordsep); /* print headers */ if (!opt_tuples_only) { for (ptr = headers; *ptr; ptr++) { if (ptr != headers) fputs(opt_fieldsep, fout); fputs(*ptr, fout); } need_recordsep = true; } } else /* assume continuing printout */ need_recordsep = true; /* print cells */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (need_recordsep) { fputs(opt_recordsep, fout); need_recordsep = false; if (cancel_pressed) break; } if (opt_align[i % col_count] == 'r' && opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); fputs(my_cell, fout); free(my_cell); } else fputs(*ptr, fout); if ((i + 1) % col_count) fputs(opt_fieldsep, fout); else need_recordsep = true; } /* print footers */ if (opt->stop_table) { if (!opt_tuples_only && footers && !cancel_pressed) for (ptr = footers; *ptr; ptr++) { if (need_recordsep) { fputs(opt_recordsep, fout); need_recordsep = false; } fputs(*ptr, fout); need_recordsep = true; } /* the last record needs to be concluded with a newline */ if (need_recordsep) fputc('\n', fout); } } static void print_unaligned_vertical(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { const char *opt_fieldsep = opt->fieldSep; const char *opt_recordsep = opt->recordSep; bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned int col_count = 0; unsigned int i; const char *const * ptr; bool need_recordsep = false; if (cancel_pressed) return; if (!opt_fieldsep) opt_fieldsep = ""; if (!opt_recordsep) opt_recordsep = ""; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) { fputs(title, fout); need_recordsep = true; } } else /* assume continuing printout */ need_recordsep = true; /* print records */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (need_recordsep) { /* record separator is 2 occurrences of recordsep in this mode */ fputs(opt_recordsep, fout); fputs(opt_recordsep, fout); need_recordsep = false; if (cancel_pressed) break; } fputs(headers[i % col_count], fout); fputs(opt_fieldsep, fout); if (opt_align[i % col_count] == 'r' && opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); fputs(my_cell, fout); free(my_cell); } else fputs(*ptr, fout); if ((i + 1) % col_count) fputs(opt_recordsep, fout); else need_recordsep = true; } if (opt->stop_table) { /* print footers */ if (!opt_tuples_only && footers && *footers && !cancel_pressed) { fputs(opt_recordsep, fout); for (ptr = footers; *ptr; ptr++) { fputs(opt_recordsep, fout); fputs(*ptr, fout); } } fputc('\n', fout); } } /********************/ /* Aligned text */ /********************/ /* draw "line" */ static void _print_horizontal_line(const unsigned int col_count, const unsigned int *widths, unsigned short border, FILE *fout) { unsigned int i, j; if (border == 1) fputc('-', fout); else if (border == 2) fputs("+-", fout); for (i = 0; i < col_count; i++) { for (j = 0; j < widths[i]; j++) fputc('-', fout); if (i < col_count - 1) { if (border == 0) fputc(' ', fout); else fputs("-+-", fout); } } if (border == 2) fputs("-+", fout); else if (border == 1) fputc('-', fout); fputc('\n', fout); } /* * Prety pretty boxes around cells. */ static void print_aligned_text(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; int encoding = opt->encoding; unsigned short int opt_border = opt->border; unsigned int col_count = 0, cell_count = 0; unsigned int i, j; unsigned int *width_header, *width_max, *width_wrap, *width_average; unsigned int *heights, *format_space; unsigned char **format_buf; unsigned int width_total; unsigned int total_header_width; const char *const * ptr; struct lineptr **col_lineptrs; /* pointers to line pointer per column */ struct lineptr *lineptr_list; /* complete list of linepointers */ int *complete; /* Array remembering which columns have * completed output */ int tcolumns = 0; /* Width of interactive console */ if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (col_count > 0) { width_header = pg_local_calloc(col_count, sizeof(*width_header)); width_average = pg_local_calloc(col_count, sizeof(*width_average)); width_max = pg_local_calloc(col_count, sizeof(*width_max)); width_wrap = pg_local_calloc(col_count, sizeof(*width_wrap)); heights = pg_local_calloc(col_count, sizeof(*heights)); col_lineptrs = pg_local_calloc(col_count, sizeof(*col_lineptrs)); format_space = pg_local_calloc(col_count, sizeof(*format_space)); format_buf = pg_local_calloc(col_count, sizeof(*format_buf)); complete = pg_local_calloc(col_count, sizeof(*complete)); } else { width_header = NULL; width_average = NULL; width_max = NULL; width_wrap = NULL; heights = NULL; col_lineptrs = NULL; format_space = NULL; format_buf = NULL; complete = NULL; } /* scan all column headers, find maximum width */ for (i = 0; i < col_count; i++) { /* Get width & height */ int width, height, space; pg_wcssize((unsigned char *) headers[i], strlen(headers[i]), encoding, &width, &height, &space); if (width > width_max[i]) width_max[i] = width; if (height > heights[i]) heights[i] = height; if (space > format_space[i]) format_space[i] = space; width_header[i] = width; } /* scan all rows, find maximum width, compute cell_count */ for (i = 0, ptr = cells; *ptr; ptr++, i++, cell_count++) { int width, height, space; /* Get width, ignore height */ pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding, &width, &height, &space); if (opt_numeric_locale && opt_align[i % col_count] == 'r') { width += additional_numeric_locale_len(*ptr); space += additional_numeric_locale_len(*ptr); } if (width > width_max[i % col_count]) width_max[i % col_count] = width; if (height > heights[i % col_count]) heights[i % col_count] = height; if (space > format_space[i % col_count]) format_space[i % col_count] = space; width_average[i % col_count] += width; } /* If we have rows, compute average */ if (col_count != 0 && cell_count != 0) { int rows = cell_count / col_count; for (i = 0; i < col_count; i++) width_average[i % col_count] /= rows; } /* adjust the total display width based on border style */ if (opt_border == 0) width_total = col_count - 1; else if (opt_border == 1) width_total = col_count * 3 - 1; else width_total = col_count * 3 + 1; total_header_width = width_total; for (i = 0; i < col_count; i++) { width_total += width_max[i]; total_header_width += width_header[i]; } /* * At this point: width_max[] contains the max width of each column, * heights[] contains the max number of lines in each column, * format_space[] contains the maximum storage space for formatting * strings, width_total contains the giant width sum. Now we allocate * some memory... */ if (col_count > 0) { int height_total = 0; struct lineptr *lineptr; for (i = 0; i < col_count; i++) height_total += heights[i]; lineptr = lineptr_list = pg_local_calloc(height_total, sizeof(*lineptr_list)); for (i = 0; i < col_count; i++) { col_lineptrs[i] = lineptr; lineptr += heights[i]; format_buf[i] = pg_local_malloc(format_space[i] + 1); col_lineptrs[i]->ptr = format_buf[i]; } } else lineptr_list = NULL; /* Default word wrap to the full width, i.e. no word wrap */ for (i = 0; i < col_count; i++) width_wrap[i] = width_max[i]; /* * Optional optimized word wrap. Shrink columns with a high max/avg ratio. * Slighly bias against wider columns (increases chance a narrow column * will fit in its cell) */ if (opt->format == PRINT_WRAP) { /* If we can get the terminal width */ char *env = getenv("COLUMNS"); if (env != NULL) tcolumns = atoi(env); #ifdef TIOCGWINSZ else { struct winsize screen_size; if (ioctl(fileno(stdout), TIOCGWINSZ, &screen_size) != -1) tcolumns = screen_size.ws_col; } #endif /* * If available columns is positive... * and greater than the width of the unshrinkable column headers */ if (tcolumns > 0 && tcolumns >= total_header_width) { /* While there is still excess width... */ while (width_total > tcolumns) { double max_ratio = 0, prev_max_ratio = 0; double curr_ratio = 0; int worst_col = -1; /* * Find column that has the highest ratio of its maximum * width compared to its average width. This tells us which * column will produce the fewest wrapped values if shortened. * width_wrap starts as equal to width_max. */ for (i = 0; i < col_count; i++) if (width_average[i] && width_wrap[i] > width_header[i]) { if (COL_RATIO(i) > max_ratio) { prev_max_ratio = max_ratio; max_ratio = curr_ratio; worst_col = i; } } /* Exit loop if we can't squeeze any more. */ if (worst_col < 0) break; /* Squeeze the worst column. Lather, rinse, repeat */ do { width_wrap[worst_col]--; width_total--; } while (width_total > tcolumns && COL_RATIO(i) >= prev_max_ratio); } } } /* time to output */ if (opt->start_table) { /* print title */ if (title && !opt_tuples_only) { int width, height; pg_wcssize((unsigned char *) title, strlen(title), encoding, &width, &height, NULL); if (width >= width_total) fprintf(fout, "%s\n", title); /* Aligned */ else fprintf(fout, "%-*s%s\n", (width_total - width) / 2, "", title); /* Centered */ } /* print headers */ if (!opt_tuples_only) { int cols_todo; int line_count; if (opt_border == 2) _print_horizontal_line(col_count, width_wrap, opt_border, fout); for (i = 0; i < col_count; i++) pg_wcsformat((unsigned char *) headers[i], strlen(headers[i]), encoding, col_lineptrs[i], heights[i]); cols_todo = col_count; line_count = 0; memset(complete, 0, col_count * sizeof(int)); while (cols_todo) { if (opt_border == 2) fprintf(fout, "|%c", line_count ? '+' : ' '); else if (opt_border == 1) fputc(line_count ? '+' : ' ', fout); for (i = 0; i < col_count; i++) { unsigned int nbspace; struct lineptr *this_line = col_lineptrs[i] + line_count; if (!complete[i]) { nbspace = width_wrap[i] - this_line->width; /* centered */ fprintf(fout, "%-*s%s%-*s", nbspace / 2, "", this_line->ptr, (nbspace + 1) / 2, ""); if (line_count == (heights[i] - 1) || !(this_line + 1)->ptr) { cols_todo--; complete[i] = 1; } } else fprintf(fout, "%*s", width_wrap[i], ""); if (i < col_count - 1) { if (opt_border == 0) fputc(line_count ? '+' : ' ', fout); else fprintf(fout, " |%c", line_count ? '+' : ' '); } } line_count++; if (opt_border == 2) fputs(" |", fout); else if (opt_border == 1) fputc(' ', fout);; fputc('\n', fout); } _print_horizontal_line(col_count, width_wrap, opt_border, fout); } } /* print cells */ for (i = 0, ptr = cells; *ptr; i += col_count, ptr += col_count) { bool line_todo, cols_todo; int line_count; if (cancel_pressed) break; /* * Format each cell. Format again, it is a numeric formatting locale * (e.g. 123,456 vs. 123456) */ for (j = 0; j < col_count; j++) { pg_wcsformat((unsigned char *) ptr[j], strlen(ptr[j]), encoding, col_lineptrs[j], heights[j]); if (opt_numeric_locale && opt_align[j % col_count] == 'r') { char *my_cell; my_cell = format_numeric_locale((char *) col_lineptrs[j]->ptr); strcpy((char *) col_lineptrs[j]->ptr, my_cell); /* Buffer IS large * enough... now */ free(my_cell); } } /* Print rows to console */ memset(complete, 0, col_count * sizeof(int)); line_count = 0; line_todo = true; while (line_todo) { cols_todo = true; while (cols_todo) { char border_cell = '*'; cols_todo = false; /* left border */ if (opt_border == 2) fputs("| ", fout); else if (opt_border == 1) fputc(' ', fout); /* for each column */ for (j = 0; j < col_count; j++) { struct lineptr *this_line = &col_lineptrs[j][line_count]; if (heights[j] <= line_count) /* Blank column content */ { fprintf(fout, "%*s", width_wrap[j], ""); border_cell = '|'; } else if (opt_align[j] == 'r') /* Right aligned cell */ { int strlen_remaining = strlen((char *) this_line->ptr + complete[j]); if (strlen_remaining > width_wrap[j]) { fprintf(fout, "%.*s", (int) width_wrap[j], this_line->ptr + complete[j]); complete[j] += width_wrap[j]; /* We've done THIS much */ cols_todo = true; /* And there is more to do... */ border_cell = ':'; } else { fprintf(fout, "%*s", width_wrap[j] - strlen_remaining, ""); fprintf(fout, "%-s", this_line->ptr + complete[j]); complete[j] += strlen_remaining; border_cell = '|'; } } else /* Left aligned cell */ { int strlen_remaining = strlen((char *) this_line->ptr + complete[j]); if (strlen_remaining > width_wrap[j]) { fprintf(fout, "%.*s", (int) width_wrap[j], this_line->ptr + complete[j]); complete[j] += width_wrap[j]; /* We've done THIS much */ cols_todo = true; /* And there is more to do... */ border_cell = ':'; } else { fprintf(fout, "%-s", this_line->ptr + complete[j]); fprintf(fout, "%*s", width_wrap[j] - strlen_remaining, ""); complete[j] += strlen_remaining; border_cell = '|'; } } /* print a divider, middle of columns only */ if ((j + 1) % col_count) { if (opt_border == 0) fputc(' ', fout); else if (line_count == 0) fprintf(fout, " %c ", border_cell); else fprintf(fout, " %c ", complete[j + 1] ? ' ' : ':'); } } /* end of row border */ if (opt_border == 2) fprintf(fout, " %c", border_cell); fputc('\n', fout); } /* * Check if any columns have line continuations due to \n in the * cell. */ line_count++; line_todo = false; for (j = 0; j < col_count; j++) { if (line_count < heights[j]) { if (col_lineptrs[j][line_count].ptr) { line_todo = true; complete[j] = 0; } } } } } if (opt->stop_table) { if (opt_border == 2 && !cancel_pressed) _print_horizontal_line(col_count, width_wrap, opt_border, fout); /* print footers */ if (footers && !opt_tuples_only && !cancel_pressed) for (ptr = footers; *ptr; ptr++) fprintf(fout, "%s\n", *ptr); /* * for some reason MinGW (and MSVC) outputs an extra newline, so this * suppresses it */ #ifndef WIN32 fputc('\n', fout); #endif } /* clean up */ free(width_header); free(width_average); free(width_max); free(width_wrap); free(heights); free(col_lineptrs); free(format_space); free(complete); free(lineptr_list); for (i = 0; i < col_count; i++) free(format_buf[i]); free(format_buf); } static void print_aligned_vertical(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; int encoding = opt->encoding; unsigned int col_count = 0; unsigned long record = opt->prior_records + 1; const char *const * ptr; unsigned int i, hwidth = 0, dwidth = 0, hheight = 1, dheight = 1, hformatsize = 0, dformatsize = 0; char *divider; unsigned int cell_count = 0; struct lineptr *hlineptr, *dlineptr; if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; if (cells[0] == NULL && opt->start_table && opt->stop_table) { fprintf(fout, _("(No rows)\n")); return; } /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; /* Find the maximum dimensions for the headers */ for (i = 0; i < col_count; i++) { int width, height, fs; pg_wcssize((unsigned char *) headers[i], strlen(headers[i]), encoding, &width, &height, &fs); if (width > hwidth) hwidth = width; if (height > hheight) hheight = height; if (fs > hformatsize) hformatsize = fs; } /* Count cells, find their lengths */ for (ptr = cells; *ptr; ptr++) cell_count++; /* find longest data cell */ for (i = 0, ptr = cells; *ptr; ptr++, i++) { int numeric_locale_len; int width, height, fs; if (opt_align[i % col_count] == 'r' && opt_numeric_locale) numeric_locale_len = additional_numeric_locale_len(*ptr); else numeric_locale_len = 0; pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding, &width, &height, &fs); width += numeric_locale_len; if (width > dwidth) dwidth = width; if (height > dheight) dheight = height; if (fs > dformatsize) dformatsize = fs; } /* * We now have all the information we need to setup the formatting * structures */ dlineptr = pg_local_malloc(sizeof(*dlineptr) * dheight); hlineptr = pg_local_malloc(sizeof(*hlineptr) * hheight); dlineptr->ptr = pg_local_malloc(dformatsize); hlineptr->ptr = pg_local_malloc(hformatsize); /* make horizontal border */ divider = pg_local_malloc(hwidth + dwidth + 10); divider[0] = '\0'; if (opt_border == 2) strcat(divider, "+-"); for (i = 0; i < hwidth; i++) strcat(divider, opt_border > 0 ? "-" : " "); if (opt_border > 0) strcat(divider, "-+-"); else strcat(divider, " "); for (i = 0; i < dwidth; i++) strcat(divider, opt_border > 0 ? "-" : " "); if (opt_border == 2) strcat(divider, "-+"); if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) fprintf(fout, "%s\n", title); } /* print records */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { int line_count, dcomplete, hcomplete; if (i % col_count == 0) { if (cancel_pressed) break; if (!opt_tuples_only) { char record_str[64]; size_t record_str_len; if (opt_border == 0) snprintf(record_str, 64, "* Record %lu", record++); else snprintf(record_str, 64, "[ RECORD %lu ]", record++); record_str_len = strlen(record_str); if (record_str_len + opt_border > strlen(divider)) fprintf(fout, "%.*s%s\n", opt_border, divider, record_str); else { char *div_copy = strdup(divider); if (!div_copy) { fprintf(stderr, _("out of memory\n")); exit(EXIT_FAILURE); } strncpy(div_copy + opt_border, record_str, record_str_len); fprintf(fout, "%s\n", div_copy); free(div_copy); } } else if (i != 0 || !opt->start_table || opt_border == 2) fprintf(fout, "%s\n", divider); } /* Format the header */ pg_wcsformat((unsigned char *) headers[i % col_count], strlen(headers[i % col_count]), encoding, hlineptr, hheight); /* Format the data */ pg_wcsformat((unsigned char *) *ptr, strlen(*ptr), encoding, dlineptr, dheight); line_count = 0; dcomplete = hcomplete = 0; while (!dcomplete || !hcomplete) { if (opt_border == 2) fputs("| ", fout); if (!hcomplete) { fprintf(fout, "%-s%*s", hlineptr[line_count].ptr, hwidth - hlineptr[line_count].width, ""); if (line_count == (hheight - 1) || !hlineptr[line_count + 1].ptr) hcomplete = 1; } else fprintf(fout, "%*s", hwidth, ""); if (opt_border > 0) fprintf(fout, " %c ", (line_count == 0) ? '|' : ':'); else fputs(" ", fout); if (!dcomplete) { if (opt_align[i % col_count] == 'r' && opt_numeric_locale) { char *my_cell = format_numeric_locale((char *) dlineptr[line_count].ptr); if (opt_border < 2) fprintf(fout, "%s\n", my_cell); else fprintf(fout, "%-s%*s |\n", my_cell, (int) (dwidth - strlen(my_cell)), ""); free(my_cell); } else { if (opt_border < 2) fprintf(fout, "%s\n", dlineptr[line_count].ptr); else fprintf(fout, "%-s%*s |\n", dlineptr[line_count].ptr, dwidth - dlineptr[line_count].width, ""); } if (line_count == dheight - 1 || !dlineptr[line_count + 1].ptr) dcomplete = 1; } else { if (opt_border < 2) fputc('\n', fout); else fprintf(fout, "%*s |\n", dwidth, ""); } line_count++; } } if (opt->stop_table) { if (opt_border == 2 && !cancel_pressed) fprintf(fout, "%s\n", divider); /* print footers */ if (!opt_tuples_only && footers && *footers && !cancel_pressed) { if (opt_border < 2) fputc('\n', fout); for (ptr = footers; *ptr; ptr++) fprintf(fout, "%s\n", *ptr); } fputc('\n', fout); } free(divider); free(hlineptr->ptr); free(dlineptr->ptr); free(hlineptr); free(dlineptr); } /**********************/ /* HTML printing ******/ /**********************/ void html_escaped_print(const char *in, FILE *fout) { const char *p; bool leading_space = true; for (p = in; *p; p++) { switch (*p) { case '&': fputs("&", fout); break; case '<': fputs("<", fout); break; case '>': fputs(">", fout); break; case '\n': fputs("<br />\n", fout); break; case '"': fputs(""", fout); break; case ' ': /* protect leading space, for EXPLAIN output */ if (leading_space) fputs(" ", fout); else fputs(" ", fout); break; default: fputc(*p, fout); } if (*p != ' ') leading_space = false; } } static void print_html_text(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; const char *opt_table_attr = opt->tableAttr; unsigned int col_count = 0; unsigned int i; const char *const * ptr; if (cancel_pressed) return; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { fprintf(fout, "<table border=\"%d\"", opt_border); if (opt_table_attr) fprintf(fout, " %s", opt_table_attr); fputs(">\n", fout); /* print title */ if (!opt_tuples_only && title) { fputs(" <caption>", fout); html_escaped_print(title, fout); fputs("</caption>\n", fout); } /* print headers */ if (!opt_tuples_only) { fputs(" <tr>\n", fout); for (ptr = headers; *ptr; ptr++) { fputs(" <th align=\"center\">", fout); html_escaped_print(*ptr, fout); fputs("</th>\n", fout); } fputs(" </tr>\n", fout); } } /* print cells */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (i % col_count == 0) { if (cancel_pressed) break; fputs(" <tr valign=\"top\">\n", fout); } fprintf(fout, " <td align=\"%s\">", opt_align[(i) % col_count] == 'r' ? "right" : "left"); /* is string only whitespace? */ if ((*ptr)[strspn(*ptr, " \t")] == '\0') fputs(" ", fout); else if (opt_align[i % col_count] == 'r' && opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); html_escaped_print(my_cell, fout); free(my_cell); } else html_escaped_print(*ptr, fout); fputs("</td>\n", fout); if ((i + 1) % col_count == 0) fputs(" </tr>\n", fout); } if (opt->stop_table) { fputs("</table>\n", fout); /* print footers */ if (!opt_tuples_only && footers && *footers && !cancel_pressed) { fputs("<p>", fout); for (ptr = footers; *ptr; ptr++) { html_escaped_print(*ptr, fout); fputs("<br />\n", fout); } fputs("</p>", fout); } fputc('\n', fout); } } static void print_html_vertical(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; const char *opt_table_attr = opt->tableAttr; unsigned int col_count = 0; unsigned long record = opt->prior_records + 1; unsigned int i; const char *const * ptr; if (cancel_pressed) return; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { fprintf(fout, "<table border=\"%d\"", opt_border); if (opt_table_attr) fprintf(fout, " %s", opt_table_attr); fputs(">\n", fout); /* print title */ if (!opt_tuples_only && title) { fputs(" <caption>", fout); html_escaped_print(title, fout); fputs("</caption>\n", fout); } } /* print records */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (i % col_count == 0) { if (cancel_pressed) break; if (!opt_tuples_only) fprintf(fout, "\n <tr><td colspan=\"2\" align=\"center\">Record %lu</td></tr>\n", record++); else fputs("\n <tr><td colspan=\"2\"> </td></tr>\n", fout); } fputs(" <tr valign=\"top\">\n" " <th>", fout); html_escaped_print(headers[i % col_count], fout); fputs("</th>\n", fout); fprintf(fout, " <td align=\"%s\">", opt_align[i % col_count] == 'r' ? "right" : "left"); /* is string only whitespace? */ if ((*ptr)[strspn(*ptr, " \t")] == '\0') fputs(" ", fout); else if (opt_align[i % col_count] == 'r' && opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); html_escaped_print(my_cell, fout); free(my_cell); } else html_escaped_print(*ptr, fout); fputs("</td>\n </tr>\n", fout); } if (opt->stop_table) { fputs("</table>\n", fout); /* print footers */ if (!opt_tuples_only && footers && *footers && !cancel_pressed) { fputs("<p>", fout); for (ptr = footers; *ptr; ptr++) { html_escaped_print(*ptr, fout); fputs("<br />\n", fout); } fputs("</p>", fout); } fputc('\n', fout); } } /*************************/ /* LaTeX */ /*************************/ static void latex_escaped_print(const char *in, FILE *fout) { const char *p; for (p = in; *p; p++) switch (*p) { case '&': fputs("\\&", fout); break; case '%': fputs("\\%", fout); break; case '$': fputs("\\$", fout); break; case '_': fputs("\\_", fout); break; case '{': fputs("\\{", fout); break; case '}': fputs("\\}", fout); break; case '\\': fputs("\\backslash", fout); break; case '\n': fputs("\\\\", fout); break; default: fputc(*p, fout); } } static void print_latex_text(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; unsigned int col_count = 0; unsigned int i; const char *const * ptr; if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) { fputs("\\begin{center}\n", fout); latex_escaped_print(title, fout); fputs("\n\\end{center}\n\n", fout); } /* begin environment and set alignments and borders */ fputs("\\begin{tabular}{", fout); if (opt_border == 2) fputs("| ", fout); for (i = 0; i < col_count; i++) { fputc(*(opt_align + i), fout); if (opt_border != 0 && i < col_count - 1) fputs(" | ", fout); } if (opt_border == 2) fputs(" |", fout); fputs("}\n", fout); if (!opt_tuples_only && opt_border == 2) fputs("\\hline\n", fout); /* print headers */ if (!opt_tuples_only) { for (i = 0, ptr = headers; i < col_count; i++, ptr++) { if (i != 0) fputs(" & ", fout); fputs("\\textit{", fout); latex_escaped_print(*ptr, fout); fputc('}', fout); } fputs(" \\\\\n", fout); fputs("\\hline\n", fout); } } /* print cells */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); latex_escaped_print(my_cell, fout); free(my_cell); } else latex_escaped_print(*ptr, fout); if ((i + 1) % col_count == 0) { fputs(" \\\\\n", fout); if (cancel_pressed) break; } else fputs(" & ", fout); } if (opt->stop_table) { if (opt_border == 2) fputs("\\hline\n", fout); fputs("\\end{tabular}\n\n\\noindent ", fout); /* print footers */ if (footers && !opt_tuples_only && !cancel_pressed) { for (ptr = footers; *ptr; ptr++) { latex_escaped_print(*ptr, fout); fputs(" \\\\\n", fout); } } fputc('\n', fout); } } static void print_latex_vertical(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; unsigned int col_count = 0; unsigned long record = opt->prior_records + 1; unsigned int i; const char *const * ptr; (void) opt_align; /* currently unused parameter */ if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) { fputs("\\begin{center}\n", fout); latex_escaped_print(title, fout); fputs("\n\\end{center}\n\n", fout); } /* begin environment and set alignments and borders */ fputs("\\begin{tabular}{", fout); if (opt_border == 0) fputs("cl", fout); else if (opt_border == 1) fputs("c|l", fout); else if (opt_border == 2) fputs("|c|l|", fout); fputs("}\n", fout); } /* print records */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { /* new record */ if (i % col_count == 0) { if (cancel_pressed) break; if (!opt_tuples_only) { if (opt_border == 2) { fputs("\\hline\n", fout); fprintf(fout, "\\multicolumn{2}{|c|}{\\textit{Record %lu}} \\\\\n", record++); } else fprintf(fout, "\\multicolumn{2}{c}{\\textit{Record %lu}} \\\\\n", record++); } if (opt_border >= 1) fputs("\\hline\n", fout); } latex_escaped_print(headers[i % col_count], fout); fputs(" & ", fout); latex_escaped_print(*ptr, fout); fputs(" \\\\\n", fout); } if (opt->stop_table) { if (opt_border == 2) fputs("\\hline\n", fout); fputs("\\end{tabular}\n\n\\noindent ", fout); /* print footers */ if (footers && !opt_tuples_only && !cancel_pressed) { for (ptr = footers; *ptr; ptr++) { if (opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); latex_escaped_print(my_cell, fout); free(my_cell); } else latex_escaped_print(*ptr, fout); fputs(" \\\\\n", fout); } } fputc('\n', fout); } } /*************************/ /* Troff -ms */ /*************************/ static void troff_ms_escaped_print(const char *in, FILE *fout) { const char *p; for (p = in; *p; p++) switch (*p) { case '\\': fputs("\\(rs", fout); break; default: fputc(*p, fout); } } static void print_troff_ms_text(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; unsigned int col_count = 0; unsigned int i; const char *const * ptr; if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) { fputs(".LP\n.DS C\n", fout); troff_ms_escaped_print(title, fout); fputs("\n.DE\n", fout); } /* begin environment and set alignments and borders */ fputs(".LP\n.TS\n", fout); if (opt_border == 2) fputs("center box;\n", fout); else fputs("center;\n", fout); for (i = 0; i < col_count; i++) { fputc(*(opt_align + i), fout); if (opt_border > 0 && i < col_count - 1) fputs(" | ", fout); } fputs(".\n", fout); /* print headers */ if (!opt_tuples_only) { for (i = 0, ptr = headers; i < col_count; i++, ptr++) { if (i != 0) fputc('\t', fout); fputs("\\fI", fout); troff_ms_escaped_print(*ptr, fout); fputs("\\fP", fout); } fputs("\n_\n", fout); } } /* print cells */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { if (opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); troff_ms_escaped_print(my_cell, fout); free(my_cell); } else troff_ms_escaped_print(*ptr, fout); if ((i + 1) % col_count == 0) { fputc('\n', fout); if (cancel_pressed) break; } else fputc('\t', fout); } if (opt->stop_table) { fputs(".TE\n.DS L\n", fout); /* print footers */ if (footers && !opt_tuples_only && !cancel_pressed) for (ptr = footers; *ptr; ptr++) { troff_ms_escaped_print(*ptr, fout); fputc('\n', fout); } fputs(".DE\n", fout); } } static void print_troff_ms_vertical(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *opt_align, const printTableOpt *opt, FILE *fout) { bool opt_tuples_only = opt->tuples_only; bool opt_numeric_locale = opt->numericLocale; unsigned short int opt_border = opt->border; unsigned int col_count = 0; unsigned long record = opt->prior_records + 1; unsigned int i; const char *const * ptr; unsigned short current_format = 0; /* 0=none, 1=header, 2=body */ (void) opt_align; /* currently unused parameter */ if (cancel_pressed) return; if (opt_border > 2) opt_border = 2; /* count columns */ for (ptr = headers; *ptr; ptr++) col_count++; if (opt->start_table) { /* print title */ if (!opt_tuples_only && title) { fputs(".LP\n.DS C\n", fout); troff_ms_escaped_print(title, fout); fputs("\n.DE\n", fout); } /* begin environment and set alignments and borders */ fputs(".LP\n.TS\n", fout); if (opt_border == 2) fputs("center box;\n", fout); else fputs("center;\n", fout); /* basic format */ if (opt_tuples_only) fputs("c l;\n", fout); } else current_format = 2; /* assume tuples printed already */ /* print records */ for (i = 0, ptr = cells; *ptr; i++, ptr++) { /* new record */ if (i % col_count == 0) { if (cancel_pressed) break; if (!opt_tuples_only) { if (current_format != 1) { if (opt_border == 2 && record > 1) fputs("_\n", fout); if (current_format != 0) fputs(".T&\n", fout); fputs("c s.\n", fout); current_format = 1; } fprintf(fout, "\\fIRecord %lu\\fP\n", record++); } if (opt_border >= 1) fputs("_\n", fout); } if (!opt_tuples_only) { if (current_format != 2) { if (current_format != 0) fputs(".T&\n", fout); if (opt_border != 1) fputs("c l.\n", fout); else fputs("c | l.\n", fout); current_format = 2; } } troff_ms_escaped_print(headers[i % col_count], fout); fputc('\t', fout); if (opt_numeric_locale) { char *my_cell = format_numeric_locale(*ptr); troff_ms_escaped_print(my_cell, fout); free(my_cell); } else troff_ms_escaped_print(*ptr, fout); fputc('\n', fout); } if (opt->stop_table) { fputs(".TE\n.DS L\n", fout); /* print footers */ if (footers && !opt_tuples_only && !cancel_pressed) for (ptr = footers; *ptr; ptr++) { troff_ms_escaped_print(*ptr, fout); fputc('\n', fout); } fputs(".DE\n", fout); } } /********************************/ /* Public functions */ /********************************/ /* * PageOutput * * Tests if pager is needed and returns appropriate FILE pointer. */ FILE * PageOutput(int lines, unsigned short int pager) { /* check whether we need / can / are supposed to use pager */ if (pager #ifndef WIN32 && isatty(fileno(stdin)) && isatty(fileno(stdout)) #endif ) { const char *pagerprog; FILE *pagerpipe; #ifdef TIOCGWINSZ int result; struct winsize screen_size; result = ioctl(fileno(stdout), TIOCGWINSZ, &screen_size); /* >= accounts for a one-line prompt */ if (result == -1 || lines >= screen_size.ws_row || pager > 1) { #endif pagerprog = getenv("PAGER"); if (!pagerprog) pagerprog = DEFAULT_PAGER; #ifndef WIN32 pqsignal(SIGPIPE, SIG_IGN); #endif pagerpipe = popen(pagerprog, "w"); if (pagerpipe) return pagerpipe; #ifdef TIOCGWINSZ } #endif } return stdout; } /* * ClosePager * * Close previously opened pager pipe, if any */ void ClosePager(FILE *pagerpipe) { if (pagerpipe && pagerpipe != stdout) { /* * If printing was canceled midstream, warn about it. * * Some pagers like less use Ctrl-C as part of their command set. Even * so, we abort our processing and warn the user what we did. If the * pager quit as a result of the SIGINT, this message won't go * anywhere ... */ if (cancel_pressed) fprintf(pagerpipe, _("Interrupted\n")); pclose(pagerpipe); #ifndef WIN32 pqsignal(SIGPIPE, SIG_DFL); #endif } } void printTable(const char *title, const char *const * headers, const char *const * cells, const char *const * footers, const char *align, const printTableOpt *opt, FILE *fout, FILE *flog) { static const char *default_footer[] = {NULL}; FILE *output; if (cancel_pressed) return; if (opt->format == PRINT_NOTHING) return; if (!footers) footers = default_footer; if (fout == stdout) { int col_count = 0, row_count = 0, lines; const char *const * ptr; /* rough estimate of columns and rows */ if (headers) for (ptr = headers; *ptr; ptr++) col_count++; if (cells) for (ptr = cells; *ptr; ptr++) row_count++; if (col_count > 0) row_count /= col_count; if (opt->expanded) lines = (col_count + 1) * row_count; else lines = row_count + 1; if (footers && !opt->tuples_only) for (ptr = footers; *ptr; ptr++) lines++; output = PageOutput(lines, opt->pager); } else output = fout; /* print the stuff */ if (flog) print_aligned_text(title, headers, cells, footers, align, opt, flog); switch (opt->format) { case PRINT_UNALIGNED: if (opt->expanded) print_unaligned_vertical(title, headers, cells, footers, align, opt, output); else print_unaligned_text(title, headers, cells, footers, align, opt, output); break; case PRINT_ALIGNED: case PRINT_WRAP: if (opt->expanded) print_aligned_vertical(title, headers, cells, footers, align, opt, output); else print_aligned_text(title, headers, cells, footers, align, opt, output); break; case PRINT_HTML: if (opt->expanded) print_html_vertical(title, headers, cells, footers, align, opt, output); else print_html_text(title, headers, cells, footers, align, opt, output); break; case PRINT_LATEX: if (opt->expanded) print_latex_vertical(title, headers, cells, footers, align, opt, output); else print_latex_text(title, headers, cells, footers, align, opt, output); break; case PRINT_TROFF_MS: if (opt->expanded) print_troff_ms_vertical(title, headers, cells, footers, align, opt, output); else print_troff_ms_text(title, headers, cells, footers, align, opt, output); break; default: fprintf(stderr, _("invalid output format (internal error): %d"), opt->format); exit(EXIT_FAILURE); } /* Only close if we used the pager */ if (output != fout) ClosePager(output); } void printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *flog) { int ntuples; int nfields; int ncells; const char **headers; const char **cells; char **footers; char *align; int i, r, c; if (cancel_pressed) return; /* extract headers */ ntuples = PQntuples(result); nfields = PQnfields(result); headers = pg_local_calloc(nfields + 1, sizeof(*headers)); for (i = 0; i < nfields; i++) { headers[i] = (char *) mbvalidate((unsigned char *) PQfname(result, i), opt->topt.encoding); #ifdef ENABLE_NLS if (opt->trans_headers) headers[i] = _(headers[i]); #endif } /* set cells */ ncells = ntuples * nfields; cells = pg_local_calloc(ncells + 1, sizeof(*cells)); i = 0; for (r = 0; r < ntuples; r++) { for (c = 0; c < nfields; c++) { if (PQgetisnull(result, r, c)) cells[i] = opt->nullPrint ? opt->nullPrint : ""; else { cells[i] = (char *) mbvalidate((unsigned char *) PQgetvalue(result, r, c), opt->topt.encoding); #ifdef ENABLE_NLS if (opt->trans_columns && opt->trans_columns[c]) cells[i] = _(cells[i]); #endif } i++; } } /* set footers */ if (opt->footers) footers = opt->footers; else if (!opt->topt.expanded && opt->default_footer) { unsigned long total_records; footers = pg_local_calloc(2, sizeof(*footers)); footers[0] = pg_local_malloc(100); total_records = opt->topt.prior_records + ntuples; if (total_records == 1) snprintf(footers[0], 100, _("(1 row)")); else snprintf(footers[0], 100, _("(%lu rows)"), total_records); } else footers = NULL; /* set alignment */ align = pg_local_calloc(nfields + 1, sizeof(*align)); for (i = 0; i < nfields; i++) { Oid ftype = PQftype(result, i); switch (ftype) { case INT2OID: case INT4OID: case INT8OID: case FLOAT4OID: case FLOAT8OID: case NUMERICOID: case OIDOID: case XIDOID: case CIDOID: case CASHOID: align[i] = 'r'; break; default: align[i] = 'l'; break; } } /* call table printer */ printTable(opt->title, headers, cells, (const char *const *) footers, align, &opt->topt, fout, flog); free(headers); free(cells); if (footers && !opt->footers) { free(footers[0]); free(footers); } free(align); } void setDecimalLocale(void) { struct lconv *extlconv; extlconv = localeconv(); if (*extlconv->decimal_point) decimal_point = strdup(extlconv->decimal_point); else decimal_point = "."; /* SQL output standard */ if (*extlconv->grouping && atoi(extlconv->grouping) > 0) grouping = strdup(extlconv->grouping); else grouping = "3"; /* most common */ /* similar code exists in formatting.c */ if (*extlconv->thousands_sep) thousands_sep = strdup(extlconv->thousands_sep); /* Make sure thousands separator doesn't match decimal point symbol. */ else if (strcmp(decimal_point, ",") != 0) thousands_sep = ","; else thousands_sep = "."; }
pgsql-patches by date: