X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fecho.c;h=fe148ab8359abf9a3221299ae9733e3c46361e2b;hb=679e253a4777564db48ccec70b8ce2f6e5b7e46b;hp=09c42382ead50dcdd78fe0d352ff3e01934cf508;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp
diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 09c42382ea..fe148ab835 100644
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,22 +1,18 @@
-/* PSPP - computes sample statistics. -*-c-*-
-
+/* PSPP - a program for statistical analysis.
Copyright (C) 2005 Free Software Foundation, Inc.
- Written by John Darrington 2005
- 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
#include
@@ -29,19 +25,19 @@
/* Echos a string to the output stream */
int
-cmd_echo(void)
+cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
{
struct tab_table *tab;
- if (token != T_STRING)
+ if (lex_token (lexer) != T_STRING)
return CMD_FAILURE;
-
+
tab = tab_create(1, 1, 0);
tab_dim (tab, tab_natural_dimensions);
tab_flags (tab, SOMF_NO_TITLE );
- tab_text(tab, 0, 0, 0, tokstr.string);
+ tab_text(tab, 0, 0, 0, ds_cstr (lex_tokstr (lexer)));
tab_submit(tab);