Move the compat.[ch] headers into common directory/

 * And the compat stuff in the p11-kit directory merged
   into util.c and util.h

4 files changed, 4 insertions, 294 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e38d1a4..cec6bfc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,8 @@ bin_PROGRAMS = \
 	p11-kit
 
 p11_kit_SOURCES = \
-	compat.c compat.h \
+	$(top_srcdir)/common/compat.c \
+	$(top_srcdir)/common/compat.h \
 	p11-kit.c
 
 p11_kit_LDADD = \
diff --git a/tools/compat.c b/tools/compat.c
deleted file mode 100644
index 93ba77c..0000000
--- a/tools/compat.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2011 Collabora Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include "compat.h"
-
-#ifndef HAVE_ERR_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-static const char *
-calc_prog_name (void)
-{
-	static char prognamebuf[256];
-	static int prepared = 0;
-
-	if(!prepared)
-	{
-		const char* beg = strrchr(__argv[0], '\\');
-		const char* temp = strrchr(__argv[0], '/');
-		beg = (beg > temp) ? beg : temp;
-		beg = (beg) ? beg + 1 : __argv[0];
-
-		temp = strrchr(__argv[0], '.');
-		temp = (temp > beg) ? temp : __argv[0] + strlen(__argv[0]);
-
-		if((temp - beg) > 255)
-			temp = beg + 255;
-
-		strncpy(prognamebuf, beg, temp - beg);
-		prognamebuf[temp - beg] = 0;
-		prepared = 1;
-	}
-
-	return prognamebuf;
-}
-
-static FILE *err_file; /* file to use for error output */
-
-/*
- * This is declared to take a `void *' so that the caller is not required
- * to include <stdio.h> first.  However, it is really a `FILE *', and the
- * manual page documents it as such.
- */
-void
-err_set_file (void *fp)
-{
-	if (fp)
-		err_file = fp;
-	else
-		err_file = stderr;
-}
-
-void
-err (int eval,
-     const char *fmt,
-     ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-verr (int eval,
-      const char *fmt,
-      va_list ap)
-{
-	verrc(eval, errno, fmt, ap);
-}
-
-void
-errc (int eval,
-      int code,
-      const char *fmt,
-      ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, code, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrc (int eval,
-       int code,
-       const char *fmt,
-       va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", calc_prog_name());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-	exit(eval);
-}
-
-void
-errx (int eval,
-      const char *fmt,
-      ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(eval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrx (int eval,
-       const char *fmt,
-       va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", calc_prog_name());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-	exit(eval);
-}
-
-void
-warn (const char *fmt,
-      ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarn (const char *fmt,
-       va_list ap)
-{
-	vwarnc(errno, fmt, ap);
-}
-
-void
-warnc (int code,
-       const char *fmt,
-       ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(code, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnc (int code,
-        const char *fmt,
-        va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", calc_prog_name());
-	if (fmt != NULL)
-	{
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-}
-
-void
-warnx (const char *fmt,
-       ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnx (const char *fmt,
-        va_list ap)
-{
-	if(err_file == 0)
-		err_set_file((FILE*)0);
-	fprintf(err_file, "%s: ", calc_prog_name());
-	if(fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-}
-
-#endif /* HAVE_ERR_H */
diff --git a/tools/compat.h b/tools/compat.h
deleted file mode 100644
index 1562964..0000000
--- a/tools/compat.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2011 Collabora Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __ERR_H__
-#define __ERR_H__
-
-#include "config.h"
-
-#ifdef HAVE_ERR_H
-#include <err.h>
-
-#else /* !HAVE_ERR_H */
-
-#include <stdarg.h>
-void err_set_file (void *fp);
-void err_set_exit (void (*ef)(int));
-void err (int eval, const char *fmt, ...);
-void verr (int eval, const char *fmt, va_list ap);
-void errc (int eval, int code, const char *fmt, ...);
-void verrc (int eval, int code, const char *fmt, va_list ap);
-void errx (int eval, const char *fmt, ...);
-void verrx (int eval, const char *fmt, va_list ap);
-void warn (const char *fmt, ...);
-void vwarn (const char *fmt, va_list ap);
-void warnc (int code, const char *fmt, ...);
-void vwarnc (int code, const char *fmt, va_list ap);
-void warnx (const char *fmt, ...);
-void vwarnx (const char *fmt, va_list ap);
-
-#endif /* !HAVE_ERR_H */
-
-#endif /* __ERR_H__ */
diff --git a/tools/p11-kit.c b/tools/p11-kit.c
index f63779e..d4b0759 100644
--- a/tools/p11-kit.c
+++ b/tools/p11-kit.c
@@ -34,7 +34,7 @@
 
 #include "config.h"
 
-#include "compat.h"
+#include "common/compat.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -146,7 +146,7 @@ print_token_info (CK_FUNCTION_LIST_PTR module, CK_SLOT_ID slot_id)
 	X(CKF_LOGIN_REQUIRED, "login-required");
 	X(CKF_USER_PIN_INITIALIZED, "user-pin-initialized");
 	X(CKF_RESTORE_KEY_NOT_NEEDED, "restore-key-not-needed");
-	X(CKF_CLOCK_ON_TOKEN, "clock-on-tokne");
+	X(CKF_CLOCK_ON_TOKEN, "clock-on-token");
 	X(CKF_PROTECTED_AUTHENTICATION_PATH, "protected-authentication-path");
 	X(CKF_DUAL_CRYPTO_OPERATIONS, "dual-crypto-operations");
 	X(CKF_TOKEN_INITIALIZED, "token-initialized");