Module Name: src Committed By: christos Date: Thu Aug 18 02:32:32 UTC 2011
Modified Files: src/regress/sys/kern/getcwd: Makefile getcwd.c Log Message: provide the out of address space test in a gcc-4.5 friendly way. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/getcwd/Makefile cvs rdiff -u -r1.9 -r1.10 src/regress/sys/kern/getcwd/getcwd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/regress/sys/kern/getcwd/Makefile diff -u src/regress/sys/kern/getcwd/Makefile:1.6 src/regress/sys/kern/getcwd/Makefile:1.7 --- src/regress/sys/kern/getcwd/Makefile:1.6 Tue Jun 21 22:49:43 2011 +++ src/regress/sys/kern/getcwd/Makefile Wed Aug 17 22:32:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/06/22 02:49:43 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2011/08/18 02:32:32 christos Exp $ NOMAN= # defined LDSTATIC= -static @@ -15,8 +15,3 @@ @find /usr -type d -print | ./getcwd -s .include <bsd.prog.mk> - -# getcwd.c has an on-purpuse array bounds violation -.if ${HAVE_GCC} == 45 -COPTS.getcwd.c+= -Wno-error -.endif Index: src/regress/sys/kern/getcwd/getcwd.c diff -u src/regress/sys/kern/getcwd/getcwd.c:1.9 src/regress/sys/kern/getcwd/getcwd.c:1.10 --- src/regress/sys/kern/getcwd/getcwd.c:1.9 Mon Apr 28 16:23:06 2008 +++ src/regress/sys/kern/getcwd/getcwd.c Wed Aug 17 22:32:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: getcwd.c,v 1.9 2008/04/28 20:23:06 martin Exp $ */ +/* $NetBSD: getcwd.c,v 1.10 2011/08/18 02:32:32 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -343,7 +343,7 @@ CHECK("/", __getcwd(kbuf, 0xdeadbeef), -1, ERANGE); /* large negative */ CHECK("/", __getcwd(kbuf, 0x7000beef), 2, 0); /* large positive, rounds down */ CHECK("/", __getcwd(kbuf, 0x10000), 2, 0); /* slightly less large positive, rounds down */ - CHECK("/", __getcwd(kbuf+0x100000, sizeof(kbuf)), -1, EFAULT); /* outside address space */ + CHECK("/", __getcwd((void *)0x10000, sizeof(kbuf)), -1, EFAULT); /* outside address space */ CHECK("/", __getcwd(0, 30), -1, EFAULT); CHECK("/", __getcwd((void*)0xdeadbeef, 30), -1, EFAULT); CHECK("/", __getcwd(kbuf, 2), 2, 0);