From owner-svn-src-all@FreeBSD.ORG Thu Aug 1 18:06:59 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7DBBFFD6; Thu, 1 Aug 2013 18:06:59 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4FD10221B; Thu, 1 Aug 2013 18:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r71I6x2q088691; Thu, 1 Aug 2013 18:06:59 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r71I6xpd088690; Thu, 1 Aug 2013 18:06:59 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201308011806.r71I6xpd088690@svn.freebsd.org> From: Marcel Moolenaar Date: Thu, 1 Aug 2013 18:06:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253862 - head/sys/boot/ficl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Aug 2013 18:06:59 -0000 Author: marcel Date: Thu Aug 1 18:06:58 2013 New Revision: 253862 URL: http://svnweb.freebsd.org/changeset/base/253862 Log: Fix the build of the testmain target. This target compiles a Forth interpreter that can be run on the system and as such cannot be compiled against libbstand. On the one hand this means we need to include the usual headers for system interfaces that we use and on the the other hand we can only use standard system interfaces. While here, define local variables only when needed to make this WARNS=2 clean on amd64. PR: 172542 Obtained from: peterj@ Pointed out by: Jan Beich Modified: head/sys/boot/ficl/loader.c Modified: head/sys/boot/ficl/loader.c ============================================================================== --- head/sys/boot/ficl/loader.c Thu Aug 1 16:04:48 2013 (r253861) +++ head/sys/boot/ficl/loader.c Thu Aug 1 18:06:58 2013 (r253862) @@ -33,7 +33,13 @@ *******************************************************************/ #ifdef TESTMAIN +#include +#include +#include +#include +#include #include +#include #else #include #endif @@ -135,9 +141,9 @@ void ficlGetenv(FICL_VM *pVM) { #ifndef TESTMAIN - char *name; + char *name, *value; #endif - char *namep, *value; + char *namep; int names; #if FICL_ROBUST > 1 @@ -243,9 +249,9 @@ void ficlFindfile(FICL_VM *pVM) { #ifndef TESTMAIN - char *name; + char *name, *type; #endif - char *type, *namep, *typep; + char *namep, *typep; struct preloaded_file* fp; int names, types; @@ -511,6 +517,14 @@ static void pfread(FICL_VM *pVM) */ static void pfreaddir(FICL_VM *pVM) { +#ifdef TESTMAIN + static union { + struct dirent dirent; + char buf[512]; + } u; + off_t off; + int len; +#endif struct dirent *d; int fd; @@ -519,7 +533,20 @@ static void pfreaddir(FICL_VM *pVM) #endif fd = stackPopINT(pVM->pStack); +#if TESTMAIN + /* + * The readdirfd() function is specific to the loader environment. + * We do the best we can to make freaddir work, but it's not at + * all guaranteed. + */ + off = lseek(fd, 0LL, SEEK_CUR); + len = getdents(fd, u.buf, sizeof(u.buf)); + d = (len != -1) ? &u.dirent : NULL; + if (d != NULL) + lseek(fd, off + d->d_reclen, SEEK_SET); +#else d = readdirfd(fd); +#endif if (d != NULL) { stackPushPtr(pVM->pStack, d->d_name); stackPushINT(pVM->pStack, strlen(d->d_name));