jailtest -> jailcheck (#4268)

18 files changed, 32 insertions, 33 deletions

diff --git a/src/jailtest/Makefile.in b/src/jailcheck/Makefile.in
index 6306d24ec..d218c1f90 100644
--- a/src/jailtest/Makefile.in
+++ b/src/jailcheck/Makefile.in
@@ -1,16 +1,16 @@
 .PHONY: all
-all: jailtest
+all: jailcheck
 
 include ../common.mk
 
 %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-jailtest: $(OBJS)
+jailcheck: $(OBJS)
         $(CC)  $(LDFLAGS) -o $@ $(OBJS)  ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o jailtest *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
diff --git a/src/jailtest/access.c b/src/jailcheck/access.c
index 4e737dc7a..c18d64a82 100644
--- a/src/jailtest/access.c
+++ b/src/jailcheck/access.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include <dirent.h>
 #include <sys/wait.h>
 
@@ -74,7 +74,7 @@ void access_setup(const char *directory) {
 
         // create a test file
         char *test_file;
-        if (asprintf(&test_file, "%s/jailtest-access-%d", path, getpid()) == -1)
+        if (asprintf(&test_file, "%s/jailcheck-access-%d", path, getpid()) == -1)
                 errExit("asprintf");
 
         FILE *fp = fopen(test_file, "w");
diff --git a/src/jailtest/apparmor.c b/src/jailcheck/apparmor.c
index 9ddfea3de..64f278046 100644
--- a/src/jailtest/apparmor.c
+++ b/src/jailcheck/apparmor.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 
 #ifdef HAVE_APPARMOR
 #include <sys/apparmor.h>
diff --git a/src/jailtest/jailtest.h b/src/jailcheck/jailcheck.h
index 0c4883061..32be1c978 100644
--- a/src/jailtest/jailtest.h
+++ b/src/jailcheck/jailcheck.h
@@ -17,8 +17,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#ifndef JAILTEST_H
-#define JAILTEST_H
+#ifndef JAILCHECK_H
+#define JAILCHECK_H
 
 #include "../include/common.h"
 
diff --git a/src/jailtest/main.c b/src/jailcheck/main.c
index 3369dca39..4d642bf96 100644
--- a/src/jailtest/main.c
+++ b/src/jailcheck/main.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include "../include/firejail_user.h"
 #include "../include/pid.h"
 #include <sys/wait.h>
@@ -30,7 +30,7 @@ char *user_run_dir = NULL;
 int arg_debug = 0;
 
 static char *usage_str =
-        "Usage: jailtest [options] directory [directory]\n\n"
+        "Usage: jailcheck [options] directory [directory]\n\n"
         "Options:\n"
         "   --debug - print debug messages.\n"
         "   --help, -? - this help screen.\n"
diff --git a/src/jailtest/noexec.c b/src/jailcheck/noexec.c
index 4347b7eef..7f994d6a1 100644
--- a/src/jailtest/noexec.c
+++ b/src/jailcheck/noexec.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -67,7 +67,7 @@ void noexec_test(const char *path) {
                 return;
 
         char *fname;
-        if (asprintf(&fname, "%s/jailtest-noexec-%d", path, getpid()) == -1)
+        if (asprintf(&fname, "%s/jailcheck-noexec-%d", path, getpid()) == -1)
                 errExit("asprintf");
 
         pid_t child = fork();
diff --git a/src/jailtest/seccomp.c b/src/jailcheck/seccomp.c
index 2cecb4b4d..9345eb970 100644
--- a/src/jailtest/seccomp.c
+++ b/src/jailcheck/seccomp.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #define MAXBUF 4096
 
 void seccomp_test(pid_t pid) {
diff --git a/src/jailtest/sysfiles.c b/src/jailcheck/sysfiles.c
index 7e4709453..caeb580af 100644
--- a/src/jailtest/sysfiles.c
+++ b/src/jailcheck/sysfiles.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include <dirent.h>
 #include <sys/wait.h>
 
diff --git a/src/jailtest/utils.c b/src/jailcheck/utils.c
index 41c21b753..c3aaae298 100644
--- a/src/jailtest/utils.c
+++ b/src/jailcheck/utils.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include "../include/pid.h"
 #include <errno.h>
 #include <pwd.h>
diff --git a/src/jailtest/virtual.c b/src/jailcheck/virtual.c
index fcdcf9720..09092f9ce 100644
--- a/src/jailtest/virtual.c
+++ b/src/jailcheck/virtual.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "jailtest.h"
+#include "jailcheck.h"
 #include <dirent.h>
 #include <sys/wait.h>
 
@@ -43,7 +43,7 @@ void virtual_setup(const char *directory) {
 
         // create a test file
         char *test_file;
-        if (asprintf(&test_file, "%s/jailtest-private-%d", directory, getpid()) == -1)
+        if (asprintf(&test_file, "%s/jailcheck-private-%d", directory, getpid()) == -1)
                 errExit("asprintf");
 
         FILE *fp = fopen(test_file, "w");
diff --git a/src/man/Makefile.in b/src/man/Makefile.in
index 3711d5cec..fbd2d795e 100644
--- a/src/man/Makefile.in
+++ b/src/man/Makefile.in
@@ -1,5 +1,5 @@
 .PHONY: all
-all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailtest.man
+all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
 
 include ../common.mk
 
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt
index dbb9397c6..7e0a57f92 100644
--- a/src/man/firecfg.txt
+++ b/src/man/firecfg.txt
@@ -135,4 +135,4 @@ Homepage: https://firejail.wordpress.com
 .BR firejail-profile (5),
 .BR firejail-login (5),
 .BR firejail-users (5),
-.BR jailtest (1)
+.BR jailcheck (1)
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.txt
index 1b8a4931c..05afd55b5 100644
--- a/src/man/firejail-login.txt
+++ b/src/man/firejail-login.txt
@@ -39,4 +39,4 @@ Homepage: https://firejail.wordpress.com
 .BR firecfg (1),
 .BR firejail-profile (5),
 .BR firejail-users (5),
-.BR jailtest (1)
+.BR jailcheck (1)
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 49be8d0b0..3d59705b9 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -986,7 +986,7 @@ Homepage: https://firejail.wordpress.com
 .BR firecfg (1),
 .BR firejail-login (5),
 .BR firejail-users (5),
-.BR jailtest (1)
+.BR jailcheck (1)
 
 .UR https://github.com/netblue30/firejail/wiki/Creating-Profiles
 .UE
diff --git a/src/man/firejail-users.txt b/src/man/firejail-users.txt
index c5a9c1848..e3cce7ed5 100644
--- a/src/man/firejail-users.txt
+++ b/src/man/firejail-users.txt
@@ -59,4 +59,4 @@ Homepage: https://firejail.wordpress.com
 .BR firecfg (1),
 .BR firejail-profile (5),
 .BR firejail-login (5),
-.BR jailtest (1)
+.BR jailcheck (1)
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 68aea5857..690da4b4e 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -3367,7 +3367,7 @@ Homepage: https://firejail.wordpress.com
 .BR firejail-profile (5),
 .BR firejail-login (5),
 .BR firejail-users (5),
-.BR jailtest (1)
+.BR jailcheck (1)
 
 .UR https://github.com/netblue30/firejail/wiki
 .UE ,
diff --git a/src/man/firemon.txt b/src/man/firemon.txt
index 64f15a1f0..76b2f7be2 100644
--- a/src/man/firemon.txt
+++ b/src/man/firemon.txt
@@ -120,4 +120,4 @@ Homepage: https://firejail.wordpress.com
 .BR firejail-profile (5),
 .BR firejail-login (5),
 .BR firejail-users (5),
-.BR jailtest (1)
+.BR jailcheck (1)
diff --git a/src/man/jailtest.txt b/src/man/jailcheck.txt
index b52fc5eed..c80e305cc 100644
--- a/src/man/jailtest.txt
+++ b/src/man/jailcheck.txt
@@ -1,23 +1,22 @@
-.TH JAILTEST 1 "MONTH YEAR" "VERSION" "JAILTEST man page"
+.TH JAILCHECK 1 "MONTH YEAR" "VERSION" "JAILCHECK man page"
 .SH NAME
-jailtest \- Simple utility program to test running sandboxes
+jailcheck \- Simple utility program to test running sandboxes
 .SH SYNOPSIS
-sudo jailtest [OPTIONS] [directory]
+sudo jailcheck [OPTIONS] [directory]
 .SH DESCRIPTION
-WORK IN PROGRESS!
-jailtest attaches itself to all sandboxes started by the user and performs some basic tests
+jailcheck attaches itself to all sandboxes started by the user and performs some basic tests
 on the sandbox filesystem:
 .TP
 \fB1. Virtual directories
-jailtest extracts a list with the main virtual directories installed by the sandbox.
+jailcheck extracts a list with the main virtual directories installed by the sandbox.
 These directories are build by firejail at startup using --private* and --whitelist commands.
 .TP
 \fB2. Noexec test
-jailtest inserts executable programs in /home/username, /tmp, and /var/tmp directories
+jailcheck inserts executable programs in /home/username, /tmp, and /var/tmp directories
 and tries to run them from inside the sandbox, thus testing if the directory is executable or not.
 .TP
 \fB3. Read access test
-jailtest creates test files in the directories specified by the user and tries to read
+jailcheck creates test files in the directories specified by the user and tries to read
 them from inside the sandbox.
 .TP
 \fB4. AppArmor test
@@ -49,7 +48,7 @@ It is followed by relevant sandbox information, such as the virtual directories
 
 .SH EXAMPLE
 
-$ sudo jailtest
+$ sudo jailcheck
 .br
 2014:netblue::firejail /usr/bin/gimp
 .br