texpect: Do not depend on ccan

texpect is the only remaining user of ccan code. Copy in the two routines

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index 9256b5ee31f7833ab8bf64a56ad4c4478756f918..b553de8ca5ca543a1f4ffc6b61ec85c2cad9c3fb 100644 (file)
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -56,7 +56,33 @@
 #ifdef HAVE_ERR_H
 #include <err.h>
 #else
-#include <ccan/err/err.h>
+const char progname[] = "unknown program";
+
+static void err(int eval, const char *fmt, ...)
+{
+       int err_errno = errno;
+       va_list ap;
+
+       fprintf(stderr, "%s: ", progname);
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       fprintf(stderr, ": %s\n", strerror(err_errno));
+       exit(eval);
+}
+
+static void errx(int eval, const char *fmt, ...)
+{
+       va_list ap;
+
+       fprintf(stderr, "%s: ", progname);
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       fprintf(stderr, "\n");
+       exit(eval);
+}
+
 #endif
 
 struct command {

diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index 3dd4740a13ffe8bec717091c95d56a6b0381539c..62a1d4dbb94a57da80ab5defe39e9bf3c9c6e625 100644 (file)
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -4,4 +4,4 @@ def configure(conf):
     conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h')
 
 def build(bld):
-    bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util ccan', install=False)
+    bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False)

diff --git a/wscript b/wscript
index 215bcaf4adc6f8b528bb4e3d80faadc2e937c727..4e06576080606b19cba52cbac7bd2d6f69666729 100644 (file)
--- a/wscript
+++ b/wscript
@@ -151,7 +151,6 @@ def configure(conf):
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
-    conf.RECURSE('lib/ccan')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
     conf.RECURSE('nsswitch')

diff --git a/wscript_build b/wscript_build
index 4e5806351084401c0219e0d4a1bfabb7545d2556..877fa8b17ee883e3f416f8dcf4426cd69e17489f 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -41,7 +41,6 @@ bld.RECURSE('lib/talloc')
 bld.RECURSE('lib/tevent')
 bld.RECURSE('lib/texpect')
 bld.RECURSE('lib/addns')
-bld.RECURSE('lib/ccan')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')