Adopt use of gnulib for portability.

[pspp] / src / lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index 53b702c4e8bb1ba851d4f767ef463b55d7d71ba1..fe999ff1aff50c24c783bab6a96dfa12dcd3d9a6 100644 (file)
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -29,11 +29,15 @@
 #include "alloc.h"
 #include "command.h"
 #include "error.h"
-#include "getline.h"
+#include "getl.h"
 #include "magic.h"
 #include "settings.h"
 #include "str.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 /*
 #define DUMP_TOKENS 1
 */
@@ -116,7 +120,7 @@ restore_token (void)
   assert (put_token != 0);
   token = put_token;
   ds_replace (&tokstr, ds_c_str (&put_tokstr));
-  st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+  str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
   tokval = put_tokval;
   put_token = 0;
 }
@@ -358,7 +362,7 @@ lex_get (void)
            ds_putc (&tokstr, *prog++);
 
          /* Copy tokstr to tokid, possibly truncating it.*/
-         st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+         str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
 
           /* Determine token type. */
          token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
@@ -720,7 +724,7 @@ lex_put_back_id (const char *id)
   save_token ();
   token = T_ID;
   ds_replace (&tokstr, id);
-  st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+  str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
 }
 \f
 /* Weird line processing functions. */