Reform string library.

[pspp-builds.git] / src / language / utilities / echo.c

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 33d569f4acc9e80ff176ef649cedc88257f95631..e4d8e685fbd39d1b953a4afab94879776907ff73 100644 (file)
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -19,13 +19,13 @@
    02110-1301, USA. */
 
 #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/alloc.h>
+#include <libpspp/str.h>
+#include <language/lexer/lexer.h>
+#include <language/command.h>
+#include <output/table.h>
+#include <output/manager.h>
 
 /* Echos a string to the output stream */
 int
@@ -41,7 +41,7 @@ cmd_echo(void)
   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 (&tokstr));
 
   tab_submit(tab);