X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Ftitle.c;h=1bdb0e9a0db6487467d51aa958452cf91ef13637;hb=d75247c28e0dce9c21070e4ee14fdc6a2338fb77;hp=e7a463d10fde1b03690d4627486aae53a5fcd938;hpb=fad7434e2db08ed248228e03533b314b8335ef2f;p=pspp diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index e7a463d10f..1bdb0e9a0d 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -1,20 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000, 2007 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -26,12 +24,13 @@ #include #include #include -#include #include #include #include #include +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -76,7 +75,7 @@ get_title (struct lexer *lexer, const char *cmd, char **title) if (*title) free (*title); - *title = xstrdup (lex_rest_of_line (lexer, NULL)); + *title = xstrdup (lex_rest_of_line (lexer)); lex_discard_line (lexer); for (cp = *title; *cp; cp++) *cp = toupper ((unsigned char) (*cp)); @@ -90,7 +89,7 @@ cmd_file_label (struct lexer *lexer, struct dataset *ds) { const char *label; - label = lex_rest_of_line (lexer, NULL); + label = lex_rest_of_line (lexer); lex_discard_line (lexer); while (isspace ((unsigned char) *label)) label++; @@ -100,27 +99,14 @@ cmd_file_label (struct lexer *lexer, struct dataset *ds) return CMD_SUCCESS; } -/* Add LINE as a line of document information to dictionary - indented by INDENT spaces. */ +/* Add entry date line to DICT's documents. */ static void -add_document_line (struct dictionary *dict, const char *line, int indent) +add_document_trailer (struct dictionary *dict) { - const char *old_documents; - size_t old_len; - char *new_documents; - - old_documents = dict_get_documents (dict); - old_len = old_documents != NULL ? strlen (old_documents) : 0; - new_documents = xmalloc (old_len + 81); - - memcpy (new_documents, old_documents, old_len); - memset (new_documents + old_len, ' ', indent); - buf_copy_str_rpad (new_documents + old_len + indent, 80 - indent, line); - new_documents[old_len + 80] = '\0'; + char buf[64]; - dict_set_documents (dict, new_documents); - - free (new_documents); + sprintf (buf, _(" (Entered %s)"), get_start_date ()); + dict_add_document_line (dict, buf); } /* Performs the DOCUMENT command. */ @@ -128,40 +114,24 @@ int cmd_document (struct lexer *lexer, struct dataset *ds) { struct dictionary *dict = dataset_dict (ds); - /* Add a few header lines for reference. */ - { - char buf[256]; - - if (dict && dict_get_documents (dict)) - add_document_line (dict, "", 0); - - sprintf (buf, _("Document entered %s by %s:"), get_start_date (), version); - add_document_line (dict, buf, 1); - } + struct string line = DS_EMPTY_INITIALIZER; + bool end_dot; - for (;;) + do { - int had_dot; - const char *orig_line; - char *copy_line; + end_dot = lex_end_dot (lexer); + ds_assign_string (&line, lex_entire_line_ds (lexer)); + if (end_dot) + ds_put_char (&line, '.'); + dict_add_document_line (dict, ds_cstr (&line)); - orig_line = lex_rest_of_line (lexer, &had_dot); lex_discard_line (lexer); - while (isspace ((unsigned char) *orig_line)) - orig_line++; - - copy_line = xmalloc (strlen (orig_line) + 2); - strcpy (copy_line, orig_line); - if (had_dot) - strcat (copy_line, "."); - - add_document_line (dict, copy_line, 3); - free (copy_line); - lex_get_line (lexer); - if (had_dot) - break; } + while (!end_dot); + + add_document_trailer (dict); + ds_destroy (&line); return CMD_SUCCESS; } @@ -170,7 +140,7 @@ cmd_document (struct lexer *lexer, struct dataset *ds) int cmd_drop_documents (struct lexer *lexer, struct dataset *ds) { - dict_set_documents (dataset_dict (ds), NULL); + dict_clear_documents (dataset_dict (ds)); return lex_end_of_command (lexer); } @@ -180,49 +150,18 @@ cmd_drop_documents (struct lexer *lexer, struct dataset *ds) int cmd_add_documents (struct lexer *lexer, struct dataset *ds) { - int i; - int n_lines = 0; - char buf[256]; - struct string *lines = NULL; - - sprintf (buf, _("(Entered %s)"), get_start_date ()); + struct dictionary *dict = dataset_dict (ds); if ( ! lex_force_string (lexer) ) return CMD_FAILURE; while ( lex_is_string (lexer)) { - const struct string *s = lex_tokstr (lexer); - if ( ds_length (s) > 80) - { - /* Note to translators: "bytes" is correct, not characters */ - msg (SE, _("Document lines may not be more than 80 bytes long.")); - goto failure; - - } - lines = xrealloc (lines, (n_lines + 1) * sizeof (*lines)); - ds_init_string (&lines[n_lines++], s); - + dict_add_document_line (dict, ds_cstr (lex_tokstr (lexer))); lex_get (lexer); } - for ( i = 0 ; i < n_lines ; ++i) - { - add_document_line (dataset_dict (ds), ds_cstr (&lines[i]), 0); - ds_destroy (&lines[i]); - } - - free (lines); - - add_document_line (dataset_dict (ds), buf, 3); + add_document_trailer (dict); return lex_end_of_command (lexer) ; - - failure: - for ( i = 0 ; i < n_lines ; ++i) - ds_destroy (&lines[i]); - - free (lines); - - return CMD_FAILURE; }