Attachment #111230 for bug #152456

View | Details | Raw Unified | Return to bug 152456
Collapse All | Expand All

Lines 25-34 Link Here

(-)busybox/Makefile (-2 / +4 lines)
25		25
26	.if ${ARCH} == "amd64"	26	.if ${ARCH} == "amd64"
27	BROKEN= does not compile	27	BROKEN= does not compile
28	.elif ${OSVERSION} >= 800000
29	BROKEN= does not compile
30	.endif	28	.endif
31		29
		30	post-patch:
		31	find ${WRKSRC} -name '*.[ch]' \| ${XARGS} \
		32	${REINPLACE_CMD} -e 's/ dprintf(/ bb_dprintf(/g'
		33
32	do-configure:	34	do-configure:
33	${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config	35	${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
34	cd ${WRKSRC} && ${GMAKE} oldconfig	36	cd ${WRKSRC} && ${GMAKE} oldconfig




--- editors/vi.c	2008-11-09 17:28:21.000000000 +0000
+++ ../../../vi.c	2010-12-14 22:09:34.000000000 +0000
@@ -21,6 +21,30 @@
  *	An "ex" line oriented mode- maybe using "cmdedit"
  */
 
+/* Test for existance of memrchr() */
+
+#if (__FreeBSD_version < 603103) || (__FreeBSD_version < 700109 && __FreeBSD_version >= 700000) || (__FreeBSD_version < 800034 && __FreeBSD_version >=800000)
+static void *
+memrchr(const void *buf, int c, size_t num)
+{
+       unsigned char *pMem = (unsigned char *) buf;
+
+       for (;;) {
+               if (num-- == 0) {
+                       return NULL;
+               }
+
+               if (*pMem-- == (unsigned char) c) {
+                       break;
+               }
+
+       }
+
+       return (void *) (pMem + 1);
+
+}
+#endif
+
 #include "libbb.h"
 
 /* the CRASHME code is unmaintained, and doesn't currently build */

Return to bug 152456

Line 0 Link Here

(-)busybox/files/patch-editors-vi.c (+33 lines)
	1	--- editors/vi.c 2008-11-09 17:28:21.000000000 +0000
	2	+++ ../../../vi.c 2010-12-14 22:09:34.000000000 +0000
	3	@@ -21,6 +21,30 @@
	4	* An "ex" line oriented mode- maybe using "cmdedit"
	5	*/
	6
	7	+/* Test for existance of memrchr() */
	8	+
	9	+#if (__FreeBSD_version < 603103) \|\| (__FreeBSD_version < 700109 && __FreeBSD_version >= 700000) \|\| (__FreeBSD_version < 800034 && __FreeBSD_version >=800000)
	10	+static void *
	11	+memrchr(const void *buf, int c, size_t num)
	12	+{
	13	+ unsigned char pMem = (unsigned char ) buf;
	14	+
	15	+ for (;;) {
	16	+ if (num-- == 0) {
	17	+ return NULL;
	18	+ }
	19	+
	20	+ if (*pMem-- == (unsigned char) c) {
	21	+ break;
	22	+ }
	23	+
	24	+ }
	25	+
	26	+ return (void *) (pMem + 1);
	27	+
	28	+}
	29	+#endif
	30	+
	31	#include "libbb.h"
	32
	33	/* the CRASHME code is unmaintained, and doesn't currently build */