X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fecho.c;h=19e9f9e54bf36b860b46f8d4681ce61660931b10;hb=c6fe58a22249f4f486b42f35fd8bd537c91e8e6e;hp=33d569f4acc9e80ff176ef649cedc88257f95631;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 33d569f4..19e9f9e5 100644
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,47 +1,44 @@
-/* PSPP - computes sample statistics. -*-c-*-
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
 
-   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 3 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 2 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "message.h"
-#include "alloc.h"
-#include "str.h"
-#include "lexer.h"
-#include "command.h"
-#include "table.h"
-#include "manager.h"
+#include <libpspp/message.h>
+#include <libpspp/str.h>
+#include <language/lexer/lexer.h>
+#include <language/command.h>
+#include <output/table.h>
+#include <output/manager.h>
+
+#include "xalloc.h"
 
 /* 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_dim (tab, tab_natural_dimensions, NULL);
   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);