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();
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
