X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=e377cb41c96a944974252f74c52703b2d0e069bf;hb=b74d09af5e07f954c18e7cdb8aca3af47fa10208;hp=4e1f8a18c3b65efb25606e6e5926aa9e76e97cc6;hpb=77e551d23575da6b89f866612ab39c2b0497c9be;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 4e1f8a18..e377cb41 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -18,27 +18,30 @@ 02110-1301, USA. */ #include -#include + #include #include -#include + +#include "intprops.h" +#include "size_max.h" #include -#include -#include #include -#include "intprops.h" +#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include +#include #include #include -#include -#include "size_max.h" #include +#include #include -#include -#include -#include #include "gettext.h" #define _(msgid) gettext (msgid) @@ -72,19 +75,19 @@ static struct cmd_list cmd; static int case_idx; /* Line buffer. */ -static char *line_buf; +static struct string line_buffer; /* TTY-style output functions. */ static unsigned n_lines_remaining (struct outp_driver *d); static unsigned n_chars_width (struct outp_driver *d); -static void write_line (struct outp_driver *d, char *s); +static void write_line (struct outp_driver *d, const char *s); /* Other functions. */ -static bool list_cases (struct ccase *, void *); +static bool list_cases (const struct ccase *, void *); static void determine_layout (void); static void clean_up (void); static void write_header (struct outp_driver *); -static void write_all_headers (void *); +static void write_all_headers (const struct ccase *, void *); /* Returns the number of text lines that can fit on the remainder of the page. */ @@ -108,14 +111,14 @@ n_chars_width (struct outp_driver *d) /* Writes the line S at the current position and advances to the next line. */ static void -write_line (struct outp_driver *d, char *s) +write_line (struct outp_driver *d, const char *s) { struct outp_text text; assert (d->cp_y + d->font_height <= d->length); text.font = OUTP_FIXED; text.justification = OUTP_LEFT; - ls_init (&text.string, s, strlen (s)); + text.string = ss_cstr (s); text.x = d->cp_x; text.y = d->cp_y; text.h = text.v = INT_MAX; @@ -227,7 +230,7 @@ cmd_list (void) case_idx = 0; ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL); - free (line_buf); + ds_destroy(&line_buffer); clean_up (); @@ -237,10 +240,11 @@ cmd_list (void) /* Writes headers to all devices. This is done at the beginning of each SPLIT FILE group. */ static void -write_all_headers (void *aux UNUSED) +write_all_headers (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; + output_split_file_values (c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { if (!d->class->special) @@ -407,7 +411,7 @@ write_varname (struct outp_driver *d, char *string, int indent) text.font = OUTP_FIXED; text.justification = OUTP_LEFT; - ls_init (&text.string, string, strlen (string)); + text.string = ss_cstr (string); text.x = d->cp_x; text.y = d->cp_y; text.h = text.v = INT_MAX; @@ -434,6 +438,7 @@ write_fallback_headers (struct outp_driver *d) while (index < cmd.n_variables) { struct outp_text text; + int leader_width; /* Ensure that there is enough room for a line of text. */ if (d->cp_y + d->font_height > d->length) @@ -443,12 +448,13 @@ write_fallback_headers (struct outp_driver *d) sprintf (leader, "%s %d:", Line, ++line_number); text.font = OUTP_FIXED; text.justification = OUTP_LEFT; - ls_init (&text.string, leader, strlen (leader)); + text.string = ss_cstr (leader); text.x = 0; text.y = d->cp_y; text.h = text.v = INT_MAX; d->class->text_draw (d, &text); - d->class->text_metrics (d, &text, &d->cp_x, NULL); + d->class->text_metrics (d, &text, &leader_width, NULL); + d->cp_x = leader_width; goto entry; do @@ -469,9 +475,10 @@ write_fallback_headers (struct outp_driver *d) } { - char varname[10]; - sprintf (varname, " %s", cmd.v_variables[index]->name); - write_varname (d, varname, text.h); + char varname[LONG_NAME_LEN + 2]; + snprintf (varname, sizeof varname, + " %s", cmd.v_variables[index]->name); + write_varname (d, varname, leader_width); } } while (++index < cmd.n_variables); @@ -597,12 +604,12 @@ determine_layout (void) d->cp_y += d->font_height; } - line_buf = xmalloc (max (1022, largest_page_width) + 2); + ds_init_empty (&line_buffer); } /* Writes case C to output. */ static bool -list_cases (struct ccase *c, void *aux UNUSED) +list_cases (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; @@ -617,10 +624,12 @@ list_cases (struct ccase *c, void *aux UNUSED) const struct list_ext *prc = d->prc; const int max_width = n_chars_width (d); int column; - int x = 0; if (!prc->header_rows) - x = nsprintf (line_buf, "%8s: ", cmd.v_variables[0]->name); + { + ds_put_format(&line_buffer, "%8s: ", cmd.v_variables[0]->name); + } + for (column = 0; column < cmd.n_variables; column++) { @@ -632,7 +641,8 @@ list_cases (struct ccase *c, void *aux UNUSED) else width = v->print.w; - if (width + x > max_width && x != 0) + if (width + ds_length(&line_buffer) > max_width && + ds_length(&line_buffer) != 0) { if (!n_lines_remaining (d)) { @@ -640,31 +650,34 @@ list_cases (struct ccase *c, void *aux UNUSED) write_header (d); } - line_buf[x] = 0; - write_line (d, line_buf); + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); - x = 0; if (!prc->header_rows) - x = nsprintf (line_buf, "%8s: ", v->name); + { + ds_put_format (&line_buffer, "%8s: ", v->name); + } } if (width > v->print.w) { - memset(&line_buf[x], ' ', width - v->print.w); - x += width - v->print.w; + ds_put_char_multiple(&line_buffer, ' ', width - v->print.w); } if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) - data_out (&line_buf[x], &v->print, case_data (c, v->fv)); + { + data_out (ds_put_uninit(&line_buffer, v->print.w), + &v->print, case_data (c, v->fv)); + } else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (&line_buf[x], &v->print, &case_idx_value); + data_out (ds_put_uninit(&line_buffer,v->print.w), + &v->print, &case_idx_value); } - x += v->print.w; - - line_buf[x++] = ' '; + + ds_put_char(&line_buffer, ' '); } if (!n_lines_remaining (d)) @@ -673,8 +686,8 @@ list_cases (struct ccase *c, void *aux UNUSED) write_header (d); } - line_buf[x] = 0; - write_line (d, line_buf); + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); } else if (d->class == &html_class) { @@ -687,7 +700,6 @@ list_cases (struct ccase *c, void *aux UNUSED) { struct variable *v = cmd.v_variables[column]; char buf[256]; - struct fixed_string s; if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) data_out (buf, &v->print, case_data (c, v->fv)); @@ -698,9 +710,8 @@ list_cases (struct ccase *c, void *aux UNUSED) data_out (buf, &v->print, &case_idx_value); } - ls_init (&s, buf, v->print.w); fputs (" ", x->file); - html_put_cell_contents (d, TAB_FIX, &s); + html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, v->print.w)); fputs ("\n", x->file); }