X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fecho.c;h=02db23ae568c921c8aae43be0fa6bc44b9b913bf;hb=9aac12c2130257396c9ee4ee7860f618dcb202b0;hp=5405d060f0da33694ab24e7b157836915893853b;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp-builds.git

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 5405d060..02db23ae 100644
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,7 +1,6 @@
 /* PSPP - computes sample statistics. -*-c-*-
 
    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
@@ -29,11 +28,11 @@
 
 /* Echos a string to the output stream */
 int
-cmd_echo (struct dataset *ds UNUSED)
+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);
@@ -41,7 +40,7 @@ cmd_echo (struct dataset *ds UNUSED)
   tab_dim (tab, tab_natural_dimensions);
   tab_flags (tab, SOMF_NO_TITLE );
 
-  tab_text(tab, 0, 0, 0, ds_cstr (&tokstr));
+  tab_text(tab, 0, 0, 0, ds_cstr (lex_tokstr (lexer)));
 
   tab_submit(tab);