d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makesyscalls.sh: always use absolute path for syscalls.conf

Browse Source 
syscalls.conf is included using "." which per the Open Group:

 If file does not contain a <slash>, the shell shall use the search
 path specified by PATH to find the directory containing file.

POSIX shells don't fall back to the current working directory.

Submitted by:	Nathaniel Wesley Filardo <nwf20@cl.cam.ac.uk>
Reviewed by:	bdrewery
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D20476
This commit is contained in:
Brooks Davis 2019-05-30 20:56:23 +00:00
parent f1b0e65941
commit 4af6033324
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/linux/Makefile
View File

@ -11,5 +11,5 @@ all:
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
../../kern/makesyscalls.sh syscalls.master syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

4
sys/amd64/linux32/Makefile
View File

@ -11,5 +11,5 @@ all:
sysent: linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c
linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c: ../../kern/makesyscalls.sh \
syscalls.master syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
syscalls.master ${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

4
sys/arm64/linux/Makefile
View File

@ -11,5 +11,5 @@ all:
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
../../kern/makesyscalls.sh syscalls.master syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

4
sys/compat/cloudabi32/Makefile
View File

@ -12,6 +12,6 @@ sysent: cloudabi32_sysent.c cloudabi32_syscall.h cloudabi32_proto.h \
cloudabi32_sysent.c cloudabi32_syscall.h cloudabi32_proto.h \
cloudabi32_syscalls.c cloudabi32_systrace_args.c: \
../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
syscalls.conf
${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
syscalls.conf
${.CURDIR}/syscalls.conf

4
sys/compat/cloudabi64/Makefile
View File

@ -12,6 +12,6 @@ sysent: cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
cloudabi64_syscalls.c cloudabi64_systrace_args.c: \
../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
syscalls.conf
${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
syscalls.conf
${.CURDIR}/syscalls.conf

4
sys/compat/freebsd32/Makefile
View File

@ -11,8 +11,8 @@ all:
sysent: freebsd32_sysent.c freebsd32_syscall.h freebsd32_proto.h freebsd32_systrace_args.c
freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h freebsd32_systrace_args.c : \
../../kern/makesyscalls.sh syscalls.master syscalls.conf ../../kern/capabilities.conf
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf ../../kern/capabilities.conf
sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
clean:
rm -f freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h

4
sys/i386/linux/Makefile
View File

@ -11,5 +11,5 @@ all:
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
../../kern/makesyscalls.sh syscalls.master syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

2
sys/kern/makesyscalls.sh
View File

@ -58,7 +58,7 @@ case $# in
esac
if [ -n "$2" ]; then
. $2
. "$2"
fi
if [ -r $capabilities_conf ]; then