X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstr.c;h=081ffea5a74d36290c05450b3d5e52e04cd8fa90;hb=f3cf52b51e6d89e94190de22b1fa813e8d3746f7;hp=2a766520b135f8d01b01b7ca0a638c589fe459de;hpb=317e6b778833b5dcd5dd195c0b677835a8024b2a;p=pspp

diff --git a/src/str.c b/src/str.c
index 2a766520b1..081ffea5a7 100644
--- a/src/str.c
+++ b/src/str.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include "alloc.h"
 #include "error.h"
-#include "pool.h"
 
 /* sprintf() wrapper functions for convenience. */
 
@@ -79,8 +78,8 @@ nvsprintf (char *buf, const char *format, va_list args)
 void
 buf_reverse (char *p, size_t nbytes)
 {
-  unsigned char *h = p, *t = &h[nbytes - 1];
-  unsigned char temp;
+  char *h = p, *t = &h[nbytes - 1];
+  char temp;
 
   nbytes /= 2;
   while (nbytes--)
@@ -249,6 +248,21 @@ str_copy_trunc (char *dst, size_t dst_size, const char *src)
     }
 }
 
+/* Copies buffer SRC, of SRC_LEN bytes,
+   to DST, which is in a buffer DST_SIZE bytes long.
+   Truncates DST to DST_SIZE - 1 characters, if necessary. */
+void
+str_copy_buf_trunc (char *dst, size_t dst_size,
+                    const char *src, size_t src_size) 
+{
+  size_t dst_len;
+  assert (dst_size > 0);
+
+  dst_len = src_size < dst_size ? src_size : dst_size - 1;
+  memcpy (dst, src, dst_len);
+  dst[dst_len] = '\0';
+}
+
 /* Converts each character in S to uppercase. */
 void
 str_uppercase (char *s) 
@@ -306,6 +320,7 @@ void
 ds_destroy (struct string *st)
 {
   free (st->string);
+  st->string = NULL;
 }
 
 /* Truncates ST to zero length. */
@@ -452,7 +467,9 @@ ds_vprintf (struct string *st, const char *format, va_list args)
      been written. */
 
   int avail, needed;
+  va_list a1;
 
+  va_copy(a1, args);
   avail = st->capacity - st->length + 1;
   needed = vsnprintf (st->string + st->length, avail, format, args);
 
@@ -461,17 +478,22 @@ ds_vprintf (struct string *st, const char *format, va_list args)
     {
       ds_extend (st, st->length + needed);
       
-      vsprintf (st->string + st->length, format, args);
+      vsprintf (st->string + st->length, format, a1);
     }
   else
     while (needed == -1)
       {
+	va_list a2;
+	va_copy(a2, a1);
+
 	ds_extend (st, (st->capacity + 1) * 2);
 	avail = st->capacity - st->length + 1;
 
-	needed = vsnprintf (st->string + st->length, avail, format, args);
+	needed = vsnprintf (st->string + st->length, avail, format, a2);
+	va_end(a2);
 
       }
+  va_end(a1);
 
   st->length += needed;
 }