Okan reminded me that my old regress tests used systrace policy files as
example text, which weren't the easiest to decypher. I've replaced them with
simpler files that should make life easier for any future regress test writers.
Comments? Suggestions?
Ray
Index: Iflag12.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Iflag12.out,v
retrieving revision 1.2
diff -u -p -r1.2 Iflag12.out
--- Iflag12.out 13 Sep 2015 17:08:04 -0000 1.2
+++ Iflag12.out 30 May 2016 06:06:09 -0000
@@ -1,100 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native Policy:
/usr/bin/lynx, Emulation: native
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- native-sysctl: permit
native-sysctl: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- >
native-fstat: permit
- native-close: permit
native-close: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename match "/<non-existent filename>: |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "/obj" then permit <
- native-fsread: filename eq "/tmp" then permit
native-fsread: filename eq "/tmp" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
native-fswrite: filename match "/tmp/lynx-*" then permit
- )
native-fsread: filename match "/tmp/lynx-*/." then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr" then permit
native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p
native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t
native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename match "/usr/lib/libncurses.so.*"
native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename match "/usr/lib/libssl.so.*" then
native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/libdata" then permit
native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/libexec" then permit
native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "/usr/lkm" then permit
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/usr/local" then permit
native-fsread: filename eq "$HOME/.lynxrc" then permit
- native-fsread: filename eq "/usr/mdec" then permit
native-fsread: filename match "/<non-existent filename>:
- native-fsread: filename eq "/usr/obj" then permit
native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
- native-fsread: filename eq "/usr/obj/bin" then permit
native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then
native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db"
native-fsread: filename eq "/usr/share/misc/terminfo.db"
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- native-fsread: filename eq "/var/run/dev.db" then permit
native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then pe |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
- native-munmap: permit <
- native-nanosleep: permit <
- native-poll: permit
native-poll: permit
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- >
native-exit: permit
+top top
+file1 | file2
+same1 same1
+file1only <
+same2 same2
+ > file2only
+same3 same3
+bottom bottom
Index: Iflag21.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Iflag21.out,v
retrieving revision 1.2
diff -u -p -r1.2 Iflag21.out
--- Iflag21.out 13 Sep 2015 17:08:04 -0000 1.2
+++ Iflag21.out 30 May 2016 06:06:49 -0000
@@ -1,96 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native Policy:
/usr/bin/lynx, Emulation: native
- native-issetugid: permit <
- native-mprotect: permit <
- native-mmap: permit <
- native-sysctl: permit
native-sysctl: permit
- native-fsread: filename eq "/var/run/ld.so.hints" then pe <
- native-fstat: permit <
- native-close: permit
native-close: permit
- native-fsread: filename match "/usr/lib/libssl.so.*" then |
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- native-read: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t |
native-exit: permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" |
native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p |
native-fsread: filename eq "/" then permit
- native-munmap: permit |
native-fsread: filename match "/<non-existent filename>:
- native-sigprocmask: permit |
native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
native-fsread: filename eq "/etc/malloc.conf" then permit
- native-getpid: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- >
native-fsread: filename eq "/etc/utmp" then permit
- >
native-fsread: filename eq "/home" then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- >
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/tmp" then permit
native-fsread: filename eq "/tmp" then permit
- native-fswrite: filename match "/tmp/lynx-*" then permit
native-fsread: filename match "/tmp/lynx-*/." then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit (
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "/etc/lynx.cfg" then permit <
- native-fsread: filename eq "/" then permit <
- native-fsread: filename eq "/usr/obj/bin/systrace/." then <
- native-fsread: filename eq "/usr/obj/bin" then permit <
- native-fcntl: permit <
- native-getdirentries: permit <
- native-lseek: permit <
- native-fsread: filename eq "/usr/obj" then permit <
- native-fsread: filename eq "/usr" then permit
native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename eq "/usr/libdata" then permit
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename eq "/usr/libexec" then permit
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fsread: filename eq "/usr/lkm" then permit
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/usr/local" then permit
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-fsread: filename eq "/usr/mdec" then permit
native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/home" then permit
native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/obj" then permit
native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "$HOME/.lynxrc" then permit
native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename match "/<non-existent filename>:
native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "$HOME/.mailcap" then permit
native-fsread: filename eq "/usr/obj/bin" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- )
native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
- )
native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-sigaction: permit <
- native-ioctl: permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "/usr/share/misc/terminfo.db"
native-fsread: filename eq "/usr/share/misc/terminfo.db"
- native-pread: permit <
- native-write: permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "/var/run/dev.db" then permit
native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/etc/utmp" then permit |
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- native-poll: permit |
native-fstat: permit
- native-nanosleep: permit |
native-fswrite: filename match "/tmp/lynx-*" then permit
- >
native-getdirentries: permit
- >
native-getpid: permit
- native-gettimeofday: permit
native-gettimeofday: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-ioctl: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |
native-issetugid: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-lseek: permit
- native-sendto: true then permit |
native-mmap: permit
- native-select: permit |
native-mprotect: prot eq "PROT_READ" then permit
- >
native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
- >
native-munmap: permit
- >
native-nanosleep: permit
- >
native-poll: permit
- >
native-pread: permit
- >
native-read: permit
- native-recvfrom: permit
native-recvfrom: permit
- >
native-select: permit
- >
native-sendto: true then permit
- >
native-sigaction: permit
- >
native-sigprocmask: permit
- >
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-write: permit
- native-exit: permit <
+top top
+file2 | file1
+same1 same1
+ > file1only
+same2 same2
+file2only <
+same3 same3
+bottom bottom
Index: Ilflag12.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Ilflag12.out,v
retrieving revision 1.2
diff -u -p -r1.2 Ilflag12.out
--- Ilflag12.out 13 Sep 2015 17:08:04 -0000 1.2
+++ Ilflag12.out 30 May 2016 06:09:12 -0000
@@ -1,99 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native (
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- native-sysctl: permit (
- >
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- >
native-fstat: permit
- native-close: permit (
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename match "/<non-existent filename>: |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit (
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "/obj" then permit <
- native-fsread: filename eq "/tmp" then permit (
- native-fsread: filename match "/tmp/lynx-*/." then permit (
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr" then permit (
- native-fsread: filename eq "/usr/bin" then permit (
- native-fsread: filename eq "/usr/games" then permit (
- native-fsread: filename eq "/usr/include" then permit (
- native-fsread: filename eq "/usr/lib" then permit (
- native-fsread: filename match "/usr/lib/libc.so.*" then p (
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t (
- native-fsread: filename match "/usr/lib/libncurses.so.*" (
- native-fsread: filename match "/usr/lib/libssl.so.*" then (
- native-fsread: filename eq "/usr/libdata" then permit (
- native-fsread: filename eq "/usr/libexec" then permit (
- native-fsread: filename eq "/usr/lkm" then permit (
- native-fsread: filename eq "/usr/local" then permit (
- native-fsread: filename eq "/usr/mdec" then permit (
- native-fsread: filename eq "/usr/obj" then permit (
- native-fsread: filename eq "/usr/obj/bin" then permit (
- native-fsread: filename eq "/usr/obj/bin/systrace/." then (
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db" (
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- native-fsread: filename eq "/var/run/dev.db" then permit (
- native-fsread: filename eq "/var/run/ld.so.hints" then pe |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
- native-munmap: permit <
- native-nanosleep: permit <
- native-poll: permit (
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- >
native-exit: permit
+top (
+file1 | file2
+same1 (
+file1only <
+same2 (
+ > file2only
+same3
+bottom
Index: Ilflag21.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Ilflag21.out,v
retrieving revision 1.2
diff -u -p -r1.2 Ilflag21.out
--- Ilflag21.out 13 Sep 2015 17:08:04 -0000 1.2
+++ Ilflag21.out 30 May 2016 06:09:35 -0000
@@ -1,94 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native (
- native-issetugid: permit <
- native-mprotect: permit <
- native-mmap: permit <
- native-sysctl: permit (
- native-fsread: filename eq "/var/run/ld.so.hints" then pe <
- native-fstat: permit <
- native-close: permit (
- native-fsread: filename match "/usr/lib/libssl.so.*" then |
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- native-read: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t |
native-exit: permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" |
native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p |
native-fsread: filename eq "/" then permit
- native-munmap: permit |
native-fsread: filename match "/<non-existent filename>:
- native-sigprocmask: permit |
native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-fsread: filename eq "/etc/malloc.conf" then permit (
- native-getpid: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- >
native-fsread: filename eq "/etc/utmp" then permit
- >
native-fsread: filename eq "/home" then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- >
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/tmp" then permit (
- native-fswrite: filename match "/tmp/lynx-*" then permit (
- native-fsread: filename match "/tmp/lynx-*/." then permit (
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "/etc/lynx.cfg" then permit <
- native-fsread: filename eq "/" then permit <
- native-fsread: filename eq "/usr/obj/bin/systrace/." then <
- native-fsread: filename eq "/usr/obj/bin" then permit <
- native-fcntl: permit <
- native-getdirentries: permit <
- native-lseek: permit <
- native-fsread: filename eq "/usr/obj" then permit <
- native-fsread: filename eq "/usr" then permit (
- native-fsread: filename eq "/usr/bin" then permit (
- native-fsread: filename eq "/usr/games" then permit (
- native-fsread: filename eq "/usr/include" then permit (
- native-fsread: filename eq "/usr/lib" then permit (
- native-fsread: filename eq "/usr/libdata" then permit (
- native-fsread: filename eq "/usr/libexec" then permit (
- native-fsread: filename eq "/usr/lkm" then permit (
- native-fsread: filename eq "/usr/local" then permit (
- native-fsread: filename eq "/usr/mdec" then permit (
- native-fsread: filename eq "/home" then permit (
- native-fsread: filename eq "/obj" then permit (
- native-fsread: filename eq "$HOME/.lynxrc" then permit (
- native-fsread: filename match "/<non-existent filename>: (
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
- native-fsread: filename eq "$HOME/.mailcap" then permit (
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-sigaction: permit <
- native-ioctl: permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "/usr/share/misc/terminfo.db" (
- native-pread: permit <
- native-write: permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "/var/run/dev.db" then permit (
- native-fsread: filename eq "/etc/utmp" then permit |
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- native-poll: permit |
native-fstat: permit
- native-nanosleep: permit |
native-fswrite: filename match "/tmp/lynx-*" then permit
- >
native-getdirentries: permit
- >
native-getpid: permit
- native-gettimeofday: permit (
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-ioctl: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |
native-issetugid: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-lseek: permit
- native-sendto: true then permit |
native-mmap: permit
- native-select: permit |
native-mprotect: prot eq "PROT_READ" then permit
- >
native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
- >
native-munmap: permit
- >
native-nanosleep: permit
- >
native-poll: permit
- >
native-pread: permit
- >
native-read: permit
- native-recvfrom: permit (
- >
native-select: permit
- >
native-sendto: true then permit
- >
native-sigaction: permit
- >
native-sigprocmask: permit
- >
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-write: permit
- native-exit: permit <
+top (
+file2 | file1
+same1 (
+ > file1only
+same2 (
+file2only <
+same3
+bottom
Index: Ilsflag12.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Ilsflag12.out,v
retrieving revision 1.1
diff -u -p -r1.1 Ilsflag12.out
--- Ilsflag12.out 21 Feb 2006 09:07:52 -0000 1.1
+++ Ilsflag12.out 30 May 2016 06:10:35 -0000
@@ -1,69 +1,3 @@
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- >
native-fstat: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename match "/<non-existent filename>: |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "/obj" then permit <
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- native-fsread: filename eq "/var/run/ld.so.hints" then pe |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
- native-munmap: permit <
- native-nanosleep: permit <
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- >
native-exit: permit
+file1 | file2
+file1only <
+ > file2only
Index: Ilsflag21.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Ilsflag21.out,v
retrieving revision 1.1
diff -u -p -r1.1 Ilsflag21.out
--- Ilsflag21.out 21 Feb 2006 09:07:52 -0000 1.1
+++ Ilsflag21.out 30 May 2016 06:11:08 -0000
@@ -1,65 +1,3 @@
- native-issetugid: permit <
- native-mprotect: permit <
- native-mmap: permit <
- native-fsread: filename eq "/var/run/ld.so.hints" then pe <
- native-fstat: permit <
- native-fsread: filename match "/usr/lib/libssl.so.*" then |
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- native-read: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t |
native-exit: permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" |
native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p |
native-fsread: filename eq "/" then permit
- native-munmap: permit |
native-fsread: filename match "/<non-existent filename>:
- native-sigprocmask: permit |
native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-getpid: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- >
native-fsread: filename eq "/etc/utmp" then permit
- >
native-fsread: filename eq "/home" then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- >
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "/etc/lynx.cfg" then permit <
- native-fsread: filename eq "/" then permit <
- native-fsread: filename eq "/usr/obj/bin/systrace/." then <
- native-fsread: filename eq "/usr/obj/bin" then permit <
- native-fcntl: permit <
- native-getdirentries: permit <
- native-lseek: permit <
- native-fsread: filename eq "/usr/obj" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-sigaction: permit <
- native-ioctl: permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-pread: permit <
- native-write: permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "/etc/utmp" then permit |
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- native-poll: permit |
native-fstat: permit
- native-nanosleep: permit |
native-fswrite: filename match "/tmp/lynx-*" then permit
- >
native-getdirentries: permit
- >
native-getpid: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-ioctl: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |
native-issetugid: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-lseek: permit
- native-sendto: true then permit |
native-mmap: permit
- native-select: permit |
native-mprotect: prot eq "PROT_READ" then permit
- >
native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
- >
native-munmap: permit
- >
native-nanosleep: permit
- >
native-poll: permit
- >
native-pread: permit
- >
native-read: permit
- >
native-select: permit
- >
native-sendto: true then permit
- >
native-sigaction: permit
- >
native-sigprocmask: permit
- >
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-write: permit
- native-exit: permit <
+file2 | file1
+ > file1only
+file2only <
Index: Isflag12.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Isflag12.out,v
retrieving revision 1.1
diff -u -p -r1.1 Isflag12.out
--- Isflag12.out 21 Feb 2006 09:07:52 -0000 1.1
+++ Isflag12.out 30 May 2016 06:07:43 -0000
@@ -1,69 +1,3 @@
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- >
native-fstat: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename match "/<non-existent filename>: |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "/obj" then permit <
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- native-fsread: filename eq "/var/run/ld.so.hints" then pe |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
- native-munmap: permit <
- native-nanosleep: permit <
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- >
native-exit: permit
+file1 | file2
+file1only <
+ > file2only
Index: Isflag21.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Isflag21.out,v
retrieving revision 1.1
diff -u -p -r1.1 Isflag21.out
--- Isflag21.out 21 Feb 2006 09:07:52 -0000 1.1
+++ Isflag21.out 30 May 2016 06:08:26 -0000
@@ -1,65 +1,3 @@
- native-issetugid: permit <
- native-mprotect: permit <
- native-mmap: permit <
- native-fsread: filename eq "/var/run/ld.so.hints" then pe <
- native-fstat: permit <
- native-fsread: filename match "/usr/lib/libssl.so.*" then |
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- native-read: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t |
native-exit: permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" |
native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p |
native-fsread: filename eq "/" then permit
- native-munmap: permit |
native-fsread: filename match "/<non-existent filename>:
- native-sigprocmask: permit |
native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-getpid: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- >
native-fsread: filename eq "/etc/utmp" then permit
- >
native-fsread: filename eq "/home" then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- >
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "/etc/lynx.cfg" then permit <
- native-fsread: filename eq "/" then permit <
- native-fsread: filename eq "/usr/obj/bin/systrace/." then <
- native-fsread: filename eq "/usr/obj/bin" then permit <
- native-fcntl: permit <
- native-getdirentries: permit <
- native-lseek: permit <
- native-fsread: filename eq "/usr/obj" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-sigaction: permit <
- native-ioctl: permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-pread: permit <
- native-write: permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "/etc/utmp" then permit |
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- native-poll: permit |
native-fstat: permit
- native-nanosleep: permit |
native-fswrite: filename match "/tmp/lynx-*" then permit
- >
native-getdirentries: permit
- >
native-getpid: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-ioctl: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |
native-issetugid: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-lseek: permit
- native-sendto: true then permit |
native-mmap: permit
- native-select: permit |
native-mprotect: prot eq "PROT_READ" then permit
- >
native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
- >
native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
- >
native-munmap: permit
- >
native-nanosleep: permit
- >
native-poll: permit
- >
native-pread: permit
- >
native-read: permit
- >
native-select: permit
- >
native-sendto: true then permit
- >
native-sigaction: permit
- >
native-sigprocmask: permit
- >
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-write: permit
- native-exit: permit <
+file2 | file1
+ > file1only
+file2only <
Index: Makefile
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 5 Mar 2006 07:13:11 -0000 1.2
+++ Makefile 30 May 2016 02:47:49 -0000
@@ -49,7 +49,7 @@ test-sflag: file1 file2 sflag.out
${SDIFF} -s ${.CURDIR}/file1 ${.CURDIR}/file2 | diff -u
${.CURDIR}/sflag.out -
test-wflag: file1 file2 wflag.out
- ${SDIFF} -w 125 ${.CURDIR}/file1 ${.CURDIR}/file2 | diff -u
${.CURDIR}/wflag.out -
+ ${SDIFF} -w 40 ${.CURDIR}/file1 ${.CURDIR}/file2 | diff -u
${.CURDIR}/wflag.out -
test-tabs: tabs1 tabs2 tabs.out
${SDIFF} ${.CURDIR}/tabs1 ${.CURDIR}/tabs2 | diff -u
${.CURDIR}/tabs.out -
@@ -134,10 +134,8 @@ test-stdin:
test-stdin2:
echo stdin | ${SDIFF} /dev/stdin /dev/null | fgrep -q stdin
-test-short: short.out
- echo "r\nl\nr\nl" | ${SDIFF} -o merge.out ${.CURDIR}/file1
${.CURDIR}/file2 \
- >/dev/null || true
- diff -u ${.CURDIR}/short.out merge.out
+test-short: short.in short.out
+ diff -u ${.CURDIR}/short.out ${.CURDIR}/short.in
clean:
rm -f merge.out
Index: file1
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/file1,v
retrieving revision 1.2
diff -u -p -r1.2 file1
--- file1 13 Sep 2015 17:08:04 -0000 1.2
+++ file1 30 May 2016 02:31:39 -0000
@@ -1,72 +1,7 @@
-Policy: /usr/bin/lynx, Emulation: native
- native-sysctl: permit
- native-close: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
- native-exit: permit
- native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename eq "/" then permit
- native-fsread: filename match "/<non-existent filename>: *" then permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit
- native-fsread: filename eq "/etc/utmp" then permit
- native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "$HOME" then permit
- native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
- native-fsread: filename eq "$HOME/.lynxrc" then permit
- native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "$HOME/.mime.types" then permit
- native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "$HOME/.terminfo.db" then permit
- native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/tmp" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
- native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then permit
- native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
- native-fsread: filename match "/usr/lib/libssl.so.*" then permit
- native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr/obj/bin" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
- native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then permit
- native-fstat: permit
- native-fswrite: filename match "/tmp/lynx-*" then permit
- native-getdirentries: permit
- native-getpid: permit
- native-gettimeofday: permit
- native-ioctl: permit
- native-issetugid: permit
- native-lseek: permit
- native-mmap: permit
- native-mprotect: prot eq "PROT_READ" then permit
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" then permit
- native-munmap: permit
- native-nanosleep: permit
- native-poll: permit
- native-pread: permit
- native-read: permit
- native-recvfrom: permit
- native-select: permit
- native-sendto: true then permit
- native-sigaction: permit
- native-sigprocmask: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then
permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then
permit
- native-write: permit
+top
+file1
+same1
+file1only
+same2
+same3
+bottom
Index: file2
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/file2,v
retrieving revision 1.2
diff -u -p -r1.2 file2
--- file2 13 Sep 2015 17:08:04 -0000 1.2
+++ file2 30 May 2016 02:31:58 -0000
@@ -1,69 +1,7 @@
-Policy: /usr/bin/lynx, Emulation: native
- native-issetugid: permit
- native-mprotect: permit
- native-mmap: permit
- native-sysctl: permit
- native-fsread: filename eq "/var/run/ld.so.hints" then permit
- native-fstat: permit
- native-close: permit
- native-fsread: filename match "/usr/lib/libssl.so.*" then permit
- native-read: permit
- native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then permit
- native-munmap: permit
- native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-getpid: permit
- native-fsread: filename eq "/tmp" then permit
- native-fswrite: filename match "/tmp/lynx-*" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
- native-fsread: filename eq "$HOME" then permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-fsread: filename eq "/" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
- native-fsread: filename eq "/usr/obj/bin" then permit
- native-fcntl: permit
- native-getdirentries: permit
- native-lseek: permit
- native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "$HOME/.lynxrc" then permit
- native-fsread: filename match "/<non-existent filename>: *" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
- native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
- native-fsread: filename eq "$HOME/.mime.types" then permit
- native-sigaction: permit
- native-ioctl: permit
- native-fsread: filename eq "$HOME/.terminfo.db" then permit
- native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
- native-pread: permit
- native-write: permit
- native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
- native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/etc/utmp" then permit
- native-poll: permit
- native-nanosleep: permit
- native-gettimeofday: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then
permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
- native-sendto: true then permit
- native-select: permit
- native-recvfrom: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then
permit
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
- native-exit: permit
+top
+file2
+same1
+same2
+file2only
+same3
+bottom
Index: lflag.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/lflag.out,v
retrieving revision 1.2
diff -u -p -r1.2 lflag.out
--- lflag.out 13 Sep 2015 17:08:04 -0000 1.2
+++ lflag.out 30 May 2016 02:33:07 -0000
@@ -1,102 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- native-sysctl: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then perm
- >
native-fstat: permit
- native-close: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm |
native-fsread: filename match "/usr/lib/libssl.so.*" then p
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then per |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" the
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*" th
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then per
- native-fsread: filename match "/<non-existent filename>: *" |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then permi <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permit <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then permit <
- native-fsread: filename eq "/obj" then permit <
- native-fsread: filename eq "/tmp" then permit
- >
native-fswrite: filename match "/tmp/lynx-*" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then p
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then per <
- native-fsread: filename match "/usr/lib/libcrypto.so.*" the <
- native-fsread: filename match "/usr/lib/libncurses.so.*" th <
- native-fsread: filename match "/usr/lib/libssl.so.*" then p <
- native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/obj" then permit |
native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "/usr/obj/bin" then permit |
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then p |
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename match "/<non-existent filename>: *"
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ
- >
native-fsread: filename eq "$HOME/.mime.types" then permit
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then permit
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db" th
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
- native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then perm |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t <
- native-munmap: permit <
- native-nanosleep: permit <
- native-poll: permit
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
- >
native-exit: permit
+top
+file1 | file2
+same1
+file1only <
+same2
+ > file2only
+same3
+bottom
Index: same.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/same.out,v
retrieving revision 1.2
diff -u -p -r1.2 same.out
--- same.out 13 Sep 2015 17:08:04 -0000 1.2
+++ same.out 30 May 2016 02:38:52 -0000
@@ -1,72 +1,7 @@
-Policy: /usr/bin/lynx, Emulation: native Policy:
/usr/bin/lynx, Emulation: native
- native-sysctl: permit
native-sysctl: permit
- native-close: permit
native-close: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
- native-exit: permit
native-exit: permit
- native-fcntl: cmd eq "F_SETFD" then permit
native-fcntl: cmd eq "F_SETFD" then permit
- native-fsread: filename eq "/" then permit
native-fsread: filename eq "/" then permit
- native-fsread: filename match "/<non-existent filename>: *"
native-fsread: filename match "/<non-existent filename>: *"
- native-fsread: filename eq "/etc/lynx.cfg" then permit
native-fsread: filename eq "/etc/lynx.cfg" then permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-fsread: filename eq "/etc/utmp" then permit
native-fsread: filename eq "/etc/utmp" then permit
- native-fsread: filename eq "/home" then permit
native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "$HOME" then permit
native-fsread: filename eq "$HOME" then permit
- native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
- native-fsread: filename eq "$HOME/.lynxrc" then permit
native-fsread: filename eq "$HOME/.lynxrc" then permit
- native-fsread: filename eq "$HOME/.mailcap" then permit
native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "$HOME/.mime.types" then permit
native-fsread: filename eq "$HOME/.mime.types" then permit
- native-fsread: filename eq "$HOME/.terminfo" then permit
native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "$HOME/.terminfo.db" then permit
native-fsread: filename eq "$HOME/.terminfo.db" then permit
- native-fsread: filename eq "/obj" then permit
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/tmp" then permit
native-fsread: filename eq "/tmp" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
native-fsread: filename match "/tmp/lynx-*/." then permit
- native-fsread: filename eq "/usr" then permit
native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then per
native-fsread: filename match "/usr/lib/libc.so.*" then per
- native-fsread: filename match "/usr/lib/libcrypto.so.*" the
native-fsread: filename match "/usr/lib/libcrypto.so.*" the
- native-fsread: filename match "/usr/lib/libncurses.so.*" th
native-fsread: filename match "/usr/lib/libncurses.so.*" th
- native-fsread: filename match "/usr/lib/libssl.so.*" then p
native-fsread: filename match "/usr/lib/libssl.so.*" then p
- native-fsread: filename eq "/usr/libdata" then permit
native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/usr/libexec" then permit
native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/usr/lkm" then permit
native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "/usr/local" then permit
native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/mdec" then permit
native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/obj" then permit
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr/obj/bin" then permit
native-fsread: filename eq "/usr/obj/bin" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then p
native-fsread: filename eq "/usr/obj/bin/systrace/." then p
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"
native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ
native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ
- native-fsread: filename eq "/usr/share/misc/terminfo.db" th
native-fsread: filename eq "/usr/share/misc/terminfo.db" th
- native-fsread: filename eq "/var/run/dev.db" then permit
native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then perm
native-fsread: filename eq "/var/run/ld.so.hints" then perm
- native-fstat: permit
native-fstat: permit
- native-fswrite: filename match "/tmp/lynx-*" then permit
native-fswrite: filename match "/tmp/lynx-*" then permit
- native-getdirentries: permit
native-getdirentries: permit
- native-getpid: permit
native-getpid: permit
- native-gettimeofday: permit
native-gettimeofday: permit
- native-ioctl: permit
native-ioctl: permit
- native-issetugid: permit
native-issetugid: permit
- native-lseek: permit
native-lseek: permit
- native-mmap: permit
native-mmap: permit
- native-mprotect: prot eq "PROT_READ" then permit
native-mprotect: prot eq "PROT_READ" then permit
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t
native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t
- native-munmap: permit
native-munmap: permit
- native-nanosleep: permit
native-nanosleep: permit
- native-poll: permit
native-poll: permit
- native-pread: permit
native-pread: permit
- native-read: permit
native-read: permit
- native-recvfrom: permit
native-recvfrom: permit
- native-select: permit
native-select: permit
- native-sendto: true then permit
native-sendto: true then permit
- native-sigaction: permit
native-sigaction: permit
- native-sigprocmask: permit
native-sigprocmask: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S
- native-write: permit
native-write: permit
+top top
+file1 file1
+same1 same1
+file1only file1only
+same2 same2
+same3 same3
+bottom bottom
Index: sflag.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/sflag.out,v
retrieving revision 1.1
diff -u -p -r1.1 sflag.out
--- sflag.out 21 Feb 2006 09:07:52 -0000 1.1
+++ sflag.out 30 May 2016 02:35:16 -0000
@@ -1,79 +1,3 @@
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then perm
- >
native-fstat: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm |
native-fsread: filename match "/usr/lib/libssl.so.*" then p
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then per |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" the
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*" th
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then per
- native-fsread: filename match "/<non-existent filename>: *" |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then permi <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permit <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then permit <
- native-fsread: filename eq "/obj" then permit <
- >
native-fswrite: filename match "/tmp/lynx-*" then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then p
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then per <
- native-fsread: filename match "/usr/lib/libcrypto.so.*" the <
- native-fsread: filename match "/usr/lib/libncurses.so.*" th <
- native-fsread: filename match "/usr/lib/libssl.so.*" then p <
- native-fsread: filename eq "/usr/obj" then permit |
native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "/usr/obj/bin" then permit |
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then p |
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename match "/<non-existent filename>: *"
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- >
native-fsread: filename eq "$HOME/.mime.types" then permit
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then permit
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
- native-fsread: filename eq "/var/run/ld.so.hints" then perm |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t <
- native-munmap: permit <
- native-nanosleep: permit <
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
- >
native-exit: permit
+file1 | file2
+file1only <
+ > file2only
Index: short.in
===================================================================
RCS file: short.in
diff -N short.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ short.in 30 May 2016 02:46:55 -0000
@@ -0,0 +1,4 @@
+top
+file1
+same1
+file1only
Index: short.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/short.out,v
retrieving revision 1.2
diff -u -p -r1.2 short.out
--- short.out 13 Sep 2015 17:08:04 -0000 1.2
+++ short.out 30 May 2016 02:48:27 -0000
@@ -1,15 +1,4 @@
-Policy: /usr/bin/lynx, Emulation: native
- native-issetugid: permit
- native-mprotect: permit
- native-mmap: permit
- native-sysctl: permit
- native-close: permit
- native-fsread: filename match "/usr/lib/libssl.so.*" then permit
- native-read: permit
- native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
- native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then permit
- native-munmap: permit
- native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit
+top
+file1
+same1
+file1only
Index: wflag.out
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/sdiff/wflag.out,v
retrieving revision 1.2
diff -u -p -r1.2 wflag.out
--- wflag.out 13 Sep 2015 17:08:04 -0000 1.2
+++ wflag.out 30 May 2016 02:37:50 -0000
@@ -1,102 +1,8 @@
-Policy: /usr/bin/lynx, Emulation: native Policy:
/usr/bin/lynx, Emulation: native
- >
native-issetugid: permit
- >
native-mprotect: permit
- >
native-mmap: permit
- native-sysctl: permit
native-sysctl: permit
- >
native-fsread: filename eq "/var/run/ld.so.hints" then pe
- >
native-fstat: permit
- native-close: permit
native-close: permit
- native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |
native-fsread: filename match "/usr/lib/libssl.so.*" then
- native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |
native-read: permit
- native-exit: permit |
native-fsread: filename match "/usr/lib/libcrypto.so.*" t
- native-fcntl: cmd eq "F_SETFD" then permit |
native-fsread: filename match "/usr/lib/libncurses.so.*"
- native-fsread: filename eq "/" then permit |
native-fsread: filename match "/usr/lib/libc.so.*" then p
- native-fsread: filename match "/<non-existent filename>: |
native-munmap: permit
- native-fsread: filename eq "/etc/lynx.cfg" then permit |
native-sigprocmask: permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/resolv.conf" then permit |
native-getpid: permit
- native-fsread: filename eq "/etc/utmp" then permit <
- native-fsread: filename eq "/home" then permit <
- native-fsread: filename eq "$HOME" then permit <
- native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
- native-fsread: filename eq "$HOME/.lynxrc" then permit <
- native-fsread: filename eq "$HOME/.mailcap" then permit <
- native-fsread: filename eq "$HOME/.mime.types" then permi <
- native-fsread: filename eq "$HOME/.terminfo" then permit <
- native-fsread: filename eq "$HOME/.terminfo.db" then perm <
- native-fsread: filename eq "/obj" then permit <
- native-fsread: filename eq "/tmp" then permit
native-fsread: filename eq "/tmp" then permit
- >
native-fswrite: filename match "/tmp/lynx-*" then permit
- native-fsread: filename match "/tmp/lynx-*/." then permit
native-fsread: filename match "/tmp/lynx-*/." then permit
- >
native-fsread: filename eq "$HOME" then permit
- >
native-fsread: filename eq "/etc/lynx.cfg" then permit
- >
native-fsread: filename eq "/" then permit
- >
native-fsread: filename eq "/usr/obj/bin/systrace/." then
- >
native-fsread: filename eq "/usr/obj/bin" then permit
- >
native-fcntl: permit
- >
native-getdirentries: permit
- >
native-lseek: permit
- >
native-fsread: filename eq "/usr/obj" then permit
- native-fsread: filename eq "/usr" then permit
native-fsread: filename eq "/usr" then permit
- native-fsread: filename eq "/usr/bin" then permit
native-fsread: filename eq "/usr/bin" then permit
- native-fsread: filename eq "/usr/games" then permit
native-fsread: filename eq "/usr/games" then permit
- native-fsread: filename eq "/usr/include" then permit
native-fsread: filename eq "/usr/include" then permit
- native-fsread: filename eq "/usr/lib" then permit
native-fsread: filename eq "/usr/lib" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then p <
- native-fsread: filename match "/usr/lib/libcrypto.so.*" t <
- native-fsread: filename match "/usr/lib/libncurses.so.*" <
- native-fsread: filename match "/usr/lib/libssl.so.*" then <
- native-fsread: filename eq "/usr/libdata" then permit
native-fsread: filename eq "/usr/libdata" then permit
- native-fsread: filename eq "/usr/libexec" then permit
native-fsread: filename eq "/usr/libexec" then permit
- native-fsread: filename eq "/usr/lkm" then permit
native-fsread: filename eq "/usr/lkm" then permit
- native-fsread: filename eq "/usr/local" then permit
native-fsread: filename eq "/usr/local" then permit
- native-fsread: filename eq "/usr/mdec" then permit
native-fsread: filename eq "/usr/mdec" then permit
- native-fsread: filename eq "/usr/obj" then permit |
native-fsread: filename eq "/home" then permit
- native-fsread: filename eq "/usr/obj/bin" then permit |
native-fsread: filename eq "/obj" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/." then |
native-fsread: filename eq "$HOME/.lynxrc" then permit
- >
native-fsread: filename match "/<non-existent filename>:
- native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
- >
native-fsread: filename eq "$HOME/.mailcap" then permit
- native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
- >
native-fsread: filename eq "$HOME/.mime.types" then permi
- >
native-sigaction: permit
- >
native-ioctl: permit
- >
native-fsread: filename eq "$HOME/.terminfo.db" then perm
- >
native-fsread: filename eq "$HOME/.terminfo" then permit
- native-fsread: filename eq "/usr/share/misc/terminfo.db"
native-fsread: filename eq "/usr/share/misc/terminfo.db"
- >
native-pread: permit
- >
native-write: permit
- >
native-fsread: filename eq "$HOME/.lynx-keymaps" then per
- native-fsread: filename eq "/var/run/dev.db" then permit
native-fsread: filename eq "/var/run/dev.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then pe |
native-fsread: filename eq "/etc/utmp" then permit
- native-fstat: permit <
- native-fswrite: filename match "/tmp/lynx-*" then permit <
- native-getdirentries: permit <
- native-getpid: permit <
- native-gettimeofday: permit <
- native-ioctl: permit <
- native-issetugid: permit <
- native-lseek: permit <
- native-mmap: permit <
- native-mprotect: prot eq "PROT_READ" then permit <
- native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
- native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
- native-munmap: permit <
- native-nanosleep: permit <
- native-poll: permit
native-poll: permit
- native-pread: permit |
native-nanosleep: permit
- native-read: permit |
native-gettimeofday: permit
- native-recvfrom: permit |
native-fsread: filename eq "/etc/resolv.conf" then permit
- native-select: permit <
- native-sendto: true then permit <
- native-sigaction: permit <
- native-sigprocmask: permit <
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- >
native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
- >
native-sendto: true then permit
- >
native-select: permit
- >
native-recvfrom: permit
- native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
- native-write: permit |
native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
- >
native-exit: permit
+top top
+file1 | file2
+same1 same1
+file1only <
+same2 same2
+ > file2only
+same3 same3
+bottom bottom
