--- rxvt-unicode/src/rxvtvec.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvtvec.h	2003/11/27 10:12:10	1.4
@@ -7,6 +7,8 @@
 #include <cstring>
 #include "simplevec.h"
 
+#include <cstdio>
+
 #if 0
 template<typename T>
 struct rxvt_vec : simplevec<void *> {
@@ -32,4 +34,74 @@
   return first;
 }
 
+template<typename T>
+struct auto_ptr {
+  T *p;
+
+  auto_ptr() : p(0) { }
+  auto_ptr(T *a) : p(a) { }
+
+  auto_ptr(auto_ptr<T> &a)
+  {
+    p = a.p;
+    a.p = 0;
+  }
+
+  template<typename A>
+  auto_ptr(auto_ptr<A> &a)
+  {
+    p = a.p;
+    a.p = 0;
+  }
+
+  ~auto_ptr()
+  {
+    delete p;
+  }
+
+  // void because it makes sense in our context
+  void operator =(T *a)
+  {
+    delete p;
+    p = a;
+  }
+
+  void operator =(auto_ptr &a)
+  {
+    *this = a.p;
+    a.p = 0;
+  }
+
+  template<typename A>
+  void operator =(auto_ptr<A> &a)
+  {
+    *this = a.p;
+    a.p = 0;
+  }
+
+  operator T *() const { return p; }
+
+  T *operator ->() const { return p; }
+  T &operator *() const { return *p; }
+
+  T *get ()
+  {
+    T *r = p;
+    p = 0;
+    return r;
+  }
+};
+
+typedef auto_ptr<char> auto_str;
+
+struct stringvec : simplevec<char *>
+{
+  ~stringvec ()
+  {
+    for (char **c = begin(); c != end(); c++)
+      delete [] *c;
+  }
+};
+
 #endif
+