Module Name: src
Committed By: joerg
Date: Mon Jun 4 19:06:45 UTC 2012
Modified Files:
src/lib/libc/cdb: cdbr.c
src/tools/compat: Makefile
Added Files:
src/tools/compat: cdbr.h
Log Message:
Add cdbr(3) support to tools/compat.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/cdb/cdbr.c
cvs rdiff -u -r1.58 -r1.59 src/tools/compat/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/compat/cdbr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/cdb/cdbr.c
diff -u src/lib/libc/cdb/cdbr.c:1.2 src/lib/libc/cdb/cdbr.c:1.3
--- src/lib/libc/cdb/cdbr.c:1.2 Thu Jun 3 12:40:52 2010
+++ src/lib/libc/cdb/cdbr.c Mon Jun 4 19:06:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cdbr.c,v 1.2 2010/06/03 12:40:52 veego Exp $ */
+/* $NetBSD: cdbr.c,v 1.3 2012/06/04 19:06:45 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,12 +36,17 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: cdbr.c,v 1.2 2010/06/03 12:40:52 veego Exp $");
+__RCSID("$NetBSD: cdbr.c,v 1.3 2012/06/04 19:06:45 joerg Exp $");
#include "namespace.h"
+#if !HAVE_NBTOOL_CONFIG_H
#include <sys/bitops.h>
+#endif
+#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
#include <sys/endian.h>
+#endif
+
#include <sys/mman.h>
#include <sys/stat.h>
#include <cdbr.h>
@@ -59,6 +64,11 @@ __weak_alias(cdbr_get,_cdbr_get)
__weak_alias(cdbr_open,_cdbr_open)
#endif
+#if HAVE_NBTOOL_CONFIG_H
+#define fast_divide32_prepare(d,m,s1,s2) (void)0
+#define fast_remainder32(v,d,m,s1,s2) (v%d)
+#endif
+
struct cdbr {
uint8_t *mmap_base;
size_t mmap_size;
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.58 src/tools/compat/Makefile:1.59
--- src/tools/compat/Makefile:1.58 Mon Jun 4 18:53:02 2012
+++ src/tools/compat/Makefile Mon Jun 4 19:06:45 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2012/06/04 18:53:02 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2012/06/04 19:06:45 joerg Exp $
HOSTLIB= nbcompat
-SRCS= atoll.c basename.c cdbw.c dirname.c \
+SRCS= atoll.c basename.c cdbr.c cdbw.c dirname.c \
fgetln.c flock.c fparseln.c fpurge.c \
getcap.c getline.c getmode.c getopt_long.c gettemp.c \
heapsort.c \
Added files:
Index: src/tools/compat/cdbr.h
diff -u /dev/null src/tools/compat/cdbr.h:1.1
--- /dev/null Mon Jun 4 19:06:45 2012
+++ src/tools/compat/cdbr.h Mon Jun 4 19:06:45 2012
@@ -0,0 +1,5 @@
+/* $NetBSD: cdbr.h,v 1.1 2012/06/04 19:06:45 joerg Exp $ */
+
+/* We unconditionally use the NetBSD cdbr(3) in libnbcompat. */
+#include "nbtool_config.h"
+#include "../../include/cdbr.h"
