From owner-svn-src-all@FreeBSD.ORG Thu Oct 31 11:38:26 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2962AD25; Thu, 31 Oct 2013 11:38:26 +0000 (UTC) (envelope-from pjd@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 F12DC253F; Thu, 31 Oct 2013 11:38:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VBcP9L060316; Thu, 31 Oct 2013 11:38:25 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VBcP8v060314; Thu, 31 Oct 2013 11:38:25 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201310311138.r9VBcP8v060314@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Thu, 31 Oct 2013 11:38:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257436 - head/tools/regression/pjdfstest 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, 31 Oct 2013 11:38:26 -0000 Author: pjd Date: Thu Oct 31 11:38:25 2013 New Revision: 257436 URL: http://svnweb.freebsd.org/changeset/base/257436 Log: Make lpathconf(2) support optional to make it compile again on Linux. Submitted by: Hashem Nasarat @riseup.net Modified: head/tools/regression/pjdfstest/Makefile head/tools/regression/pjdfstest/pjdfstest.c Modified: head/tools/regression/pjdfstest/Makefile ============================================================================== --- head/tools/regression/pjdfstest/Makefile Thu Oct 31 11:03:36 2013 (r257435) +++ head/tools/regression/pjdfstest/Makefile Thu Oct 31 11:38:25 2013 (r257436) @@ -6,7 +6,7 @@ ${PROG}: ${PROG}.c @OSTYPE=`uname`; \ CFLAGS=-D__OS_$${OSTYPE}__; \ if [ $$OSTYPE = "FreeBSD" ]; then \ - CFLAGS="$$CFLAGS -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT -DHAS_CONNECTAT"; \ + CFLAGS="$$CFLAGS -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT -DHAS_CONNECTAT -DHAS_LPATHCONF"; \ elif [ $$OSTYPE = "SunOS" ]; then \ CFLAGS="$$CFLAGS -DHAS_TRUNCATE64 -DHAS_STAT64"; \ CFLAGS="$$CFLAGS -lsocket"; \ Modified: head/tools/regression/pjdfstest/pjdfstest.c ============================================================================== --- head/tools/regression/pjdfstest/pjdfstest.c Thu Oct 31 11:03:36 2013 (r257435) +++ head/tools/regression/pjdfstest/pjdfstest.c Thu Oct 31 11:38:25 2013 (r257436) @@ -119,7 +119,9 @@ enum action { ACTION_FSTATAT, ACTION_PATHCONF, ACTION_FPATHCONF, +#ifdef HAS_LPATHCONF ACTION_LPATHCONF, +#endif #ifdef HAS_FREEBSD_ACL ACTION_PREPENDACL, ACTION_READACL, @@ -200,7 +202,9 @@ static struct syscall_desc syscalls[] = { "fstatat", ACTION_FSTATAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_NONE } }, { "pathconf", ACTION_PATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, { "fpathconf", ACTION_FPATHCONF, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } }, +#ifdef HAS_LPATHCONF { "lpathconf", ACTION_LPATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, +#endif #ifdef HAS_FREEBSD_ACL { "prependacl", ACTION_PREPENDACL, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, { "readacl", ACTION_READACL, { TYPE_STRING, TYPE_NONE } }, @@ -899,7 +903,9 @@ call_syscall(struct syscall_desc *scall, break; case ACTION_PATHCONF: case ACTION_FPATHCONF: +#ifdef HAS_LPATHCONF case ACTION_LPATHCONF: +#endif { long lrval; @@ -916,9 +922,11 @@ call_syscall(struct syscall_desc *scall, case ACTION_FPATHCONF: lrval = fpathconf(NUM(0), name); break; +#ifdef HAS_LPATHCONF case ACTION_LPATHCONF: lrval = lpathconf(STR(0), name); break; +#endif default: abort(); }