Adopt use of gnulib for portability.

[pspp] / src / expressions / evaluate.c

diff --git a/src/expressions/evaluate.c b/src/expressions/evaluate.c
index b7f665d49bc461ff2366700516fd43e88315d415..4331d030ff65285761e1a5cf1f50287eedd156ea 100644 (file)
--- a/src/expressions/evaluate.c
+++ b/src/expressions/evaluate.c
@@ -20,17 +20,6 @@
 #include <config.h>
 #include "private.h"
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
 #include <ctype.h>
 #include "alloc.h"
 #include "error.h"
@@ -102,7 +91,7 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
   assert (e->type == OP_string);
   assert ((dst == NULL) == (dst_size == 0));
   expr_evaluate (e, c, case_idx, &s);
-  st_bare_pad_len_copy (dst, s.string, dst_size, s.length);
+  buf_copy_rpad (dst, dst_size, s.string, s.length);
 }
 \f
 #include "lexer.h"
@@ -289,7 +278,8 @@ expr_debug_print_postfix (const struct expression *e)
           break;
         case OP_string:
           fprintf (stderr, "s<%.*s>",
-                   (int) op->string.length, op->string.string);
+                   (int) op->string.length,
+                   op->string.string != NULL ? op->string.string : "");
           break;
         case OP_format:
           fprintf (stderr, "f<%s%d.%d>",