diff options
| -rw-r--r-- | lib/texpect/texpect.c | 28 | ||||
| -rw-r--r-- | lib/texpect/wscript | 2 | ||||
| -rw-r--r-- | wscript | 1 | ||||
| -rw-r--r-- | wscript_build | 1 |
4 files changed, 28 insertions, 4 deletions
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c index 9256b5ee31f..b553de8ca5c 100644 --- 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 3dd4740a13f..62a1d4dbb94 100644 --- 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) @@ -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 4e580635108..877fa8b17ee 100644 --- 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') |