Module Name: src
Committed By: christos
Date: Sat Jan 28 02:05:55 UTC 2012
Modified Files:
src/crypto/external/cpl/trousers/dist/src/include: trousers_types.h
src/crypto/external/cpl/trousers/dist/src/include/linux: tpm.h
src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp: rpc.c
src/crypto/external/cpl/trousers/dist/src/tcsd: tcsd_conf.c
Log Message:
add && defined(__NetBSD__) where appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.2
--- src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.1.1.1 Fri Jan 27 20:36:45 2012
+++ src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h Fri Jan 27 21:05:55 2012
@@ -120,7 +120,7 @@ typedef struct tdTSS_KEY {
#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
#define BSD_CONST
-#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
+#elif (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
#define BSD_CONST const
#endif
Index: src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h:1.2
--- src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h:1.1.1.1 Fri Jan 27 20:36:47 2012
+++ src/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h Fri Jan 27 21:05:55 2012
@@ -18,7 +18,7 @@
#if (defined (__linux) || defined (linux))
#include <linux/ioctl.h>
-#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
+#elif (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
#include <sys/ioctl.h>
#endif
Index: src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
diff -u src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c:1.2
--- src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c:1.1.1.1 Fri Jan 27 20:35:57 2012
+++ src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c Fri Jan 27 21:05:55 2012
@@ -13,7 +13,7 @@
#include <syslog.h>
#include <string.h>
#include <netdb.h>
-#if (defined (__OpenBSD__) || defined (__FreeBSD__))
+#if (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
#include <sys/types.h>
#include <sys/socket.h>
#endif
Index: src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
diff -u src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c:1.2
--- src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c:1.1.1.1 Fri Jan 27 20:35:38 2012
+++ src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c Fri Jan 27 21:05:55 2012
@@ -193,7 +193,7 @@ get_file_path(char *ptr, char **dest)
char tmp_buf[1024];
int i = 0;
- while (isalpha(*ptr) || isdigit(*ptr) ||
+ while (isalpha((unsigned char)*ptr) || isdigit((unsigned char)*ptr) ||
*ptr == '/' || *ptr == '.' || *ptr == '#' || *ptr == '_' || *ptr == '-')
{
tmp_buf[i] = *ptr;
@@ -310,7 +310,7 @@ read_conf_line(char *buf, int line_num,
comma = rindex(arg, ',');
if (comma == NULL) {
- if (!isdigit(*arg))
+ if (!isdigit((unsigned char)*arg))
break;
comma = arg;
@@ -339,7 +339,7 @@ read_conf_line(char *buf, int line_num,
comma = rindex(arg, ',');
if (comma == NULL) {
- if (!isdigit(*arg))
+ if (!isdigit((unsigned char)*arg))
break;
comma = arg;
