zdtm: replace err() on pr_perror()

There is an another err() in glibc
Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

test/zdtm/lib/lock.c

@@ -23,7 +23,7 @@ void task_waiter_init(task_waiter_t *t)
 	t->seed = t->seed % TASK_WAITER_INITIAL;
 
 	if (pipe(t->pipes)) {
-		err("task_waiter_init failed: %m");
+		pr_perror("task_waiter_init failed");
 		exit(1);
 	}
 }
@@ -69,14 +69,14 @@ void task_waiter_wait4(task_waiter_t *t, unsigned int lockid)
 	return;
 
 err:
-	err("task_waiter_wait4 failed: %m");
+	pr_perror("task_waiter_wait4 failed");
 	exit(errno);
 }
 
 void task_waiter_complete(task_waiter_t *t, unsigned int lockid)
 {
 	if (write(t->pipes[1], &lockid, sizeof(lockid)) != sizeof(lockid)) {
-		err("task_waiter_complete failed: %m");
+		pr_perror("task_waiter_complete failed");
 		exit(1);
 	}
 }

test/zdtm/lib/msg.c

@@ -19,7 +19,7 @@ int test_log_init(const char *fname, const char *suffix)
 	snprintf(path, sizeof(path), "%s%s", fname, suffix);
 	logfd = open(path, O_WRONLY | O_EXCL | O_CREAT | O_APPEND, 0644);
 	if (logfd < 0) {
-		err("Can't open file %s", fname);
+		pr_perror("Can't open file %s", path);
 		return -1;
 	}
 
@@ -50,7 +50,7 @@ void test_msg(const char *format, ...)
 	gettimeofday(&tv, NULL);
 	tm = localtime(&tv.tv_sec);
 	if (tm == NULL) {
-		err("localtime() failed");
+		pr_perror("localtime() failed");
 	} else {
 		off += strftime(buf, sizeof(buf), "%H:%M:%S", tm);
 	}

test/zdtm/lib/tcp.c

@@ -27,12 +27,12 @@ int tcp_init_server(int family, int *port)
 
 	sock = socket(family, SOCK_STREAM, IPPROTO_TCP);
 	if (sock == -1) {
-		err ("socket() failed %m");
+		pr_perror("socket() failed %m");
 		return -1;
 	}
 
 	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1 ) {
-		err("setsockopt() error");
+		pr_perror("setsockopt() error");
 		return -1;
 	}
 
@@ -54,12 +54,12 @@ int tcp_init_server(int family, int *port)
 	}
 
 	if (ret == -1) {
-		err ("bind() failed %m");
+		pr_perror("bind() failed %m");
 		return -1;
 	}
 
 	if (listen(sock, 1) == -1) {
-		err ("listen() failed %m");
+		pr_perror("listen() failed %m");
 		return -1;
 	}
 	return sock;
@@ -77,7 +77,7 @@ int tcp_accept_server(int sock)
 	sock2 = accept(sock,(struct sockaddr *) &maddr, &addrlen);
 
 	if (sock2 == -1) {
-		err ("accept() failed %m");
+		pr_perror("accept() failed %m");
 		return -1;
 	}
 
@@ -93,7 +93,7 @@ int tcp_init_client(int family, char *servIP, unsigned short servPort)
 	union sockaddr_inet servAddr;
 
 	if ((sock = socket(family, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-		err("can't create socket %m");
+		pr_perror("can't create socket %m");
 		return -1;
 	}
 	/* Construct the server address structure */
@@ -108,7 +108,7 @@ int tcp_init_client(int family, char *servIP, unsigned short servPort)
 		inet_pton(AF_INET6, servIP, &servAddr.v6.sin6_addr);
 	}
 	if (connect(sock, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0) {
-		err("can't connect to server %m");
+		pr_perror("can't connect to server %m");
 		return -1;
 	}
 	return sock;

test/zdtm/lib/test.c

@@ -75,7 +75,7 @@ static void redir_stdfds()
 
 	nullfd = open("/dev/null", O_RDWR);
 	if (nullfd < 0) {
-		err("Can't open /dev/null");
+		pr_perror("Can't open /dev/null");
 		exit(1);
 	}
 
@@ -174,13 +174,13 @@ void test_init(int argc, char **argv)
 
 	pidf = fopen(pidfile, "wx");
 	if (!pidf) {
-		err("Can't create pid file %s", pidfile);
+		pr_perror("Can't create pid file %s", pidfile);
 		exit(1);
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("Daemonizing failed");
+		pr_perror("Daemonizing failed");
 		exit(1);
 	}
 
@@ -192,11 +192,11 @@ void test_init(int argc, char **argv)
 			waitpid(pid, &ret, 0);
 
 			if (WIFEXITED(ret)) {
-				err("Test exited with unexpectedly with code %d", WEXITSTATUS(ret));
+				pr_perror("Test exited with unexpectedly with code %d", WEXITSTATUS(ret));
 				exit(0);
 			}
 			if (WIFSIGNALED(ret)) {
-				err("Test exited on unexpected signal %d", WTERMSIG(ret));
+				pr_perror("Test exited on unexpected signal %d", WTERMSIG(ret));
 				exit(0);
 			}
 		}
@@ -209,7 +209,7 @@ void test_init(int argc, char **argv)
 	fclose(pidf);
 
 	if (setsid() < 0) {
-		err("Can't become session group leader");
+		pr_perror("Can't become session group leader");
 		exit(1);
 	}
 
@@ -219,7 +219,7 @@ skip_pid:
 
 	sa.sa_handler = SIG_DFL;
 	if (sigaction(SIGCHLD, &sa, NULL)) {
-		err("Can't reset SIGCHLD handler");
+		pr_perror("Can't reset SIGCHLD handler");
 		exit(1);
 	}
 
@@ -252,12 +252,12 @@ static int do_test_fn(void *_arg)
 
 	sigemptyset(&sa.sa_mask);
 	if (sigaction(SIGCHLD, &sa, NULL)) {
-		err("Can't reset SIGCHLD handler");
+		pr_perror("Can't reset SIGCHLD handler");
 		exit(1);
 	}
 
 	if (setsid() < 0) {
-		err("Can't become session group leader");
+		pr_perror("Can't become session group leader");
 		exit(1);
 	}
 
@@ -302,7 +302,7 @@ void test_init_ns(int argc, char **argv, unsigned long clone_flags,
 
 	pidf = fopen(pidfile, "wx");
 	if (!pidf) {
-		err("Can't create pid file %s", pidfile);
+		pr_perror("Can't create pid file %s", pidfile);
 		exit(1);
 	}
 
@@ -312,7 +312,7 @@ void test_init_ns(int argc, char **argv, unsigned long clone_flags,
 	ca.argv = argv;
 	pid = clone(do_test_fn, ca.stack_ptr, clone_flags | SIGCHLD, &ca);
 	if (pid < 0) {
-		err("Daemonizing failed");
+		pr_perror("Daemonizing failed");
 		exit(1);
 	}
 
@@ -324,11 +324,11 @@ void test_init_ns(int argc, char **argv, unsigned long clone_flags,
 		waitpid(pid, &ret, 0);
 
 		if (WIFEXITED(ret)) {
-			err("Test exited with unexpectedly with code %d", WEXITSTATUS(ret));
+			pr_perror("Test exited with unexpectedly with code %d", WEXITSTATUS(ret));
 			exit(0);
 		}
 		if (WIFSIGNALED(ret)) {
-			err("Test exited on unexpected signal %d", WTERMSIG(ret));
+			pr_perror("Test exited on unexpected signal %d", WTERMSIG(ret));
 			exit(0);
 		}
 	}
@@ -344,7 +344,7 @@ void test_daemon()
 
 	ppid = getppid();
 	if (ppid <= 1) {
-		err("Test orphaned");
+		pr_perror("Test orphaned");
 		goto out;
 	}
 

test/zdtm/lib/zdtmtst.h

@@ -102,7 +102,7 @@ extern int parse_opt_string(char *param, void *arg);
 extern void setup_outfile(void);
 extern int test_log_init(const char *outfile, const char *suffix);
 extern int zdtm_seccomp;
-#define err(format, arg...)	\
+#define pr_perror(format, arg...)	\
 	test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", \
 		__FILE__, __LINE__, ## arg, errno, strerror(errno))
 #define fail(format, arg...)	\

test/zdtm/live/static/aio00.c

@@ -16,7 +16,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (io_setup(1, &ctx) < 0) {
-		err("Can't setup io ctx");
+		pr_perror("Can't setup io ctx");
 		return 1;
 	}
 

test/zdtm/live/static/bind-mount.c

@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 	mkdir(test_bind, 0700);
 
 	if (mount(test_dir, test_bind, NULL, MS_BIND, NULL)) {
-		err("Unable to mount %s to %s", test_dir, test_bind);
+		pr_perror("Unable to mount %s to %s", test_dir, test_bind);
 		return 1;
 	}
 
@@ -42,18 +42,18 @@ int main(int argc, char **argv)
 
 	fd = open(test_file, O_CREAT | O_WRONLY | O_EXCL, 0600);
 	if (fd < 0) {
-		err("Unable to open %s", test_file);
+		pr_perror("Unable to open %s", test_file);
 		return 1;
 	}
 	close(fd);
 
 	if (access(test_bind_file, F_OK)) {
-		err("%s doesn't exist", test_bind_file);
+		pr_perror("%s doesn't exist", test_bind_file);
 		return 1;
 	}
 
 	if (umount(test_bind)) {
-		err("Unable to umount %s", test_bind);
+		pr_perror("Unable to umount %s", test_bind);
 		return 1;
 	}
 

test/zdtm/live/static/caps00.c

@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 	f = fopen("/proc/sys/kernel/cap_last_cap", "r");
 	if (f) {
 		if (fscanf(f, "%d", &cap_last_cap) != 1) {
-			err("Unable to read cal_last_cap");
+			pr_perror("Unable to read cal_last_cap");
 			return 1;
 		}
 		fclose(f);
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 		test_msg("/proc/sys/kernel/cap_last_cap is not available\n");
 
 	if (pipe(result_pipe)) {
-		err("Can't create pipe");
+		pr_perror("Can't create pipe");
 		return 1;
 	}
 
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 		hdr.pid = 0;
 
 		if (capget(&hdr, data) < 0) {
-			err("capget");
+			pr_perror("capget");
 			return -1;
 		}
 
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 		data[0].prm &= ~(1 << CAP_DAC_OVERRIDE);
 
 		if (capset(&hdr, data) < 0) {
-			err("capset");
+			pr_perror("capset");
 			return -1;
 		}
 
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 		hdr.pid = 0;
 
 		if (capget(&hdr, data_2) < 0) {
-			err("second capget");
+			pr_perror("second capget");
 			return -1;
 		}
 

test/zdtm/live/static/cgroup00.c

@@ -28,7 +28,7 @@ static int cg_move(char *name)
 
 	cgfd = open(paux, O_WRONLY);
 	if (cgfd < 0) {
-		err("Can't open tasks");
+		pr_perror("Can't open tasks");
 		return -1;
 	}
 
@@ -36,7 +36,7 @@ static int cg_move(char *name)
 	close(cgfd);
 
 	if (l < 0) {
-		err("Can't move self to subcg");
+		pr_perror("Can't move self to subcg");
 		return -1;
 	}
 
@@ -90,13 +90,13 @@ int main(int argc, char **argv)
 	pipe(pr);
 
 	if (mkdir(dirname, 0700) < 0) {
-		err("Can't make dir");
+		pr_perror("Can't make dir");
 		goto out;
 	}
 
 	sprintf(aux, "none,name=%s", cgname);
 	if (mount("none", dirname, "cgroup", 0, aux)) {
-		err("Can't mount cgroups");
+		pr_perror("Can't mount cgroups");
 		goto out_rd;
 	}
 
@@ -199,7 +199,7 @@ out:
 	return 0;
 
 out_ks:
-	err("Error moving into cgroups");
+	pr_perror("Error moving into cgroups");
 	close(pr[0]);
 	goto out_rs;
 }

test/zdtm/live/static/cgroup01.c

@@ -25,13 +25,13 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mkdir(dirname, 0700) < 0) {
-		err("Can't make dir");
+		pr_perror("Can't make dir");
 		goto out;
 	}
 
 	sprintf(aux, "none,name=%s", cgname);
 	if (mount("none", dirname, "cgroup", 0, aux)) {
-		err("Can't mount cgroups");
+		pr_perror("Can't mount cgroups");
 		goto out_rd;
 	}
 
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
 
 	cgfd = open(paux, O_WRONLY);
 	if (cgfd < 0) {
-		err("Can't open tasks");
+		pr_perror("Can't open tasks");
 		goto out_rs;
 	}
 
@@ -51,14 +51,14 @@ int main(int argc, char **argv)
 	close(cgfd);
 
 	if (l < 0) {
-		err("Can't move self to subcg");
+		pr_perror("Can't move self to subcg");
 		goto out_rs;
 	}
 
 	for (i = 0; i < 2; i++) {
 		sprintf(paux, "%s/%s/%s.%d", dirname, subname, empty, i);
 		if (mkdir(paux, 0600)) {
-			err("mkdir %s", paux);
+			pr_perror("mkdir %s", paux);
 			return 1;
 		}
 	}

test/zdtm/live/static/cgroup02.c

@@ -23,19 +23,19 @@ int mount_and_add(const char *controller, const char *path)
 	int cgfd, l;
 
 	if (mkdir(dirname, 0700) < 0 && errno != EEXIST) {
-		err("Can't make dir");
+		pr_perror("Can't make dir");
 		return -1;
 	}
 
 	sprintf(subdir, "%s/%s", dirname, controller);
 	if (mkdir(subdir, 0700) < 0) {
-		err("Can't make dir");
+		pr_perror("Can't make dir");
 		return -1;
 	}
 
 	sprintf(aux, "none,name=%s", controller);
 	if (mount("none", subdir, "cgroup", 0, aux)) {
-		err("Can't mount cgroups");
+		pr_perror("Can't mount cgroups");
 		goto err_rd;
 	}
 
@@ -47,7 +47,7 @@ int mount_and_add(const char *controller, const char *path)
 
 	cgfd = open(paux, O_WRONLY);
 	if (cgfd < 0) {
-		err("Can't open tasks");
+		pr_perror("Can't open tasks");
 		goto err_rs;
 	}
 
@@ -55,7 +55,7 @@ int mount_and_add(const char *controller, const char *path)
 	close(cgfd);
 
 	if (l < 0) {
-		err("Can't move self to subcg");
+		pr_perror("Can't move self to subcg");
 		goto err_rs;
 	}
 

test/zdtm/live/static/child_opened_proc.c

@@ -22,7 +22,7 @@ int main(int argc, char ** argv)
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		exit(1);
 	}
 
@@ -34,7 +34,7 @@ int main(int argc, char ** argv)
 	sprintf(name, "/proc/%d/stat", pid);
 	proc_fd = open(name, O_RDONLY);
 	if (proc_fd == -1) {
-		err("can't open %s", name);
+		pr_perror("can't open %s", name);
 		err++;
 		goto out;
 	}
@@ -42,16 +42,16 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (close(proc_fd) == -1) {
-		err("Failed to close %s", name);
+		pr_perror("Failed to close %s", name);
 		err++;
 	}
 out:
 	if (kill(pid, SIGTERM) == -1) {
-		err("Failed to terminate child");
+		pr_perror("Failed to terminate child");
 		err++;
 	} else {
 		if (waitpid(pid, NULL, 0) != pid) {
-			err("Failed to collect killed child");
+			pr_perror("Failed to collect killed child");
 			err++;
 		}
 	}

test/zdtm/live/static/chroot-file.c

@@ -76,16 +76,16 @@ int main(int argc, char **argv)
 		read(pipe_prep[0], &res, 1);
 		if (res != SUCCESS) {
 			if (res == ERR_PIPES)
-				err("broken pipes");
+				pr_perror("broken pipes");
 			else {
 				if (res & ERR_IN_FILE)
-					err("inside-root file fail");
+					pr_perror("inside-root file fail");
 				if (res & ERR_ROOT)
-					err("chroot fail");
+					pr_perror("chroot fail");
 				if (res & ERR_DIR)
-					err("mkdir fail");
+					pr_perror("mkdir fail");
 				if (res & ERR_CHDIR)
-					err("chrid fail");
+					pr_perror("chrid fail");
 			}
 			return 0;
 		}

test/zdtm/live/static/chroot.c

@@ -80,14 +80,14 @@ int main(int argc, char **argv)
 		read(pipe_prep[0], &res, 1);
 		if (res != SUCCESS) {
 			if (res == ERR_PIPES)
-				err("broken pipes");
+				pr_perror("broken pipes");
 			else {
 				if (res & ERR_IN_FILE)
-					err("inside-root file fail");
+					pr_perror("inside-root file fail");
 				if (res & ERR_ROOT)
-					err("chroot fail");
+					pr_perror("chroot fail");
 				if (res & ERR_DIR)
-					err("mkdir fail");
+					pr_perror("mkdir fail");
 			}
 			return 0;
 		}

test/zdtm/live/static/clean_mntns.c

@@ -12,10 +12,10 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (umount("/proc") < 0)
-		err("Can't umount proc");
+		pr_perror("Can't umount proc");
 
 	if (umount("/dev/pts") < 0)
-		err("Can't umount devpts");
+		pr_perror("Can't umount devpts");
 
 	test_daemon();
 	test_waitsig();

test/zdtm/live/static/cmdlinenv00.c

@@ -33,7 +33,7 @@ static void read_from_proc(const char *path, char *buf, size_t size)
 	while (r < size) {
 		ret = read(fd, buf + r, size - r);
 		if (ret < 0) {
-			err("Read failed");
+			pr_perror("Read failed");
 			exit(1);
 		} else if (ret == 0) {
 			break;

test/zdtm/live/static/console.c

@@ -25,18 +25,18 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, S_IFCHR | S_IRUSR | S_IWUSR, makedev(5,1))) {
-		err("Can't create console %s", filename);
+		pr_perror("Can't create console %s", filename);
 		return 1;
 	}
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		err("Open console %s failed", filename);
+		pr_perror("Open console %s failed", filename);
 		return 1;
 	}
 
 	if (fstat(fd, &st1)) {
-		err("Can't stat %s console", filename);
+		pr_perror("Can't stat %s console", filename);
 		return 1;
 	}
 
@@ -44,7 +44,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (fstat(fd, &st2)) {
-		err("Can't stat %s console", filename);
+		pr_perror("Can't stat %s console", filename);
 		return 1;
 	}
 

test/zdtm/live/static/cow00.c

@@ -23,14 +23,14 @@ static int is_cow(void *addr, pid_t p1, pid_t p2)
 	snprintf(buf, sizeof(buf), "/proc/%d/pagemap", p1);
 	fd1 = open(buf, O_RDONLY);
 	if (fd1 < 0) {
-		err("Unable to open file %s", buf);
+		pr_perror("Unable to open file %s", buf);
 		return -1;
 	}
 
 	snprintf(buf, sizeof(buf), "/proc/%d/pagemap", p2);
 	fd2 = open(buf, O_RDONLY);
 	if (fd1 < 0) {
-		err("Unable to open file %s", buf);
+		pr_perror("Unable to open file %s", buf);
 		return -1;
 	}
 
@@ -44,12 +44,12 @@ static int is_cow(void *addr, pid_t p1, pid_t p2)
 
 		ret = read(fd1, &map1, sizeof(map1));
 		if (ret != sizeof(map1)) {
-			err("Unable to read data");
+			pr_perror("Unable to read data");
 			return -1;
 		}
 		ret = read(fd2, &map2, sizeof(map2));
 		if (ret != sizeof(map2)) {
-			err("Unable to read data");
+			pr_perror("Unable to read data");
 			return -1;
 		}
 
@@ -73,7 +73,7 @@ int main(int argc, char ** argv)
 
 	addr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (addr == MAP_FAILED) {
-		err("Can't allocate memory");
+		pr_perror("Can't allocate memory");
 		return 1;
 	}
 
@@ -81,7 +81,7 @@ int main(int argc, char ** argv)
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Unable to fork a new process");
+		pr_perror("Unable to fork a new process");
 		return 1;
 	} else if (pid == 0) {
 		test_waitsig();
@@ -91,7 +91,7 @@ int main(int argc, char ** argv)
 	if (is_cow(addr, pid, getpid()) == 1)
 		test_msg("OK\n");
 	else {
-		err("A page is not shared");
+		pr_perror("A page is not shared");
 		goto out;
 	}
 

test/zdtm/live/static/cow01.c

@@ -84,14 +84,14 @@ static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent,
 	snprintf(buf, sizeof(buf), "/proc/%d/pagemap", pid_child);
 	fd_child = open(buf, O_RDONLY);
 	if (fd_child < 0) {
-		err("Unable to open child pagemap file %s", buf);
+		pr_perror("Unable to open child pagemap file %s", buf);
 		return -1;
 	}
 
 	snprintf(buf, sizeof(buf), "/proc/%d/pagemap", pid_parent);
 	fd_parent = open(buf, O_RDONLY);
 	if (fd_parent < 0) {
-		err("Unable to open parent pagemap file %s", buf);
+		pr_perror("Unable to open parent pagemap file %s", buf);
 		return -1;
 	}
 
@@ -104,28 +104,28 @@ static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent,
 
 		lseek_ret = lseek(fd_child, pfn * sizeof(map_child), SEEK_SET);
 		if (lseek_ret == (off_t) -1) {
-			err("Unable to seek child pagemap to virtual addr %#08lx",
+			pr_perror("Unable to seek child pagemap to virtual addr %#08lx",
 			    pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		lseek_ret = lseek(fd_parent, pfn * sizeof(map_parent), SEEK_SET);
 		if (lseek_ret == (off_t) -1) {
-			err("Unable to seek parent pagemap to virtual addr %#08lx",
+			pr_perror("Unable to seek parent pagemap to virtual addr %#08lx",
 			    pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		ret = read(fd_child, &map_child, sizeof(map_child));
 		if (ret != sizeof(map_child)) {
-			err("Unable to read child pagemap at virtual addr %#08lx",
+			pr_perror("Unable to read child pagemap at virtual addr %#08lx",
 			    pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		ret = read(fd_parent, &map_parent, sizeof(map_parent));
 		if (ret != sizeof(map_parent)) {
-			err("Unable to read parent pagemap at virtual addr %#08lx",
+			pr_perror("Unable to read parent pagemap at virtual addr %#08lx",
 			    pfn * PAGE_SIZE);
 			return -1;
 		}
@@ -136,11 +136,11 @@ static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent,
 		p = (void **)(addr + i * PAGE_SIZE);
 		test_msg("Read *%p = %p\n", p, p[0]);
 		if (write(fd, &p, sizeof(p)) != sizeof(p)) {
-			err("write");
+			pr_perror("write");
 			return -1;
 		}
 		if (read(fd, &p, sizeof(p)) != sizeof(p)) {
-			err("read");
+			pr_perror("read");
 			return -1;
 		}
 		test_msg("Child %p\n", p);
@@ -304,7 +304,7 @@ static int __init_cow(struct test_cases *tcs, int flags)
 				PROT_READ | PROT_WRITE,
 				MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (addr == MAP_FAILED) {
-		err("Can't allocate memory");
+		pr_perror("Can't allocate memory");
 		return -1;
 	}
 
@@ -348,7 +348,7 @@ static int init_sep(struct test_cases *tcs)
 				PROT_READ | PROT_WRITE,
 				MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (tcs->addr == MAP_FAILED) {
-		err("Can't allocate memory");
+		pr_perror("Can't allocate memory");
 		return -1;
 	}
 
@@ -370,7 +370,7 @@ static int init_file(struct test_cases *tcs)
 
 	fd = open(filename, O_TRUNC | O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		err("Unable to create a test file");
+		pr_perror("Unable to create a test file");
 		return -1;
 	}
 
@@ -380,7 +380,7 @@ static int init_file(struct test_cases *tcs)
 		datagen2(buf, sizeof(buf), &crc);
 		ret = write(fd, buf, sizeof(buf));
 		if (ret != sizeof(buf)) {
-			err("Unable to write data in test file %s", filename);
+			pr_perror("Unable to write data in test file %s", filename);
 			return -1;
 		}
 
@@ -392,7 +392,7 @@ static int init_file(struct test_cases *tcs)
 				PROT_READ | PROT_WRITE,
 				MAP_PRIVATE | MAP_FILE, fd, 0);
 	if (tcs->addr == MAP_FAILED) {
-		err("Can't allocate memory");
+		pr_perror("Can't allocate memory");
 		return -1;
 	}
 
@@ -410,7 +410,7 @@ static int child(task_waiter_t *child_waiter, int fd)
 				PROT_READ | PROT_WRITE,
 				MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 	if (sep_tcs.addr == MAP_FAILED) {
-		err("Can't allocate memory");
+		pr_perror("Can't allocate memory");
 		return -1;
 	}
 
@@ -424,13 +424,13 @@ static int child(task_waiter_t *child_waiter, int fd)
 		if (ret == 0)
 			break;
 		if (ret != sizeof(p)) {
-			err("read");
+			pr_perror("read");
 			return -1;
 		}
 		test_msg("Read *%p = %p\n", p, p[0]);
 		p = ((void **)p)[0];
 		if (write(fd, &p, sizeof(p)) != sizeof(p)) {
-			err("write");
+			pr_perror("write");
 			return -1;
 		}
 		ret = 0;
@@ -460,7 +460,7 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, pfd)) {
-		err("pipe");
+		pr_perror("pipe");
 		return 1;
 	}
 
@@ -469,7 +469,7 @@ int main(int argc, char ** argv)
 
 	child_pid = test_fork();
 	if (child_pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		return 2;
 	}
 

test/zdtm/live/static/cwd00.c

@@ -23,22 +23,22 @@ int main(int argc, char **argv)
 
 	fd = open(".", O_DIRECTORY | O_RDONLY);
 	if (fd == -1) {
-		err("Unable to open the current dir");
+		pr_perror("Unable to open the current dir");
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	if (chdir(dirname)) {
-		err("can't change directory to %s", dirname);
+		pr_perror("can't change directory to %s", dirname);
 		goto cleanup;
 	}
 
 	if (!getcwd(cwd1, sizeof(cwd1))) {
-		err("can't get cwd");
+		pr_perror("can't get cwd");
 		goto cleanup;
 	}
 
@@ -57,11 +57,11 @@ int main(int argc, char **argv)
 cleanup:
 	/* return to the initial dir before writing out results */
 	if (fchdir(fd)) {
-		err("can't restore cwd");
+		pr_perror("can't restore cwd");
 		exit(1);
 	}
 	if (rmdir(dirname)) {
-		err("can't remove directory %s", dirname);
+		pr_perror("can't remove directory %s", dirname);
 		exit(1);
 	}
 	return 0;

test/zdtm/live/static/cwd01.c

@@ -35,17 +35,17 @@ int main(int argc, char **argv)
 
 	fd = open(".", O_DIRECTORY | O_RDONLY);
 	if (fd == -1) {
-		err("Unable to open the current dir");
+		pr_perror("Unable to open the current dir");
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	if (chdir(dirname)) {
-		err("can't change directory to %s", dirname);
+		pr_perror("can't change directory to %s", dirname);
 		goto cleanup;
 	}
 
@@ -53,17 +53,17 @@ int main(int argc, char **argv)
 	close(p[0]);
 	waitpid(pid, &aux, 0);
 	if (!WIFEXITED(aux) || WEXITSTATUS(aux) != 0) {
-		err("can't remove dir");
+		pr_perror("can't remove dir");
 		goto cleanup;
 	}
 
 	aux = readlink("/proc/self/cwd", cwd1, sizeof(cwd1));
 	if (aux < 0) {
-		err("can't get cwd");
+		pr_perror("can't get cwd");
 		goto cleanup;
 	}
 	if (aux == sizeof(cwd1)) {
-		err("A buffer is too small");
+		pr_perror("A buffer is too small");
 		goto cleanup;
 	}
 
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 	if (aux2 == sizeof(cwd2)) {
-		err("A buffer is too small");
+		pr_perror("A buffer is too small");
 		goto cleanup;
 	}
 
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 cleanup:
 	/* return to the initial dir before writing out results */
 	if (fchdir(fd)) {
-		err("can't restore cwd");
+		pr_perror("can't restore cwd");
 		exit(1);
 	}
 

test/zdtm/live/static/cwd02.c

@@ -32,22 +32,22 @@ int main(int argc, char **argv)
 
 	cwd = open(".", O_DIRECTORY | O_RDONLY);
 	if (cwd == -1) {
-		err("Unable to open the current dir");
+		pr_perror("Unable to open the current dir");
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	if ((fd = open(dirname, O_DIRECTORY)) < 0) {
-		err("can't open dir %s", dirname);
+		pr_perror("can't open dir %s", dirname);
 		goto cleanup;
 	}
 
 	if (chdir(dirname)) {
-		err("can't change directory to %s", dirname);
+		pr_perror("can't change directory to %s", dirname);
 		goto cleanup;
 	}
 
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 	close(p[0]);
 	waitpid(pid, &aux, 0);
 	if (!WIFEXITED(aux) || WEXITSTATUS(aux) != 0) {
-		err("can't remove dir");
+		pr_perror("can't remove dir");
 		goto cleanup;
 	}
 
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 cleanup:
 	/* return to the initial dir before writing out results */
 	if (fchdir(cwd)) {
-		err("can't restore cwd");
+		pr_perror("can't restore cwd");
 		exit(1);
 	}
 

test/zdtm/live/static/deleted_dev.c

@@ -25,18 +25,18 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, mode, dev)) {
-		err("can't make device file \"%s\"", filename);
+		pr_perror("can't make device file \"%s\"", filename);
 		exit(1);
 	}
 
 	fd = open(filename, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		goto out;
 	}
 
 	if (unlink(filename) < 0) {
-		err("can't unlink %s: %m", filename);
+		pr_perror("can't unlink %s", filename);
 		goto out;
 	}
 

test/zdtm/live/static/deleted_unix_sock.c

@@ -37,23 +37,23 @@ static int setup_srv_sock(void)
 	int sock;
 
 	if (fill_sock_name(&name, filename) < 0) {
-		err("filename \"%s\" is too long", filename);
+		pr_perror("filename \"%s\" is too long", filename);
 		return -1;
 	}
 
 	sock = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sock < 0) {
-		err("can't create socket: %m");
+		pr_perror("can't create socket");
 		return -1;
 	}
 
 	if (bind(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
-		err("can't bind to socket \"%s\": %m", filename);
+		pr_perror("can't bind to socket \"%s\"", filename);
 		goto err;
 	}
 
 	if (listen(sock, 1) < 0) {
-		err("can't listen on a socket \"%s\"", filename);
+		pr_perror("can't listen on a socket \"%s\"", filename);
 		goto err;
 	}
 
@@ -99,7 +99,7 @@ int main(int argc, char ** argv)
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("can't fork");
+		pr_perror("can't fork");
 		exit(1);
 	}
 
@@ -115,7 +115,7 @@ int main(int argc, char ** argv)
 		crc = ~0;
 		datagen(buf, sizeof(buf), &crc);
 		if (write(sock, buf, sizeof(buf)) != sizeof(buf)) {
-			err("can't write to socket: %m");
+			pr_perror("can't write to socket");
 			exit(errno);
 		}
 
@@ -125,7 +125,7 @@ int main(int argc, char ** argv)
 
 	acc_sock = accept(sock, NULL, NULL);
 	if (acc_sock < 0) {
-		err("can't accept() the connection on \"%s\": %m", filename);
+		pr_perror("can't accept() the connection on \"%s\"", filename);
 		goto out_kill;
 	}
 
@@ -133,7 +133,7 @@ int main(int argc, char ** argv)
 	sock = acc_sock;
 
 	if (unlink(filename)) {
-		err("can't unlink %s", filename);
+		pr_perror("can't unlink %s", filename);
 		goto out_kill;
 	}
 

test/zdtm/live/static/different_creds.c

@@ -24,27 +24,27 @@ void *drop_caps_and_wait(void *arg)
 
         caps = cap_get_proc();
         if (!caps) {
-                err("cap_get_proc");
+                pr_perror("cap_get_proc");
                 return NULL;
         }
 
         if (cap_clear_flag(caps, CAP_EFFECTIVE) < 0) {
-                err("cap_clear_flag");
+                pr_perror("cap_clear_flag");
                 goto die;
         }
 
         if (cap_set_proc(caps) < 0) {
-                err("cap_set_proc");
+                pr_perror("cap_set_proc");
                 goto die;
         }
 
 	if (write(fd, "a", 1) != 1) {
-		err("Unable to send a status");
+		pr_perror("Unable to send a status");
 		goto die;
 	}
 
 	if (read(fd, &c, 1) != 1) {
-		err("Unable to read a status");
+		pr_perror("Unable to read a status");
 		goto die;
 	}
 
@@ -64,12 +64,12 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (socketpair(AF_FILE, SOCK_SEQPACKET, 0, pipefd)) {
-		err("pipe");
+		pr_perror("pipe");
 		return -1;
 	}
 
 	if (pthread_create(&thr, NULL, drop_caps_and_wait, &pipefd[0])) {
-		err("Unable to create thread");
+		pr_perror("Unable to create thread");
 		return -1;
 	}
 
@@ -77,7 +77,7 @@ int main(int argc, char ** argv)
 	 * Wait for child to signal us that it has droped caps.
 	 */
 	if (read(pipefd[1], &c, 1) != 1) {
-		err("read");
+		pr_perror("read");
 		return 1;
 	}
 
@@ -85,12 +85,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (write(pipefd[1], &c, 1) != 1) {
-		err("write");
+		pr_perror("write");
 		return 1;
 	}
 
 	if (pthread_join(thr, &retcode)) {
-		err("Unable to jount a thread");
+		pr_perror("Unable to jount a thread");
 		return 1;
 	}
 	if (retcode != NULL)

test/zdtm/live/static/dumpable01.c

@@ -17,7 +17,7 @@ int main(int argc, char **argv)
 
 	save_dumpable = prctl(PR_GET_DUMPABLE);
 	if (save_dumpable < 0) {
-		err("error getting prctl(PR_GET_DUMPABLE) before dump");
+		pr_perror("error getting prctl(PR_GET_DUMPABLE) before dump");
 		return 1;
 	}
 #ifdef DEBUG
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
 
 	dumpable = prctl(PR_GET_DUMPABLE);
 	if (dumpable < 0) {
-		err("error getting prctl(PR_GET_DUMPABLE) after restore");
+		pr_perror("error getting prctl(PR_GET_DUMPABLE) after restore");
 		return 1;
 	}
 #ifdef DEBUG

test/zdtm/live/static/dumpable02.c

@@ -38,18 +38,18 @@ int get_dumpable_from_pipes(int pipe_input, int pipe_output) {
 	write(pipe_input, "GET\n", 4);
 	len = read(pipe_output, buf, sizeof(buf));
 	if (len < 0) {
-		err("error in parent reading from pipe");
+		pr_perror("error in parent reading from pipe");
 		return -1;
 	}
 
 	if (memcmp(buf, "DUMPABLE:", 9) != 0) {
-		err("child returned [%s]", buf);
+		pr_perror("child returned [%s]", buf);
 		return -1;
 	}
 
 	value = strtol(&buf[9], &endptr, 10);
 	if (!endptr || *endptr != '\n' || endptr != buf + len - 1) {
-		err("child returned [%s]", buf);
+		pr_perror("child returned [%s]", buf);
 		return -1;
 	}
 
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 	 */
 	ret = chmod(argv[0], 0111);
 	if (ret < 0) {
-		err("error chmodding %s", argv[0]);
+		pr_perror("error chmodding %s", argv[0]);
 		return 1;
 	}
 
@@ -94,19 +94,19 @@ int main(int argc, char **argv)
 
 	ret = pipe(pipe_input);
 	if (ret < 0) {
-		err("error creating input pipe");
+		pr_perror("error creating input pipe");
 		return 1;
 	}
 
 	ret = pipe(pipe_output);
 	if (ret < 0) {
-		err("error creating output pipe");
+		pr_perror("error creating output pipe");
 		return 1;
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("error forking the dumpable server");
+		pr_perror("error forking the dumpable server");
 		return 1;
 	}
 
@@ -121,13 +121,13 @@ int main(int argc, char **argv)
 
 		ret = dup2(pipe_input[0], 0);
 		if (ret < 0) {
-			err("could not dup2 pipe into child's stdin");
+			pr_perror("could not dup2 pipe into child's stdin");
 			return 1;
 		}
 
 		ret = dup2(pipe_output[1], 1);
 		if (ret < 0) {
-			err("could not dup2 pipe into child's stdout");
+			pr_perror("could not dup2 pipe into child's stdout");
 			return 1;
 		}
 
@@ -138,12 +138,12 @@ int main(int argc, char **argv)
 
 		ret = setenv("DUMPABLE_SERVER", "yes", 1);
 		if (ret < 0) {
-			err("could not set the DUMPABLE_SERVER env variable");
+			pr_perror("could not set the DUMPABLE_SERVER env variable");
 			return 1;
 		}
 
 		ret = execl(argv[0], "dumpable_server", NULL);
-		err("could not execv %s as a dumpable_server", argv[0]);
+		pr_perror("could not execv %s as a dumpable_server", argv[0]);
 		return 1;
 	}
 
@@ -182,22 +182,22 @@ int main(int argc, char **argv)
 
 	waited = wait(&status);
 	if (waited < 0) {
-		err("error calling wait on the child");
+		pr_perror("error calling wait on the child");
 		return 1;
 	}
 	errno = 0;
 	if (waited != pid) {
-		err("waited pid %d did not match child pid %d",
+		pr_perror("waited pid %d did not match child pid %d",
 		    waited, pid);
 		return 1;
 	}
 	if (!WIFEXITED(status)) {
-		err("child dumpable server returned abnormally with status=%d",
+		pr_perror("child dumpable server returned abnormally with status=%d",
 		    status);
 		return 1;
 	}
 	if (WEXITSTATUS(status) != 0) {
-		err("child dumpable server returned rc=%d",
+		pr_perror("child dumpable server returned rc=%d",
 		    WEXITSTATUS(status));
 		return 1;
 	}

test/zdtm/live/static/env00.c

@@ -17,7 +17,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (setenv(envname, test_author, 1)) {
-		err("Can't set env var \"%s\" to \"%s\"", envname, test_author);
+		pr_perror("Can't set env var \"%s\" to \"%s\"", envname, test_author);
 		exit(1);
 	}
 

test/zdtm/live/static/fanotify00.c

@@ -147,7 +147,7 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 	sprintf(str, "/proc/self/fdinfo/%d", fd);
 	f = fopen(str, "r");
 	if (!f) {
-		err("Can't open fdinfo to parse");
+		pr_perror("Can't open fdinfo to parse");
 		return -1;
 	}
 
@@ -188,7 +188,7 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 	}
 
 	if (expected_to_meet != met) {
-		err("Expected to meet %d entries but got %d",
+		pr_perror("Expected to meet %d entries but got %d",
 		    expected_to_meet, met);
 		return -1;
 	}
@@ -196,7 +196,7 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 	return 0;
 
 parse_err:
-	err("Can't parse '%s'", str);
+	pr_perror("Can't parse '%s'", str);
 	return -1;
 }
 
@@ -212,11 +212,11 @@ int main (int argc, char *argv[])
 
 	if (ns) {
 		if (mkdir("/tmp", 666) && errno != EEXIST) {
-			err("Unable to create the /tmp directory");
+			pr_perror("Unable to create the /tmp directory");
 			return -1;
 		}
 		if (mount("zdtm", "/tmp", "tmpfs", 0, NULL)) {
-			err("Unable to mount tmpfs into %s", "/tmp");
+			pr_perror("Unable to mount tmpfs into %s", "/tmp");
 		}
 	}
 
@@ -224,27 +224,27 @@ int main (int argc, char *argv[])
 			      FAN_CLASS_NOTIF | FAN_UNLIMITED_QUEUE,
 			      0);
 	if (fa_fd < 0) {
-		err("fanotify_init failed");
+		pr_perror("fanotify_init failed");
 		exit(1);
 	}
 
 	del_after = open(fanotify_path, O_CREAT | O_TRUNC);
 	if (del_after < 0) {
-		err("open failed");
+		pr_perror("open failed");
 		exit(1);
 	}
 
 	if (fanotify_mark(fa_fd, FAN_MARK_ADD,
 			  FAN_MODIFY | FAN_ACCESS | FAN_OPEN | FAN_CLOSE,
 			  AT_FDCWD, fanotify_path)) {
-		err("fanotify_mark failed");
+		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 
 	if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT,
 			  FAN_ONDIR | FAN_OPEN | FAN_CLOSE,
 			  AT_FDCWD, "/tmp")) {
-		err("fanotify_mark failed");
+		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 
@@ -252,12 +252,12 @@ int main (int argc, char *argv[])
 			  FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY,
 			  FAN_MODIFY | FAN_ACCESS,
 			  AT_FDCWD, "/tmp")) {
-		err("fanotify_mark failed");
+		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 
 	if (parse_fanotify_fdinfo(fa_fd, &old, 3)) {
-		err("parsing fanotify fdinfo failed");
+		pr_perror("parsing fanotify fdinfo failed");
 		exit(1);
 	}
 
@@ -298,7 +298,7 @@ int main (int argc, char *argv[])
 	if (fanotify_mark(fa_fd, FAN_MARK_REMOVE | FAN_MARK_MOUNT,
 			  FAN_ONDIR | FAN_OPEN | FAN_CLOSE,
 			  AT_FDCWD, "/tmp")) {
-		err("fanotify_mark failed");
+		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 

test/zdtm/live/static/fd.c

@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 
 	pid = fork();
 	if (pid < 0) {
-		err("fork()");
+		pr_perror("fork()");
 		return 1;
 	}
 
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 
 		ret = readlinkat(dirfd(d), de->d_name, pfd, sizeof(pfd) - 1);
 		if (ret < 0) {
-			err("readlink");
+			pr_perror("readlink");
 			ret = 0;
 		}
 		pfd[ret] = '\0';
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	kill(pid, SIGTERM);
 
 	if (waitpid(pid, &status, 0) != pid) {
-		err("waitpid()");
+		pr_perror("waitpid()");
 		return 1;
 	}
 

test/zdtm/live/static/fdt_shared.c

@@ -28,7 +28,7 @@ static void forked()
 	char c = 0;
 
 	if (write(fork_pfd[1], &c, 1) != 1) {
-		err("Unable to send a signal to the parent");
+		pr_perror("Unable to send a signal to the parent");
 		exit(5);
 	}
 }
@@ -40,7 +40,7 @@ static void wait_children()
 
 	for (i = 0; i < CHILDREN; i++) {
 		if (read(fork_pfd[0], &c, 1) != 1) {
-			err("Unable to read a signal from a child");
+			pr_perror("Unable to read a signal from a child");
 			exit(5);
 		}
 	}
@@ -54,7 +54,7 @@ static pid_t clone_child(int (*fn)(void *), int flags)
 	pid = clone(fn, stack + STACK_SIZE,
 			flags | SIGCHLD, NULL);
 	if (pid == -1) {
-		err("Unable to clone a new process");
+		pr_perror("Unable to clone a new process");
 		return -1;
 	}
 
@@ -69,7 +69,7 @@ static int child2(void *_arg)
 	test_waitsig();
 
 	if (read(TEST_FD, buf, sizeof(TEST_STRING)) != sizeof(TEST_STRING)) {
-		err("Unable to read from %d", TEST_FD);
+		pr_perror("Unable to read from %d", TEST_FD);
 		return 1;
 	}
 
@@ -123,12 +123,12 @@ static int child(void *_arg)
 	}
 
 	if (read(TEST_FD, buf, sizeof(TEST_STRING)) != sizeof(TEST_STRING)) {
-		err("Unable to read from %d", TEST_FD);
+		pr_perror("Unable to read from %d", TEST_FD);
 		return 1;
 	}
 
 	if (close(TEST_FD) == -1) {
-		err("Unable to close(%d)", TEST_FD);
+		pr_perror("Unable to close(%d)", TEST_FD);
 		return 1;
 	}
 
@@ -144,7 +144,7 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (pipe(fork_pfd)) {
-		err("pipe");
+		pr_perror("pipe");
 		return 1;
 	}
 
@@ -163,19 +163,19 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDWR | O_CREAT, 0666);
 	if (fd == -1) {
-		err("Can't open /dev/zero");
+		pr_perror("Can't open /dev/zero");
 		return -1;
 	}
 
 	for (i = 0; i < 3; i++)
 		if (write(fd, TEST_STRING, sizeof(TEST_STRING)) != sizeof(TEST_STRING)) {
-			err("Unable to write a test string");
+			pr_perror("Unable to write a test string");
 			return -1;
 		}
 
 	fd = dup2(fd, TEST_FD);
 	if (fd == -1) {
-		err("Can't dup fd to %d", fd, TEST_FD);
+		pr_perror("Can't dup fd to %d", fd, TEST_FD);
 		return -1;
 	}
 

test/zdtm/live/static/fifo-ghost.c

@@ -25,19 +25,19 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, mode, 0)) {
-		err("can't make fifo \"%s\"", filename);
+		pr_perror("can't make fifo \"%s\"", filename);
 		exit(1);
 	}
 
 	fd = open(filename, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		return 1;
 	}
 
 	fd_ro = open(filename, O_RDONLY);
 	if (fd_ro < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		return 1;
 	}
 
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 	datagen(buf, sizeof(buf), &crc);
 	ret = write(fd, buf, sizeof(buf));
 	if (ret != sizeof(buf)) {
-		err("write() failed");
+		pr_perror("write() failed");
 		return 1;
 	}
 
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 
 	ret = read(fd_ro, buf, sizeof(buf));
 	if (ret != sizeof(buf)) {
-		err("read() failed");
+		pr_perror("read() failed");
 		return 1;
 	}
 

test/zdtm/live/static/fifo-rowo-pair.c

@@ -44,18 +44,18 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(name_master, S_IFIFO | 0700, 0)) {
-		err("can't make fifo \"%s\"", name_master);
+		pr_perror("can't make fifo \"%s\"", name_master);
 		exit(1);
 	}
 
 	if (mknod(name_slave, S_IFIFO | 0700, 0)) {
-		err("can't make fifo \"%s\"", name_slave);
+		pr_perror("can't make fifo \"%s\"", name_slave);
 		exit(1);
 	}
 
 	fd_slave = open(name_slave, O_RDWR);
 	if (fd_slave < 0) {
-		err("can't open %s", name_slave);
+		pr_perror("can't open %s", name_slave);
 		exit(1);
 	}
 
@@ -67,13 +67,13 @@ int main(int argc, char **argv)
 
 		fd_master = open(name_master, O_WRONLY);
 		if (fd_master < 0) {
-			err("can't open %s", name_master);
+			pr_perror("can't open %s", name_master);
 			exit_shot_parent(1);
 		}
 
 		new_slave = dup2(fd_slave, 64);
 		if (new_slave < 0) {
-			err("can't dup %s", name_slave);
+			pr_perror("can't dup %s", name_slave);
 			exit_shot_parent(1);
 		}
 
@@ -83,13 +83,13 @@ int main(int argc, char **argv)
 
 		v = TEST_VALUE;
 		if (write(new_slave, &v, sizeof(v)) != sizeof(v)) {
-			err("write failed");
+			pr_perror("write failed");
 			exit_shot_parent(1);
 		}
 
 		v = TEST_VALUE;
 		if (write(fd_master, &v, sizeof(v)) != sizeof(v)) {
-			err("write failed");
+			pr_perror("write failed");
 			exit_shot_parent(1);
 		}
 
@@ -98,13 +98,13 @@ int main(int argc, char **argv)
 
 		exit(0);
 	} else if (pid < 0) {
-		err("test_fork failed");
+		pr_perror("test_fork failed");
 		exit(1);
 	}
 
 	fd_master = open(name_master, O_RDONLY);
 	if (fd_master < 0) {
-		err("can't open %s", name_master);
+		pr_perror("can't open %s", name_master);
 		exit_shot(pid, 1);
 	}
 
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (read(fd_master, &v, sizeof(v)) != sizeof(v)) {
-		err("read failed");
+		pr_perror("read failed");
 		exit_shot(pid, 1);
 	}
 
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 	}
 
 	if (read(fd_slave, &v, sizeof(v)) != sizeof(v)) {
-		err("read failed");
+		pr_perror("read failed");
 		exit_shot(pid, 1);
 	}
 	if (v != TEST_VALUE) {
@@ -138,13 +138,13 @@ int main(int argc, char **argv)
 	waitpid(pid, &status, P_ALL);
 
 	if (unlink(name_master) < 0)
-		err("can't unlink %s: %m", name_master);
+		pr_perror("can't unlink %s", name_master);
 
 	if (unlink(name_slave) < 0)
-		err("can't unlink %s: %m", name_slave);
+		pr_perror("can't unlink %s", name_slave);
 
 	if (!WIFEXITED(status)) {
-		err("child %d is still running", pid);
+		pr_perror("child %d is still running", pid);
 		exit_shot(pid, 1);
 	}
 

test/zdtm/live/static/fifo.c

@@ -28,13 +28,13 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, mode, 0)) {
-		err("can't make fifo \"%s\"", filename);
+		pr_perror("can't make fifo \"%s\"", filename);
 		exit(1);
 	}
 
 	fd = open(filename, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		return 1;
 	}
 
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 	datagen(buf, BUF_SIZE, &crc);
 	ret = write(fd, buf, BUF_SIZE);
 	if (ret != BUF_SIZE) {
-		err("write() failed");
+		pr_perror("write() failed");
 		return 1;
 	}
 
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 
 	ret = read(fd, buf, BUF_SIZE);
 	if (ret != BUF_SIZE) {
-		err("read() failed");
+		pr_perror("read() failed");
 		return 1;
 	}
 

test/zdtm/live/static/fifo_ro.c

@@ -28,19 +28,19 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, mode, 0)) {
-		err("can't make fifo \"%s\"", filename);
+		pr_perror("can't make fifo \"%s\"", filename);
 		exit(1);
 	}
 
 	fd = open(filename, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		return 1;
 	}
 
 	fd_ro = open(filename, O_RDONLY);
 	if (fd_ro < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		return 1;
 	}
 
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 	datagen(buf, BUF_SIZE, &crc);
 	ret = write(fd, buf, BUF_SIZE);
 	if (ret != BUF_SIZE) {
-		err("write() failed");
+		pr_perror("write() failed");
 		return 1;
 	}
 
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 
 	ret = read(fd_ro, buf, BUF_SIZE);
 	if (ret != BUF_SIZE) {
-		err("read() failed");
+		pr_perror("read() failed");
 		return 1;
 	}
 

test/zdtm/live/static/fifo_wronly.c

@@ -27,13 +27,13 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mknod(filename, mode, 0)) {
-		err("can't make fifo \"%s\"", filename);
+		pr_perror("can't make fifo \"%s\"", filename);
 		exit(1);
 	}
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		exit(1);
 	}
 
@@ -42,18 +42,18 @@ int main(int argc, char **argv)
 		int res;
 		fd1 = open(filename, O_RDONLY);
 		if (fd1 < 0) {
-			err("open(%s, O_RDONLY) Failed", filename);
+			pr_perror("open(%s, O_RDONLY) Failed", filename);
 			chret = errno;
 			return chret;
 		}
 		res = read(fd1, rbuf, 7);
 		if (res < 0) {
-			err("read error %s", filename);
+			pr_perror("read error %s", filename);
 			chret = errno;
 			return chret;
 		}
 		else if (res == 0) {
-			err("read(%d, rbuf, 7) return 0", fd1);
+			pr_perror("read(%d, rbuf, 7) return 0", fd1);
 			return 1;
 		}
 		if (close(fd1) < 0) {
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
 
 		fd = open(filename, O_WRONLY);
 		if (fd < 0) {
-			err("open(%s, O_WRONLY) Failed", filename);
+			pr_perror("open(%s, O_WRONLY) Failed", filename);
 			kill(pid, SIGKILL);
 			wait(NULL);
 			return 1;
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
 		test_waitsig();
 
 		if (write(fd, "string", 7) == -1) {
-			err("write(%d, 'string', 7) Failed", fd);
+			pr_perror("write(%d, 'string', 7) Failed", fd);
 			return 1;
 		}
 

test/zdtm/live/static/file_append.c

@@ -34,12 +34,12 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (write(fd2, "x", 1) != 1) {
-		err("Can't write x");
+		pr_perror("Can't write x");
 		return 1;
 	}
 
 	if (write(fd, "y", 1) != 1) {
-		err("Can't write y");
+		pr_perror("Can't write y");
 		return 1;
 	}
 

test/zdtm/live/static/file_attr.c

@@ -38,14 +38,14 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0644);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		exit(1);
 	}
 
 	crc = ~0;
 	datagen(buf, sizeof(buf), &crc);
 	if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		err("can't write to %s: %m", filename);
+		pr_perror("can't write to %s", filename);
 		exit(1);
 	}
 
@@ -54,17 +54,17 @@ int main(int argc, char ** argv)
 		.modtime = mtime,
 	};
 	if (utime(filename, &ut)) {
-		err("can't set modtime %d on %s", mtime, filename);
+		pr_perror("can't set modtime %d on %s", mtime, filename);
 		exit(1);
 	}
 
 	if (fchmod(fd, perms)) {
-		err("can't set perms %o on %s", perms, filename);
+		pr_perror("can't set perms %o on %s", perms, filename);
 		exit(1);
 	}
 
 	if (unlink(filename)) {
-		err("can't unlink %s", filename);
+		pr_perror("can't unlink %s", filename);
 		exit(1);
 	}
 

test/zdtm/live/static/file_fown.c

@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (pipe(pipes)) {
-		err("Can't create pipe");
+		pr_perror("Can't create pipe");
 		exit(1);
 	}
 
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("can't fork %m");
+		pr_perror("can't fork %m");
 		exit(1);
 	}
 

test/zdtm/live/static/file_locks00.c

@@ -52,7 +52,7 @@ static int check_read_lock(int fd, int whence, off_t offset, off_t len)
 
 	ret = fcntl(fd, F_GETLK, &lock);
 	if (ret == -1) {
-		err("F_GETLK failed.");
+		pr_perror("F_GETLK failed.");
 		return -1;
 	}
 
@@ -80,7 +80,7 @@ static int check_write_lock(int fd, int whence, off_t offset, off_t len)
 
 	ret = fcntl(fd, F_GETLK, &lock);
 	if (ret == -1) {
-		err("F_GETLK failed.");
+		pr_perror("F_GETLK failed.");
 		return -1;
 	}
 
@@ -107,7 +107,7 @@ static int check_file_locks()
 
 	fd_0 = open(file0, O_RDWR | O_CREAT, 0644);
 	if (fd_0 < 0) {
-		err("Unable to open file %s", file0);
+		pr_perror("Unable to open file %s", file0);
 		return -1;
 	}
 	ret0 = check_read_lock(fd_0, SEEK_SET, 0, 0);
@@ -116,7 +116,7 @@ static int check_file_locks()
 	if (fd_1 < 0) {
 		close(fd_0);
 		unlink(file0);
-		err("Unable to open file %s", file1);
+		pr_perror("Unable to open file %s", file1);
 		return -1;
 	}
 	ret1 = check_write_lock(fd_1, SEEK_SET, 0, 0);
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 	snprintf(file1, sizeof(file0), "%s.1", filename);
 	fd_0 = open(file0, O_RDWR | O_CREAT | O_EXCL, 0666);
 	if (fd_0 < 0) {
-		err("Unable to open file %s", file0);
+		pr_perror("Unable to open file %s", file0);
 		return -1;
 	}
 
@@ -146,13 +146,13 @@ int main(int argc, char **argv)
 	if (fd_1 < 0) {
 		close(fd_0);
 		unlink(file0);
-		err("Unable to open file %s", file1);
+		pr_perror("Unable to open file %s", file1);
 		return -1;
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		return -1;
 	}
 

test/zdtm/live/static/file_locks01.c

@@ -34,7 +34,7 @@ static int open_all_files(int *fd_0, int *fd_1, int *fd_2)
 	snprintf(file2, sizeof(file0), "%s.2", filename);
 	*fd_0 = open(file0, O_RDWR | O_CREAT | O_EXCL, 0666);
 	if (*fd_0 < 0) {
-		err("Unable to open file %s", file0);
+		pr_perror("Unable to open file %s", file0);
 		return -1;
 	}
 
@@ -50,7 +50,7 @@ static int open_all_files(int *fd_0, int *fd_1, int *fd_2)
 	if (*fd_1 < 0) {
 		close(*fd_0);
 		unlink(file0);
-		err("Unable to open file %s", file1);
+		pr_perror("Unable to open file %s", file1);
 		return -1;
 	}
 
@@ -63,7 +63,7 @@ static int open_all_files(int *fd_0, int *fd_1, int *fd_2)
 		close(*fd_1);
 		unlink(file0);
 		unlink(file1);
-		err("Unable to open file %s", file1);
+		pr_perror("Unable to open file %s", file1);
 		return -1;
 	}
 
@@ -107,7 +107,7 @@ static int check_file_locks()
 			&fl_owner, &maj, &min, &i_no, &start, end);
 
 		if (num < 10) {
-			err("Invalid lock info.");
+			pr_perror("Invalid lock info.");
 			break;
 		}
 
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 
 	m = get_cwd_mnt_info();
 	if (!m) {
-		err("Can't fetch mountinfo");
+		pr_perror("Can't fetch mountinfo");
 		return -1;
 	}
 	if (!strcmp(m->fsname, "btrfs"))

test/zdtm/live/static/file_locks02.c

@@ -40,7 +40,7 @@ static int check_file_locks(pid_t child)
 			fl_flag, fl_type, fl_option, &fl_owner);
 
 		if (num < 4) {
-			err("Invalid lock info.");
+			pr_perror("Invalid lock info.");
 			break;
 		}
 
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		err("No file");
+		pr_perror("No file");
 		return -1;
 	}
 

test/zdtm/live/static/file_locks03.c

@@ -40,7 +40,7 @@ static int check_file_locks(int alt_pid)
 			fl_flag, fl_type, fl_option, &fl_owner);
 
 		if (num < 4) {
-			err("Invalid lock info.");
+			pr_perror("Invalid lock info.");
 			break;
 		}
 
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		err("No file");
+		pr_perror("No file");
 		return -1;
 	}
 

test/zdtm/live/static/file_locks04.c

@@ -40,7 +40,7 @@ static int check_file_locks(int alt_pid, int fd)
 			fl_flag, fl_type, fl_option, &fl_owner);
 
 		if (num < 4) {
-			err("Invalid lock info.");
+			pr_perror("Invalid lock info.");
 			break;
 		}
 
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		err("No file");
+		pr_perror("No file");
 		return -1;
 	}
 
@@ -93,14 +93,14 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		err("No file 2");
+		pr_perror("No file 2");
 		close(pf[1]);
 		waitpid(pid, NULL, 0);
 		return -1;
 	}
 
 	if (flock(fd, LOCK_EX | LOCK_NB) == 0) {
-		err("Bogus locks");
+		pr_perror("Bogus locks");
 		close(pf[1]);
 		waitpid(pid, NULL, 0);
 		return -1;

test/zdtm/live/static/file_locks05.c

@@ -24,13 +24,13 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		err("No file");
+		pr_perror("No file");
 		return -1;
 	}
 
 	fd2 = open(filename, O_RDWR);
 	if (fd2 < 0) {
-		err("No file2");
+		pr_perror("No file2");
 		return -1;
 	}
 

test/zdtm/live/static/file_shared.c

@@ -55,12 +55,12 @@ int main(int argc, char **argv)
 
 		ret = kill(pid, SIGTERM);
 		if (ret == -1) {
-			err("kill() failed: %m");
+			pr_perror("kill() failed");
 		}
 
 		ret = wait(&status);
 		if (ret == -1) {
-			err("wait() failed: %m");
+			pr_perror("wait() failed");
 			return 1;
 		}
 

test/zdtm/live/static/futex.c

@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (num_threads > MAX_NUM_THREADS) {
-		err("%d threads it too much. max is %d",
+		pr_perror("%d threads it too much. max is %d",
 				num_threads, MAX_NUM_THREADS);
 		goto out;
 	}
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 
 	for (i = 0; i < num_threads; i++)
 		if (pthread_create(&thr[i], NULL, thread_fn, &m)) {
-			err("Can't create %d'th thread", i + 1);
+			pr_perror("Can't create %d'th thread", i + 1);
 			goto out_kill;
 		}
 
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 		if (errno == EBUSY)
 			fail("kids left my mutex locked\n");
 		else
-			err("kids spoiled my mutex");
+			pr_perror("kids spoiled my mutex");
 	}
 
 	if (kid_passed != num_threads)

test/zdtm/live/static/get_smaps_bits.c

@@ -102,7 +102,7 @@ int get_smaps_bits(unsigned long where, unsigned long *flags, unsigned long *mad
 
 	smaps = fopen("/proc/self/smaps", "r");
 	if (!smaps) {
-		err("Can't open smaps: %m");
+		pr_perror("Can't open smaps");
 		return -1;
 	}
 
@@ -119,7 +119,7 @@ int get_smaps_bits(unsigned long where, unsigned long *flags, unsigned long *mad
 	fclose(smaps);
 
 	if (!found) {
-		err("VmFlags not found for %lx", where);
+		pr_perror("VmFlags not found for %lx", where);
 		return -1;
 	}
 

test/zdtm/live/static/groups.c

@@ -20,14 +20,14 @@ int main(int argc, char **argv)
 
 	ng = getgroups(0, NULL);
 	if (ng < 0) {
-		err("Can't get groups");
+		pr_perror("Can't get groups");
 		return -1;
 	}
 
 	grp = malloc((ng + 1) * sizeof(*grp));
 	ng = getgroups(ng, grp);
 	if (ng < 0) {
-		err("Can't get groups2");
+		pr_perror("Can't get groups2");
 		return -1;
 	}
 
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 	grp[ng++] = max + 1;
 
 	if (setgroups(ng, grp) < 0) {
-		err("Can't set groups");
+		pr_perror("Can't set groups");
 		return -1;
 	}
 

test/zdtm/live/static/grow_map.c

@@ -15,7 +15,7 @@ int main(int argc, char **argv)
 
 	start_addr = mmap(NULL, PAGE_SIZE * 10, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (start_addr == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 	munmap(start_addr, PAGE_SIZE * 10);
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
 			 PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (fake_grow_down == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
 			 PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
 	if (test_addr == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 			 PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (grow_down == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 

test/zdtm/live/static/grow_map02.c

@@ -18,7 +18,7 @@ int main(int argc, char **argv)
 	start_addr = mmap(NULL, PAGE_SIZE * 10, PROT_READ | PROT_WRITE,
 					MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (start_addr == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 	munmap(start_addr, PAGE_SIZE * 10);
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
 			 PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (grow_down == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	 * Only the irst one will have a guard page
 	 */
 	if (mprotect(grow_down + PAGE_SIZE, PAGE_SIZE, PROT_READ)) {
-		err("Can't change set protection on a region of memory");
+		pr_perror("Can't change set protection on a region of memory");
 		return 1;
 	}
 

test/zdtm/live/static/grow_map03.c

@@ -21,7 +21,7 @@ int main(int argc, char **argv)
 
 	start_addr = mmap(NULL, PAGE_SIZE * 10, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (start_addr == MAP_FAILED) {
-		err("Can't mal a new region");
+		pr_perror("Can't mal a new region");
 		return 1;
 	}
 	munmap(start_addr, PAGE_SIZE * 10);

test/zdtm/live/static/inotify00.c

@@ -83,7 +83,7 @@ static int inotify_read_events(char *prefix, int inotify_fd, unsigned int *expec
 		ret = read(inotify_fd, buf, sizeof(buf));
 		if (ret < 0) {
 			if (errno != EAGAIN) {
-				err("Can't read inotify queue");
+				pr_perror("Can't read inotify queue");
 				return -1;
 			} else {
 				ret = 0;
@@ -119,7 +119,7 @@ int main (int argc, char *argv[])
 	test_init(argc, argv);
 
 	if (mkdir(dirname, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
-		err("Can't create directory %s", dirname);
+		pr_perror("Can't create directory %s", dirname);
 		exit(1);
 	}
 
@@ -131,13 +131,13 @@ int main (int argc, char *argv[])
 	static char buf[PATH_MAX];
 
 	if (mount(NULL, "/", NULL, MS_PRIVATE | MS_REC, NULL)) {
-		err("Unable to remount /");
+		pr_perror("Unable to remount /");
 		return 1;
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("Can't fork a test process");
+		pr_perror("Can't fork a test process");
 		exit(1);
 	}
 	if (pid == 0) {
@@ -145,17 +145,17 @@ int main (int argc, char *argv[])
 
 		prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
 		if (unshare(CLONE_NEWNS)) {
-			err("Unable to unshare mount namespace");
+			pr_perror("Unable to unshare mount namespace");
 			exit(1);
 		}
 
 		if (mount("zdtm", dirname, "tmpfs", 0, NULL)) {
-			err("Unable to mount tmpfs");
+			pr_perror("Unable to mount tmpfs");
 			exit(1);
 		}
 		fd = open(dirname, O_RDONLY);
 		if (fd < 0) {
-			err("Unable to open %s", dirname);
+			pr_perror("Unable to open %s", dirname);
 			exit(1);
 		}
 		dup2(fd, 100);
@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
 
 	fd = inotify_init1(IN_NONBLOCK);
 	if (fd < 0) {
-		err("inotify_init failed");
+		pr_perror("inotify_init failed");
 		exit(1);
 	}
 
@@ -180,17 +180,17 @@ int main (int argc, char *argv[])
 
 	real_fd = open(test_file_path, O_CREAT | O_TRUNC | O_RDWR, 0644);
 	if (real_fd < 0) {
-		err("Can't create %s", test_file_path);
+		pr_perror("Can't create %s", test_file_path);
 		exit(1);
 	}
 
 	if (inotify_add_watch(fd, dirname, mask) < 0) {
-		err("inotify_add_watch failed");
+		pr_perror("inotify_add_watch failed");
 		exit(1);
 	}
 
 	if (inotify_add_watch(fd, test_file_path, mask) < 0) {
-		err("inotify_add_watch failed");
+		pr_perror("inotify_add_watch failed");
 		exit(1);
 	}
 
@@ -202,7 +202,7 @@ int main (int argc, char *argv[])
 
 #ifndef INOTIFY01
 	if (unlink(test_file_path)) {
-		err("can't unlink %s", test_file_path);
+		pr_perror("can't unlink %s", test_file_path);
 		exit(1);
 	}
 
@@ -211,7 +211,7 @@ int main (int argc, char *argv[])
 	if (emask) {
 		char emask_bits[128];
 		decode_event_mask(emask_bits, sizeof(emask_bits), emask);
-		err("Unhandled events in emask %#x -> %s",
+		pr_perror("Unhandled events in emask %#x -> %s",
 		    emask, emask_bits);
 		exit(1);
 	}
@@ -235,7 +235,7 @@ int main (int argc, char *argv[])
 #ifndef INOTIFY01
 	real_fd = open(test_file_path, O_CREAT | O_TRUNC | O_RDWR, 0644);
 	if (real_fd < 0) {
-		err("Can't create %s", test_file_path);
+		pr_perror("Can't create %s", test_file_path);
 		exit(1);
 	}
 	close(real_fd);

test/zdtm/live/static/inotify_irmap.c

@@ -32,7 +32,7 @@ int main (int argc, char *argv[])
 
 	unlink(TFIL);
 	if (creat(TFIL, 0600) < 0) {
-		err("Can't make test file");
+		pr_perror("Can't make test file");
 		exit(1);
 	}
 

test/zdtm/live/static/inotify_system.c

@@ -77,12 +77,12 @@ int createFiles(char *path, char *target, char *link) {
 	int fd;
 	fd = open(path,O_CREAT, 0644);
 	if (fd < 0) {
-		err("can't open %s: %m", path);
+		pr_perror("can't open %s", path);
 		return -1;
 	}
 	close(fd);
 	if (symlink(target, link) < 0) {
-		err("can't symlink %s to %s: %m", path, link);
+		pr_perror("can't symlink %s to %s", path, link);
 		return -1;
 	}
 	return 0;
@@ -92,7 +92,7 @@ int addWatcher(int fd, const char *path) {
 	int wd;
 	wd = inotify_add_watch(fd, path, IN_ALL_EVENTS | IN_DONT_FOLLOW);
 	if (wd < 0) {
-		err("inotify_add_watch(%d, %s, IN_ALL_EVENTS) Failed, %s",
+		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) Failed, %s",
 			fd, path, strerror(errno));
 		return -1;
 	}
@@ -101,7 +101,7 @@ int addWatcher(int fd, const char *path) {
 
 int fChmod(char *path) {
 	if (chmod(path, 0755) < 0) {
-		err("chmod(%s, 0755) Failed, %s",
+		pr_perror("chmod(%s, 0755) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
@@ -111,16 +111,16 @@ int fChmod(char *path) {
 int fWriteClose(char *path) {
 	int fd = open(path, O_RDWR | O_CREAT, 0700);
 	if (fd == -1) {
-		err("open(%s, O_RDWR|O_CREAT,0700) Failed, %s",
+		pr_perror("open(%s, O_RDWR|O_CREAT,0700) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
 	if (write(fd, "string", 7) == -1) {
-		err("write(%d, %s, 1) Failed, %s", fd, path, strerror(errno));
+		pr_perror("write(%d, %s, 1) Failed, %s", fd, path, strerror(errno));
 		return -1;
 	}
 	if (close(fd) == -1) {
-		err("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) Failed, %s", path, strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -130,17 +130,17 @@ int fNoWriteClose(char *path) {
 	char buf[BUF_SIZE];
 	int fd = open(path, O_RDONLY);
 	if ( fd < 0 ) {
-		err("open(%s, O_RDONLY) Failed, %s",
+		pr_perror("open(%s, O_RDONLY) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
 	if (read(fd, buf, BUF_SIZE) == -1) {
-		err("read error: %s", strerror(errno));
+		pr_perror("read error: %s", strerror(errno));
 		close(fd);
 		return -1;
 	}
 	if (close(fd) == -1) {
-		err("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) Failed, %s", path, strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -148,7 +148,7 @@ int fNoWriteClose(char *path) {
 
 int fMove(char *from, char *to) {
 	if (rename(from, to) == -1) {
-		err("rename error (from: %s to: %s) : %s",
+		pr_perror("rename error (from: %s to: %s) : %s",
 			from, to, strerror(errno));
 		return -1;
 	}
@@ -158,25 +158,25 @@ int fMove(char *from, char *to) {
 desc init_env(const char *dir, char *file_path, char *link_path) {
 	desc in_desc = {-1, -1, -1, -1};
 	if (mkdir(dir, 0777) < 0) {
-		err("error in creating directory: %s, %s",
+		pr_perror("error in creating directory: %s, %s",
 			dir, strerror(errno));
 		return in_desc;
 	}
 	in_desc.inot = inotify_init();
 	if (in_desc.inot < 0) {
-		err("inotify_init () Failed, %s", strerror(errno));
+		pr_perror("inotify_init () Failed, %s", strerror(errno));
 		rmdir(dir);
 		return in_desc;
 	}
 
 	if (snprintf(file_path, BUF_SIZE, "%s/%s", dir, filename) >= BUF_SIZE) {
-		err("filename %s is too long", filename);
+		pr_perror("filename %s is too long", filename);
 		rmdir(dir);
 		return in_desc;
 	}
 
 	if (snprintf(link_path, BUF_SIZE, "%s/%s", dir, linkname) >= BUF_SIZE) {
-		err("filename %s is too long", linkname);
+		pr_perror("filename %s is too long", linkname);
 		rmdir(dir);
 		return in_desc;
 	}
@@ -193,7 +193,7 @@ desc init_env(const char *dir, char *file_path, char *link_path) {
 
 int fDelete(char *path) {
 	if (unlink(path) != 0) {
-		err("unlink: (%s)", strerror(errno));
+		pr_perror("unlink: (%s)", strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -201,7 +201,7 @@ int fDelete(char *path) {
 
 int fRemDir(const char *target) {
 	if(rmdir(target)) {
-		err("rmdir: (%s)", strerror(errno));
+		pr_perror("rmdir: (%s)", strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -296,7 +296,7 @@ next_event:
 int read_set(int inot_fd, char *event_set) {
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		err("read(%d, buf, %d) Failed, errno=%d : %s",
+		pr_perror("read(%d, buf, %d) Failed, errno=%d : %s",
 			inot_fd, EVENT_BUF_LEN, errno, strerror(errno));
 		return -1;
 	}

test/zdtm/live/static/inotify_system_nodel.c

@@ -77,12 +77,12 @@ int createFiles(char *path, char *target, char *link) {
 	int fd;
 	fd = open(path,O_CREAT, 0644);
 	if (fd < 0) {
-		err("can't open %s: %m", path);
+		pr_perror("can't open %s", path);
 		return -1;
 	}
 	close(fd);
 	if (symlink(target, link) < 0) {
-		err("can't symlink %s to %s: %m", path, link);
+		pr_perror("can't symlink %s to %s", path, link);
 		return -1;
 	}
 	return 0;
@@ -92,7 +92,7 @@ int addWatcher(int fd, const char *path) {
 	int wd;
 	wd = inotify_add_watch(fd, path, IN_ALL_EVENTS | IN_DONT_FOLLOW);
 	if (wd < 0) {
-		err("inotify_add_watch(%d, %s, IN_ALL_EVENTS) Failed, %s",
+		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) Failed, %s",
 			fd, path, strerror(errno));
 		return -1;
 	}
@@ -101,7 +101,7 @@ int addWatcher(int fd, const char *path) {
 
 int fChmod(char *path) {
 	if (chmod(path, 0755) < 0) {
-		err("chmod(%s, 0755) Failed, %s",
+		pr_perror("chmod(%s, 0755) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
@@ -111,16 +111,16 @@ int fChmod(char *path) {
 int fWriteClose(char *path) {
 	int fd = open(path, O_RDWR | O_CREAT, 0700);
 	if (fd == -1) {
-		err("open(%s, O_RDWR|O_CREAT,0700) Failed, %s",
+		pr_perror("open(%s, O_RDWR|O_CREAT,0700) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
 	if (write(fd, "string", 7) == -1) {
-		err("write(%d, %s, 1) Failed, %s", fd, path, strerror(errno));
+		pr_perror("write(%d, %s, 1) Failed, %s", fd, path, strerror(errno));
 		return -1;
 	}
 	if (close(fd) == -1) {
-		err("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) Failed, %s", path, strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -130,17 +130,17 @@ int fNoWriteClose(char *path) {
 	char buf[BUF_SIZE];
 	int fd = open(path, O_RDONLY);
 	if ( fd < 0 ) {
-		err("open(%s, O_RDONLY) Failed, %s",
+		pr_perror("open(%s, O_RDONLY) Failed, %s",
 			path, strerror(errno));
 		return -1;
 	}
 	if (read(fd, buf, BUF_SIZE) == -1) {
-		err("read error: %s", strerror(errno));
+		pr_perror("read error: %s", strerror(errno));
 		close(fd);
 		return -1;
 	}
 	if (close(fd) == -1) {
-		err("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) Failed, %s", path, strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -148,7 +148,7 @@ int fNoWriteClose(char *path) {
 
 int fMove(char *from, char *to) {
 	if (rename(from, to) == -1) {
-		err("rename error (from: %s to: %s) : %s",
+		pr_perror("rename error (from: %s to: %s) : %s",
 			from, to, strerror(errno));
 		return -1;
 	}
@@ -158,25 +158,25 @@ int fMove(char *from, char *to) {
 desc init_env(const char *dir, char *file_path, char *link_path) {
 	desc in_desc = {-1, -1, -1, -1};
 	if (mkdir(dir, 0777) < 0) {
-		err("error in creating directory: %s, %s",
+		pr_perror("error in creating directory: %s, %s",
 			dir, strerror(errno));
 		return in_desc;
 	}
 	in_desc.inot = inotify_init();
 	if (in_desc.inot < 0) {
-		err("inotify_init () Failed, %s", strerror(errno));
+		pr_perror("inotify_init () Failed, %s", strerror(errno));
 		rmdir(dir);
 		return in_desc;
 	}
 
 	if (snprintf(file_path, BUF_SIZE, "%s/%s", dir, filename) >= BUF_SIZE) {
-		err("filename %s is too long", filename);
+		pr_perror("filename %s is too long", filename);
 		rmdir(dir);
 		return in_desc;
 	}
 
 	if (snprintf(link_path, BUF_SIZE, "%s/%s", dir, linkname) >= BUF_SIZE) {
-		err("filename %s is too long", linkname);
+		pr_perror("filename %s is too long", linkname);
 		rmdir(dir);
 		return in_desc;
 	}
@@ -193,7 +193,7 @@ desc init_env(const char *dir, char *file_path, char *link_path) {
 
 int fDelete(char *path) {
 	if (unlink(path) != 0) {
-		err("unlink: (%s)", strerror(errno));
+		pr_perror("unlink: (%s)", strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -201,7 +201,7 @@ int fDelete(char *path) {
 
 int fRemDir(const char *target) {
 	if(rmdir(target)) {
-		err("rmdir: (%s)", strerror(errno));
+		pr_perror("rmdir: (%s)", strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -296,7 +296,7 @@ next_event:
 int read_set(int inot_fd, char *event_set) {
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		err("read(%d, buf, %d) Failed, errno=%d : %s",
+		pr_perror("read(%d, buf, %d) Failed, errno=%d : %s",
 			inot_fd, EVENT_BUF_LEN, errno, strerror(errno));
 		return -1;
 	}

test/zdtm/live/static/ipc_namespace.c

@@ -71,12 +71,12 @@ static int read_ipc_sysctl(char *name, int *data, size_t size)
 
 	fd = open(name, O_RDONLY);
 	if (fd < 0) {
-		err("Can't open %d", name);
+		pr_perror("Can't open %d", name);
 		return fd;
 	}
 	ret = read(fd, buf, 32);
 	if (ret < 0) {
-		err("Can't read %s", name);
+		pr_perror("Can't read %s", name);
 		ret = -errno;
 		goto err;
 	}
@@ -94,7 +94,7 @@ static int get_messages_info(struct ipc_ns *ipc)
 
 	ret = msgctl(0, MSG_INFO, (struct msqid_ds *)&info);
 	if (ret < 0) {
-		err("msgctl failed with %d", errno);
+		pr_perror("msgctl failed with %d", errno);
 		return ret;
 	}
 
@@ -118,7 +118,7 @@ static int get_semaphores_info(struct ipc_ns *ipc)
 
 	err = semctl(0, 0, SEM_INFO, &info);
 	if (err < 0)
-		err("semctl failed with %d", errno);
+		pr_perror("semctl failed with %d", errno);
 
 	ipc->sem_ctls[0] = info.semmsl;
 	ipc->sem_ctls[1] = info.semmns;
@@ -141,7 +141,7 @@ static int get_shared_memory_info(struct ipc_ns *ipc)
 
 	ret = shmctl(0, IPC_INFO, &u.shmid);
 	if (ret < 0)
-		err("semctl failed with %d", errno);
+		pr_perror("semctl failed with %d", errno);
 
 	ipc->shm_ctlmax = u.shminfo64.shmmax;
 	ipc->shm_ctlall = u.shminfo64.shmall;
@@ -149,7 +149,7 @@ static int get_shared_memory_info(struct ipc_ns *ipc)
 
 	ret = shmctl(0, SHM_INFO, &u.shmid);
 	if (ret < 0)
-		err("semctl failed with %d", errno);
+		pr_perror("semctl failed with %d", errno);
 
 	ipc->shm_tot = u.shminfo.shm_tot;
 	ipc->ids[IPC_SHM_IDS].in_use = u.shminfo.used_ids;
@@ -177,19 +177,19 @@ int fill_ipc_ns(struct ipc_ns *ipc)
 
 	ret = get_messages_info(ipc);
 	if (ret < 0) {
-		err("Failed to collect messages");
+		pr_perror("Failed to collect messages");
 		return ret;
 	}
 
 	ret = get_semaphores_info(ipc);
 	if (ret < 0) {
-		err("Failed to collect semaphores");
+		pr_perror("Failed to collect semaphores");
 		return ret;
 	}
 
 	ret = get_shared_memory_info(ipc);
 	if (ret < 0) {
-		err("Failed to collect shared memory");
+		pr_perror("Failed to collect shared memory");
 		return ret;
 	}
 	return 0;
@@ -203,13 +203,13 @@ static int rand_ipc_sysctl(char *name, unsigned int val)
 
 	fd = open(name, O_WRONLY);
 	if (fd < 0) {
-		err("Can't open %d", name);
+		pr_perror("Can't open %d", name);
 		return fd;
 	}
 	sprintf(buf, "%d\n", val);
 	ret = write(fd, buf, strlen(buf));
 	if (ret < 0) {
-		err("Can't write %u into %s", val, name);
+		pr_perror("Can't write %u into %s", val, name);
 		return -errno;
 	}
 	close(fd);
@@ -225,14 +225,14 @@ static int rand_ipc_sem(void)
 
 	fd = open(name, O_WRONLY);
 	if (fd < 0) {
-		err("Can't open %s", name);
+		pr_perror("Can't open %s", name);
 		return fd;
 	}
 	sprintf(buf, "%d %d %d %d\n", (unsigned)lrand48(), (unsigned)lrand48(),
 				      (unsigned)lrand48(), (unsigned)lrand48());
 	ret = write(fd, buf, 128);
 	if (ret < 0) {
-		err("Can't write %s: %d", name, errno);
+		pr_perror("Can't write %s: %d", name, errno);
 		return -errno;
 	}
 	close(fd);
@@ -270,7 +270,7 @@ static int rand_ipc_ns(void)
 		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_max", ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
 
 	if (ret < 0)
-		err("Failed to randomize ipc namespace tunables");
+		pr_perror("Failed to randomize ipc namespace tunables");
 
 	return ret;
 }
@@ -281,49 +281,49 @@ static void show_ipc_entry(struct ipc_ns *old, struct ipc_ns *new)
 
 	for (i = 0; i < 3; i++) {
 		if (old->ids[i].in_use != new->ids[i].in_use)
-			err("ids[%d].in_use differs: %d ---> %d", i,
+			pr_perror("ids[%d].in_use differs: %d ---> %d", i,
 				old->ids[i].in_use, new->ids[i].in_use);
 
 	}
 	for (i = 0; i < 4; i++) {
 		if (old->sem_ctls[i] != new->sem_ctls[i])
-			err("sem_ctls[%d] differs: %d ---> %d", i,
+			pr_perror("sem_ctls[%d] differs: %d ---> %d", i,
 				old->sem_ctls[i], new->sem_ctls[i]);
 
 	}
 
 	if (old->msg_ctlmax != new->msg_ctlmax)
-		err("msg_ctlmax differs: %d ---> %d",
+		pr_perror("msg_ctlmax differs: %d ---> %d",
 			old->msg_ctlmax, new->msg_ctlmax);
 	if (old->msg_ctlmnb != new->msg_ctlmnb)
-		err("msg_ctlmnb differs: %d ---> %d",
+		pr_perror("msg_ctlmnb differs: %d ---> %d",
 			old->msg_ctlmnb, new->msg_ctlmnb);
 	if (old->msg_ctlmni != new->msg_ctlmni)
-		err("msg_ctlmni differs: %d ---> %d",
+		pr_perror("msg_ctlmni differs: %d ---> %d",
 			old->msg_ctlmni, new->msg_ctlmni);
 	if (old->auto_msgmni != new->auto_msgmni)
-		err("auto_msgmni differs: %d ---> %d",
+		pr_perror("auto_msgmni differs: %d ---> %d",
 			old->auto_msgmni, new->auto_msgmni);
 	if (old->shm_ctlmax != new->shm_ctlmax)
-		err("shm_ctlmax differs: %d ---> %d",
+		pr_perror("shm_ctlmax differs: %d ---> %d",
 			old->shm_ctlmax, new->shm_ctlmax);
 	if (old->shm_ctlall != new->shm_ctlall)
-		err("shm_ctlall differs: %d ---> %d",
+		pr_perror("shm_ctlall differs: %d ---> %d",
 			old->shm_ctlall, new->shm_ctlall);
 	if (old->shm_ctlmni != new->shm_ctlmni)
-		err("shm_ctlmni differs: %d ---> %d",
+		pr_perror("shm_ctlmni differs: %d ---> %d",
 			old->shm_ctlmni, new->shm_ctlmni);
 	if (old->shm_rmid_forced != new->shm_rmid_forced)
-		err("shm_rmid_forced differs: %d ---> %d",
+		pr_perror("shm_rmid_forced differs: %d ---> %d",
 			old->shm_rmid_forced, new->shm_rmid_forced);
 	if (old->mq_queues_max != new->mq_queues_max)
-		err("mq_queues_max differs: %d ---> %d",
+		pr_perror("mq_queues_max differs: %d ---> %d",
 			old->mq_queues_max, new->mq_queues_max);
 	if (old->mq_msg_max != new->mq_msg_max)
-		err("mq_msg_max differs: %d ---> %d",
+		pr_perror("mq_msg_max differs: %d ---> %d",
 			old->mq_msg_max, new->mq_msg_max);
 	if (old->mq_msgsize_max != new->mq_msgsize_max)
-		err("mq_msgsize_max differs: %d ---> %d",
+		pr_perror("mq_msgsize_max differs: %d ---> %d",
 			old->mq_msgsize_max, new->mq_msgsize_max);
 }
 
@@ -333,13 +333,13 @@ static int test_fn(int argc, char **argv)
 
 	ret = rand_ipc_ns();
 	if (ret) {
-		err("Failed to randomize ipc ns before migration");
+		pr_perror("Failed to randomize ipc ns before migration");
 		return -1;
 	}
 
 	ret = fill_ipc_ns(&ipc_before);
 	if (ret) {
-		err("Failed to collect ipc ns before migration");
+		pr_perror("Failed to collect ipc ns before migration");
 		return ret;
 	}
 
@@ -348,12 +348,12 @@ static int test_fn(int argc, char **argv)
 
 	ret = fill_ipc_ns(&ipc_after);
 	if (ret) {
-		err("Failed to collect ipc ns after migration");
+		pr_perror("Failed to collect ipc ns after migration");
 		return ret;
 	}
 
 	if (memcmp(&ipc_before, &ipc_after, sizeof(ipc_after))) {
-		err("IPC's differ");
+		pr_perror("IPC's differ");
 		show_ipc_entry(&ipc_before, &ipc_after);
 		return -EINVAL;
 	}

test/zdtm/live/static/jobctl00.c

@@ -197,7 +197,7 @@ int start_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 	 * exit :) and signal that via SIGCHLD */
 	if (signal(SIGUSR2, record_sig) == SIG_ERR ||
 	    signal(SIGCHLD, record_sig) == SIG_ERR) {
-		err("can't install signal handler: %m");
+		pr_perror("can't install signal handler");
 		return -1;
 	}
 
@@ -206,7 +206,7 @@ int start_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 
 		jobs[i] = fork();
 		if (jobs[i] < 0) {	/* we're busted - bail out */
-			err("fork failed: %m");
+			pr_perror("fork failed");
 			goto killout;
 		}
 
@@ -273,19 +273,19 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (num_jobs > JOBS_MAX) {
-		err("%d jobs is too many", num_jobs);
+		pr_perror("%d jobs is too many", num_jobs);
 		exit(1);
 	}
 
 	if (make_pty_pair(&fdmaster, &fdslave) < 0) {
-		err("can't make pty pair: %m");
+		pr_perror("can't make pty pair");
 		exit(1);
 	}
 
 	sleep(30);
 
 	if (start_jobs(jobs, num_jobs, fdmaster, fdslave)) {
-		err("failed to start jobs");
+		pr_perror("failed to start jobs");
 		exit(1);
 	}
 

test/zdtm/live/static/link10.c

@@ -25,24 +25,24 @@ int main(int argc, char ** argv)
 
 	if (snprintf(filename2, sizeof(filename2), "%s.lnk", filename) >=
 	    sizeof(filename2)) {
-		err("filename %s is too long", filename);
+		pr_perror("filename %s is too long", filename);
 		exit(1);
 	}
 
 	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);
 	if (fd < 0) {
-		err("can't open %s: %m", filename);
+		pr_perror("can't open %s", filename);
 		exit(1);
 	}
 
 	if (link(filename, filename2) < 0) {
-		err("can't link %s to %s: %m", filename, filename2);
+		pr_perror("can't link %s to %s", filename, filename2);
 		goto unlink;
 	}
 
 	fd2 = open(filename2, O_RDONLY);
 	if (fd < 0) {
-		err("can't open %s: %m", filename2);
+		pr_perror("can't open %s", filename2);
 		goto unlink;
 	}
 

test/zdtm/live/static/maps00.c

@@ -77,27 +77,27 @@ static int make_map(struct map *map)
 		/* need file */
 		if (snprintf(map->filename, sizeof(map->filename),
 					 "%s-%02d", filename, i++) >= sizeof(map->filename)) {
-			err("filename %s is too long", filename);
+			pr_perror("filename %s is too long", filename);
 			return -1;
 		}
 
 		map->fd = open(map->filename, O_RDWR | O_CREAT, 0600);
 		if (map->fd < 0) {
-			err("can't open %s", map->filename);
+			pr_perror("can't open %s", map->filename);
 			return -1;
 		}
 
 		crc = ~0;
 		datagen(buf, sizeof(buf), &crc);
 		if (write(map->fd, buf, sizeof(buf)) != sizeof(buf)) {
-			err("failed to write %s", map->filename);
+			pr_perror("failed to write %s", map->filename);
 			return -1;
 		}
 	}
 
 	map->ptr = mmap(NULL, ONE_MAP_SIZE, map->prot, map->flag, map->fd, 0);
 	if (map->ptr == MAP_FAILED) {
-		err("can't create mapping");
+		pr_perror("can't create mapping");
 		return -1;
 	}
 
@@ -178,7 +178,7 @@ static int check_map(struct map *map)
 			if (!(map->flag & MAP_ANONYMOUS)) {
 				lseek(map->fd,0,SEEK_SET);
 				if (write(map->fd,test_func,check_map - test_func)<check_map - test_func) {
-					err("failed to write %s", map->filename);
+					pr_perror("failed to write %s", map->filename);
 					return -1;
 				}
 			}

test/zdtm/live/static/maps01.c

@@ -109,13 +109,13 @@ int main(int argc, char ** argv)
 						(unsigned long) m + MEM_SIZE);
 	fd = open(path, O_RDWR);
 	if (fd == -1) {
-		err("Can't open file %s: %m", path);
+		pr_perror("Can't open file %s", path);
 		goto err;
 	}
 
 	m2 = mmap(NULL, PAGE_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED, fd, MEM_OFFSET3);
 	if (m2 == MAP_FAILED) {
-		err("Can't map file %s", path);
+		pr_perror("Can't map file %s", path);
 		goto err;
 	}
 	close(fd);

test/zdtm/live/static/maps02.c

@@ -23,7 +23,7 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 	m->start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE,
 			flags, -1, 0);
 	if (m->start == MAP_FAILED) {
-		err("mmap failed: %m");
+		pr_perror("mmap failed");
 		return -1;
 	}
 
@@ -33,7 +33,7 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 			munmap(m->start, MEM_SIZE);
 			*m = (struct mmap_data){ };
 		} else {
-			err("madvise failed: %m");
+			pr_perror("madvise failed");
 			return -1;
 		}
 	}
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 			return -1;
 
 		if (m[i].orig_flags != m[i].new_flags) {
-			err("Flags are changed %lx %lx -> %lx (%d)",
+			pr_perror("Flags are changed %lx %lx -> %lx (%d)",
 			    (unsigned long)m[i].start,
 			    m[i].orig_flags, m[i].new_flags, i);
 			fail();
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 		}
 
 		if (m[i].orig_madv != m[i].new_madv) {
-			err("Madvs are changed %lx %lx -> %lx (%d)",
+			pr_perror("Madvs are changed %lx %lx -> %lx (%d)",
 			    (unsigned long)m[i].start,
 			    m[i].orig_madv, m[i].new_madv, i);
 			fail();

test/zdtm/live/static/maps03.c

@@ -15,7 +15,7 @@ int main(int argc, char **argv)
 	mem = (void *)mmap(NULL, (10L << 30), PROT_READ | PROT_WRITE,
 			   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if ((void *)mem == MAP_FAILED) {
-		err("mmap failed: %m");
+		pr_perror("mmap failed");
 		return -1;
 	}
 

test/zdtm/live/static/maps04.c

@@ -37,7 +37,7 @@ int main(int argc, char ** argv)
 
 	for (i = 0; i < MEM_SIZE / (1<<20); i++)
 		if (mprotect(m + (lrand48() * PAGE_SIZE % MEM_SIZE), PAGE_SIZE, PROT_NONE)) {
-			err("mprotect");
+			pr_perror("mprotect");
 			return 1;
 		}
 
@@ -45,7 +45,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (mprotect(m, MEM_SIZE, PROT_READ))
-		err("mprotect");
+		pr_perror("mprotect");
 
 	crc = ~0;
 	if (datachk(m, MEM_SIZE, &crc))

test/zdtm/live/static/maps05.c

@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 
 	addr = mmap(NULL, summary, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (addr == MAP_FAILED) {
-		err("Can't mmap");
+		pr_perror("Can't mmap");
 		return 1;
 	}
 	munmap(addr, summary);
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 		map[i] = mmap(i > 0 ? map[i - 1] + 8192 : addr, 4096, PROT_READ | PROT_WRITE,
 			      MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 		if (map[i] == MAP_FAILED) {
-			err("Can't mmap");
+			pr_perror("Can't mmap");
 			return 1;
 		} else {
 			/* Dirtify it */
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 	map[NR_MAPS_1] = mmap(map[NR_MAPS_1 - 1] + 8192, MAPS_SIZE_1, PROT_READ | PROT_WRITE | PROT_EXEC,
 			      MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
 	if (map[NR_MAPS_1] == MAP_FAILED) {
-		err("Can't mmap");
+		pr_perror("Can't mmap");
 		return 1;
 	} else {
 		/* Dirtify it */
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 	map[NR_MAPS_2] = mmap(map[NR_MAPS_1] + MAPS_SIZE_1, MAPS_SIZE_2, PROT_READ | PROT_WRITE,
 			      MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
 	if (map[NR_MAPS_2] == MAP_FAILED) {
-		err("Can't mmap");
+		pr_perror("Can't mmap");
 		return 1;
 	} else {
 		/* Dirtify it */

test/zdtm/live/static/maps_file_prot.c

@@ -13,7 +13,7 @@ const char *test_author	= "Jamie Liu <jamieliu@google.com>";
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define die(fmt, arg...) do { err(fmt, ## arg); return 1; } while (0)
+#define die(fmt, arg...) do { pr_perror(fmt, ## arg); return 1; } while (0)
 
 int main(int argc, char ** argv)
 {

test/zdtm/live/static/mlock_setuid.c

@@ -17,14 +17,14 @@ int main(int argc, char **argv)
 	start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE,
 	             MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (start == MAP_FAILED) {
-		err("mmap failed");
+		pr_perror("mmap failed");
 		return -1;
 	}
 
 	test_msg("Lock vma from %lx to %lx\n", start, start + MEM_SIZE);
 	ret = mlock(start, MEM_SIZE);
 	if (ret < 0) {
-		err("mlock");
+		pr_perror("mlock");
 		return -1;
 	}
 
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 	test_msg("Setuid to 18943\n");
 	ret = setuid(18943);
 	if (ret < 0) {
-		err("setuid");
+		pr_perror("setuid");
 		return -1;
 	}
 

test/zdtm/live/static/mnt_ext_auto.c

@@ -24,7 +24,7 @@ int main(int argc, char ** argv)
 
 	root = getenv("ZDTM_ROOT");
 	if (root == NULL) {
-		err("root");
+		pr_perror("root");
 		return 1;
 	}
 
@@ -42,13 +42,13 @@ int main(int argc, char ** argv)
 		mkdir(dname, 755);
 		sprintf(src, "%s/test", dname);
 		if (mount("zdtm_auto_ext_mnt", dname, "tmpfs", 0, NULL)) {
-			err("mount");
+			pr_perror("mount");
 			return 1;
 		}
 		mkdir(src, 755);
 		mkdir(dst, 755);
 		if (mount(src, dst, NULL, MS_BIND, NULL)) {
-			err("bind");
+			pr_perror("bind");
 			return 1;
 		}
 		return 0;

test/zdtm/live/static/mnt_ext_master.c

@@ -24,7 +24,7 @@ int main(int argc, char ** argv)
 
 	root = getenv("ZDTM_ROOT");
 	if (root == NULL) {
-		err("root");
+		pr_perror("root");
 		return 1;
 	}
 
@@ -42,19 +42,19 @@ int main(int argc, char ** argv)
 		mkdir(dname, 755);
 		sprintf(src, "%s/test", dname);
 		if (mount("zdtm_auto_ext_mnt", dname, "tmpfs", 0, NULL)) {
-			err("mount");
+			pr_perror("mount");
 			return 1;
 		}
 
 		mkdir(src, 755);
 		mkdir(dst, 755);
 		if (mount(src, dst, NULL, MS_BIND, NULL)) {
-			err("bind");
+			pr_perror("bind");
 			return 1;
 		}
 
 		if (mount(src, dst, NULL, MS_SLAVE, NULL)) {
-			err("slave");
+			pr_perror("slave");
 			return 1;
 		}
 

test/zdtm/live/static/mntns_deleted.c

@@ -40,12 +40,12 @@ int main(int argc, char *argv[])
 	test_init(argc, argv);
 
 	if (mkdir(dirname, 0700)) {
-		err("mkdir %s", dirname);
+		pr_perror("mkdir %s", dirname);
 		exit(1);
 	}
 
 	if (mount("none", dirname, "tmpfs", MS_MGC_VAL, NULL)) {
-		err("mount %s", dirname);
+		pr_perror("mount %s", dirname);
 		return 1;
 	}
 
@@ -60,39 +60,39 @@ int main(int argc, char *argv[])
 
 	if (mkdir(path_src, 0700) ||
 	    mkdir(path_dst, 0700)) {
-		err("mkdir");
+		pr_perror("mkdir");
 		return 1;
 	}
 
 	if ((fd1 = open(TEST_FILE_SRC, O_WRONLY | O_CREAT | O_TRUNC) < 0)) {
-		err("touching %s", TEST_FILE_SRC);
+		pr_perror("touching %s", TEST_FILE_SRC);
 		return 1;
 	}
 	close(fd1);
 
 	if ((fd2 = open(TEST_FILE_DST, O_WRONLY | O_CREAT | O_TRUNC) < 0)) {
-		err("touching %s", TEST_FILE_DST);
+		pr_perror("touching %s", TEST_FILE_DST);
 		return 1;
 	}
 	close(fd2);
 
 	if (mount(path_src, path_dst, NULL, MS_BIND | MS_MGC_VAL, NULL)) {
-		err("mount %s -> %s", path_src, path_dst);
+		pr_perror("mount %s -> %s", path_src, path_dst);
 		return 1;
 	}
 
 	if (mount(TEST_FILE_SRC, TEST_FILE_DST, NULL, MS_BIND | MS_MGC_VAL, NULL)) {
-		err("mount %s -> %s", TEST_FILE_SRC, TEST_FILE_DST);
+		pr_perror("mount %s -> %s", TEST_FILE_SRC, TEST_FILE_DST);
 		return 1;
 	}
 
 	if (rmdir(path_src)) {
-		err("rmdir %s", path_src);
+		pr_perror("rmdir %s", path_src);
 		return 1;
 	}
 
 	if (unlink(TEST_FILE_SRC)) {
-		err("unlink %s", TEST_FILE_SRC);
+		pr_perror("unlink %s", TEST_FILE_SRC);
 		return 1;
 	}
 

test/zdtm/live/static/mntns_link_remap.c

@@ -47,7 +47,7 @@ static int get_mntid(int fd)
 	snprintf(str, sizeof(str), "/proc/self/fdinfo/%d", fd);
 	f = fopen(str, "r");
 	if (!f) {
-		err("Can't open %s to parse", str);
+		pr_perror("Can't open %s to parse", str);
 		return -1;
 	}
 	while (fgets(str, sizeof(str), f)) {
@@ -69,7 +69,7 @@ int ns_child(void *_arg)
 
 	snprintf(fpath, sizeof(fpath), "%s/1", dirname);
 	if (umount(fpath)) {
-		err("umount");
+		pr_perror("umount");
 		return 1;
 	}
 
@@ -82,20 +82,20 @@ int ns_child(void *_arg)
 	}
 
 	if (mount(lpath, fpath, NULL, MS_BIND, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
 	snprintf(fpath, sizeof(fpath), "%s/0", dirname);
 	if (umount(fpath)) {
-		err("umount");
+		pr_perror("umount");
 		return 1;
 	}
 
 	snprintf(fpath, sizeof(fpath), "%s/2/%s", dirname, MPTS_FILE);
 	fd2 = open(fpath, O_RDWR);
 	if (fd2 < 0) {
-		err("open");
+		pr_perror("open");
 		return -1;
 	}
 	close(args->sync);
@@ -107,7 +107,7 @@ int ns_child(void *_arg)
 		exit(1);
 
 	if (fstat(args->fd, &st1) || fstat(fd2, &st2)) {
-		err("stat");
+		pr_perror("stat");
 		exit(1);
 	}
 
@@ -118,7 +118,7 @@ int ns_child(void *_arg)
 #else
 	if (st1.st_nlink != 0) {
 #endif
-		err("Wrong number of links: %d", st1.st_nlink);
+		pr_perror("Wrong number of links: %d", st1.st_nlink);
 		exit(1);
 	}
 
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
 	}
 
 	if (mount("test", dirname, "tmpfs", 0, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (mount("test", fpath, "tmpfs", 0, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (mount(lpath, fpath, NULL, MS_BIND, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 	snprintf(lpath, sizeof(lpath), "%s/0/2", dirname);
@@ -179,7 +179,7 @@ int main(int argc, char **argv)
 	}
 
 	if (pipe(p) == -1) {
-		err("pipe");
+		pr_perror("pipe");
 		return 1;
 	}
 
@@ -194,13 +194,13 @@ int main(int argc, char **argv)
 		snprintf(fpath, sizeof(fpath), "%s/0/1/%s", dirname, MPTS_FILE);
 		snprintf(lpath, sizeof(fpath), "%s/0/2/%s", dirname, MPTS_FILE);
 		if (link(fpath, lpath) == -1) {
-			err("link");
+			pr_perror("link");
 			return -1;
 		}
 #ifdef ZDTM_LINK_REMAP
 		snprintf(lpath, sizeof(fpath), "%s/0/%s", dirname, MPTS_FILE);
 		if (link(fpath, lpath) == -1) {
-			err("link");
+			pr_perror("link");
 			return -1;
 		}
 #endif
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
 
 		pid = clone(ns_child, args.stack_ptr, CLONE_NEWNS | SIGCHLD, &args);
 		if (pid < 0) {
-			err("Unable to fork child");
+			pr_perror("Unable to fork child");
 			return 1;
 		}
 

test/zdtm/live/static/mntns_open.c

@@ -46,7 +46,7 @@ static int get_mntid(int fd)
 	snprintf(str, sizeof(str), "/proc/self/fdinfo/%d", fd);
 	f = fopen(str, "r");
 	if (!f) {
-		err("Can't open %s to parse", str);
+		pr_perror("Can't open %s to parse", str);
 		return -1;
 	}
 	while (fgets(str, sizeof(str), f)) {
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 
 		pid = clone(ns_child, args.stack_ptr, CLONE_NEWNS | SIGCHLD, &args);
 		if (pid < 0) {
-			err("Unable to fork child");
+			pr_perror("Unable to fork child");
 			return 1;
 		}
 

test/zdtm/live/static/mntns_root_bind.c

@@ -47,19 +47,19 @@ int main(int argc, char **argv)
 	    mkdir(path, 0700) ||
 	    mkdir(spath, 0700) ||
 	    mkdir(bpath, 0700)) {
-		err("mkdir");
+		pr_perror("mkdir");
 		return 1;
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("fork");
+		pr_perror("fork");
 		return 1;
 	}
 	if (pid == 0) {
 		unshare(CLONE_NEWNS);
 		if (mount(path, bpath, NULL, MS_BIND, NULL)) {
-			err("mount");
+			pr_perror("mount");
 			return 1;
 		}
 
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	task_waiter_wait4(&t, 1);
 
 	if (mount("test", spath, "tmpfs", 0, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
@@ -93,12 +93,12 @@ int main(int argc, char **argv)
 	task_waiter_complete(&t, 2);
 
 	if (waitpid(pid, &status, 0) != pid) {
-		err("waitpid %d", pid);
+		pr_perror("waitpid %d", pid);
 		return 1;
 	}
 
 	if (status) {
-		err("%d/%d/%d/%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
+		pr_perror("%d/%d/%d/%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
 		return 1;
 	}
 

test/zdtm/live/static/mntns_rw_ro_rw.c

@@ -15,15 +15,15 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (mount("/proc/sys/", "/proc/sys", NULL, MS_BIND, NULL)) {
-		err("Unable to bind-mount  /proc/sys");
+		pr_perror("Unable to bind-mount  /proc/sys");
 		return 1;
 	}
 	if (mount("/proc/sys/net", "/proc/sys/net", NULL, MS_BIND, NULL)) {
-		err("Unable to bind-mount /proc/sys/net");
+		pr_perror("Unable to bind-mount /proc/sys/net");
 		return 1;
 	}
 	if (mount("/proc/sys/", "/proc/sys", NULL, MS_RDONLY|MS_BIND|MS_REMOUNT, NULL)) {
-		err("Unable to remount  /proc/sys");
+		pr_perror("Unable to remount  /proc/sys");
 		return 1;
 	}
 

test/zdtm/live/static/mntns_shared_bind.c

@@ -40,12 +40,12 @@ int main(int argc, char **argv)
 	snprintf(bpath, sizeof(bpath), "%s/test.bind", dirname);
 	snprintf(spath, sizeof(spath), "%s/test/sub", dirname);
 	if (mkdir(dirname, 0700)) {
-		err("mkdir");
+		pr_perror("mkdir");
 		return 1;
 	}
 
 	if (mount(NULL, "/", NULL, MS_SHARED, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 	/* */
 	if (mount(dirname, dirname, "tmpfs", 0, NULL) ||
 	    mount(NULL, dirname, NULL, MS_SHARED, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 #endif
@@ -61,19 +61,19 @@ int main(int argc, char **argv)
 	if (mkdir(path, 0700) ||
 	    mkdir(spath, 0700) ||
 	    mkdir(bpath, 0700)) {
-		err("mkdir");
+		pr_perror("mkdir");
 		return 1;
 	}
 
 	pid = fork();
 	if (pid < 0) {
-		err("fork");
+		pr_perror("fork");
 		return 1;
 	}
 	if (pid == 0) {
 		unshare(CLONE_NEWNS);
 		if (mount(path, bpath, NULL, MS_BIND, NULL)) {
-			err("mount");
+			pr_perror("mount");
 			return 1;
 		}
 
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	task_waiter_wait4(&t, 1);
 
 	if (mount("test", spath, "tmpfs", 0, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
@@ -107,12 +107,12 @@ int main(int argc, char **argv)
 	task_waiter_complete(&t, 2);
 
 	if (waitpid(pid, &status, 0) != pid) {
-		err("waitpid %d", pid);
+		pr_perror("waitpid %d", pid);
 		return 1;
 	}
 
 	if (status) {
-		err("%d/%d/%d/%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
+		pr_perror("%d/%d/%d/%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
 		return 1;
 	}
 

test/zdtm/live/static/mount_paths.c

@@ -29,13 +29,13 @@ int main(int argc, char **argv)
 	mkdir(test_dir, 0700);
 
 	if (mount("", test_dir, "tmpfs", 0, NULL)) {
-		err("mount");
+		pr_perror("mount");
 		return 1;
 	}
 
 	snprintf(fname, sizeof(buf), "%s/\\\t \\\\ \\tt", test_dir);
 	if (mkdir(fname, 0700)) {
-		err("mkdir");
+		pr_perror("mkdir");
 		return 1;
 	}
 

test/zdtm/live/static/mountpoints.c

@@ -63,7 +63,7 @@ int ns_child(void *_arg)
 	}
 
 	if (stat(MPTS_ROOT"/dev/mntns2/test", &st)) {
-		err("Can't stat /dev/share-1/test.share/test.share");
+		pr_perror("Can't stat /dev/share-1/test.share/test.share");
 		return 1;
 	}
 
@@ -95,7 +95,7 @@ again:
 	}
 
 	if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
-		err("Can't remount / with MS_PRIVATE");
+		pr_perror("Can't remount / with MS_PRIVATE");
 		return -1;
 	}
 
@@ -151,7 +151,7 @@ done:
 	}
 	tmpfs_fd = open(MPTS_ROOT"/dev/test", O_WRONLY | O_CREAT);
 	if (write(tmpfs_fd, "hello", 5) <= 0) {
-		err("write() failed");
+		pr_perror("write() failed");
 		return 1;
 	}
 
@@ -159,18 +159,18 @@ done:
 	mkdir(MPTS_ROOT"/dev/overmount", 0600);
 	fd = open(MPTS_ROOT"/dev/overmount/test.over", O_WRONLY | O_CREAT);
 	if (fd == -1) {
-		err("Unable to open "MPTS_ROOT"/dev/overmount");
+		pr_perror("Unable to open "MPTS_ROOT"/dev/overmount");
 		return -1;
 	}
 	close(fd);
 	if (mount("none", MPTS_ROOT"/dev/overmount", "tmpfs", 0, "") < 0) {
-		err("Can't mount "MPTS_ROOT"/dev/overmount");
+		pr_perror("Can't mount "MPTS_ROOT"/dev/overmount");
 		return 1;
 	}
 
 	mkdir(MPTS_ROOT"/dev/non-root", 0600);
 	if (mount(MPTS_ROOT"/dev/non-root", MPTS_ROOT"/module", NULL, MS_BIND, NULL) < 0) {
-		err("Can't bind-mount %s -> %s", MPTS_ROOT"/dev/tdir", MPTS_ROOT"/module");
+		pr_perror("Can't bind-mount %s -> %s", MPTS_ROOT"/dev/tdir", MPTS_ROOT"/module");
 	}
 	mkdir(MPTS_ROOT"/dev/non-root/test", 0600);
 
@@ -232,7 +232,7 @@ done:
 
 	mkdir(MPTS_ROOT"/dev/share-1/test.mnt.share/test.share", 0600);
 	if (umount(MPTS_ROOT"/dev/slave2/test.mnt.share")) {
-		err("Can't umount "MPTS_ROOT"/dev/slave2/test.mnt.share: %m");
+		pr_perror("Can't umount "MPTS_ROOT"/dev/slave2/test.mnt.share");
 		return 1;
 	}
 
@@ -245,14 +245,14 @@ done:
 
 	fd = open(MPTS_ROOT"/dev/bmfile", O_CREAT | O_WRONLY);
 	if (fd < 0) {
-		err("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
+		pr_perror("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
 		return 1;
 	}
 	close(fd);
 
 	fd = open(MPTS_ROOT"/dev/bmfile-mount", O_CREAT | O_WRONLY);
 	if (fd < 0) {
-		err("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
+		pr_perror("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
 		return 1;
 	}
 	close(fd);
@@ -289,7 +289,7 @@ done:
 	if (getenv("ZDTM_NOSUBNS") == NULL) {
 		pid = clone(ns_child, args.stack_ptr, CLONE_NEWNS | SIGCHLD, &args);
 		if (pid < 0) {
-			err("Unable to fork child");
+			pr_perror("Unable to fork child");
 			return 1;
 		}
 	}
@@ -309,7 +309,7 @@ done:
 	}
 
 	if (umount(MPTS_ROOT"/dev/overmount") == -1) {
-		err("Can't umount "MPTS_ROOT"/dev/overmount");
+		pr_perror("Can't umount "MPTS_ROOT"/dev/overmount");
 		return -1;
 	}
 	if (access(MPTS_ROOT"/dev/overmount/test.over", F_OK)) {
@@ -320,11 +320,11 @@ done:
 	{
 		struct stat st1, st2;
 		if (stat(MPTS_ROOT"/dev/share-1/test.mnt.share/test.share", &st1)) {
-			err("Can't stat /dev/share-1/test.share/test.share");
+			pr_perror("Can't stat /dev/share-1/test.share/test.share");
 			return 1;
 		}
 		if (stat(MPTS_ROOT"/dev/share-2/test.mnt.share/test.share", &st2)) {
-			err("Can't stat /dev/share-2/test.mnt.share/test.share");
+			pr_perror("Can't stat /dev/share-2/test.mnt.share/test.share");
 			return 1;
 		}
 		if (st1.st_ino != st2.st_ino) {
@@ -332,7 +332,7 @@ done:
 			return 1;
 		}
 		if (stat(MPTS_ROOT"/dev/slave/test.mnt.share/test.share", &st2)) {
-			err("Can't stat /dev/slave/test.mnt.share/test.share");
+			pr_perror("Can't stat /dev/slave/test.mnt.share/test.share");
 			return 1;
 		}
 		if (st1.st_ino != st2.st_ino) {
@@ -340,15 +340,15 @@ done:
 			return 1;
 		}
 		if (stat(MPTS_ROOT"/dev/share-1/test.mnt.slave/test.slave", &st1) != -1 || errno != ENOENT) {
-			err("/dev/share-1/test.mnt.slave/test.slave exists");
+			pr_perror("/dev/share-1/test.mnt.slave/test.slave exists");
 			return 1;
 		}
 		if (stat(MPTS_ROOT"/dev/slave/test.mnt.slave/test.slave", &st2)) {
-			err("Can't stat /dev/slave/test.mnt.slave/test.slave");
+			pr_perror("Can't stat /dev/slave/test.mnt.slave/test.slave");
 			return 1;
 		}
 		if (stat(MPTS_ROOT"/dev/non-root/test", &st1)) {
-			err("Can't stat /dev/non-root/test");
+			pr_perror("Can't stat /dev/non-root/test");
 			return 1;
 		}
 	}

test/zdtm/live/static/mprotect00.c

@@ -83,13 +83,13 @@ int main(int argc, char ** argv)
 
 	pagesize = sysconf(_SC_PAGESIZE);
 	if (pagesize < 0) {
-		err("can't get PAGE_SIZE: %m");
+		pr_perror("can't get PAGE_SIZE");
 		exit(1);
 	}
 
 	ptr = mmap(NULL, pagesize * (NUM_MPROTS + 1), PROT_NONE, MAP_PRIVATE | MAP_ANON, 0, 0);
 	if (ptr == MAP_FAILED) {
-		err("calloc failed: %m");
+		pr_perror("calloc failed");
 		return -1;
 	}
 
@@ -99,7 +99,7 @@ int main(int argc, char ** argv)
 	for (i = 0; i < NUM_MPROTS; i++)
 		if (mprotect(ptr_aligned + pagesize * i,
 			     pagesize / 2, prots[i]) < 0) {
-			err("mprotect failed: %m");
+			pr_perror("mprotect failed");
 			exit(1);
 		}
 

test/zdtm/live/static/msgque.c

@@ -37,13 +37,13 @@ static int test_fn(int argc, char **argv)
 
 	key = ftok(argv[0], 822155650);
 	if (key == -1) {
-		err("Can't make key");
+		pr_perror("Can't make key");
 		exit(1);
 	}
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		exit(1);
 	}
 
@@ -51,7 +51,7 @@ static int test_fn(int argc, char **argv)
 	if (msg == -1) {
 		msg = msgget(key, 0666);
 		if (msg == -1) {
-			err("Can't get queue");
+			pr_perror("Can't get queue");
 			goto err_kill;
 		}
 	}

test/zdtm/live/static/mtime_mmap.c

@@ -34,7 +34,7 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_RDWR | O_CREAT, 0666);
 	if (fd < 0) {
-		err("can't open %s", filename);
+		pr_perror("can't open %s", filename);
 		exit(1);
 	}
 
@@ -42,19 +42,19 @@ int main(int argc, char **argv)
 	count = sizeof(buf);
 	memset(buf, 1, count);
 	if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		err("failed to write %s", filename);
+		pr_perror("failed to write %s", filename);
 		exit(1);
 	}
 
 	if (fstat(fd, &fst) < 0) {
-		err("can't get %s file info", filename);
+		pr_perror("can't get %s file info", filename);
 		goto failed;
 	}
 
 	ptr = (char *)mmap(NULL, count, PROT_READ | PROT_WRITE,
 			MAP_SHARED, fd, 0);
 	if (ptr == MAP_FAILED) {
-		err("mmap() Failed, errno=%d : %s", errno, strerror(errno));
+		pr_perror("mmap() Failed, errno=%d : %s", errno, strerror(errno));
 		goto failed;
 	}
 
@@ -66,12 +66,12 @@ int main(int argc, char **argv)
 		ptr[i]++;
 
 	if (munmap(ptr, count)) {
-		err("munmap Failed, errno=%d : %s", errno, strerror(errno));
+		pr_perror("munmap Failed, errno=%d : %s", errno, strerror(errno));
 		goto failed;
 	}
 
 	if (fstat(fd, &fst) < 0) {
-		err("can't get %s file info", filename);
+		pr_perror("can't get %s file info", filename);
 		goto failed;
 	}
 
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (fstat(fd, &fst) < 0) {
-		err("can't get %s file info", filename);
+		pr_perror("can't get %s file info", filename);
 		goto failed;
 	}
 

test/zdtm/live/static/netns-dev.c

@@ -87,13 +87,13 @@ static int save_and_set(int opt, FILE *fp, struct test_conf *tc) {
 	 */
 	ret = fscanf(fp, "%d", &tc->ipv4_conf[opt]);
 	if (ret != 1) {
-		err("fscanf");
+		pr_perror("fscanf");
 		return -1;
 	}
 
 	ret = fseek(fp, 0, SEEK_SET);
 	if (ret) {
-		err("fseek");
+		pr_perror("fseek");
 		return -1;
 	}
 
@@ -109,7 +109,7 @@ static int save_and_set(int opt, FILE *fp, struct test_conf *tc) {
 
 	ret = fprintf(fp, "%d", tc->ipv4_conf_rand[opt]);
 	if (ret < 0) {
-		err("fprintf");
+		pr_perror("fprintf");
 		return -1;
 	}
 
@@ -125,7 +125,7 @@ static int check_and_restore(int opt, FILE *fp, struct test_conf *tc) {
 	 */
 	ret = fscanf(fp, "%d", &val);
 	if (ret != 1) {
-		err("fscanf");
+		pr_perror("fscanf");
 		return -1;
 	}
 
@@ -137,7 +137,7 @@ static int check_and_restore(int opt, FILE *fp, struct test_conf *tc) {
 
 	ret = fseek(fp, 0, SEEK_SET);
 	if (ret) {
-		err("fseek");
+		pr_perror("fseek");
 		return -1;
 	}
 
@@ -146,7 +146,7 @@ static int check_and_restore(int opt, FILE *fp, struct test_conf *tc) {
 	 */
 	ret = fprintf(fp, "%d", tc->ipv4_conf[opt]);
 	if (ret < 0) {
-		err("fprintf");
+		pr_perror("fprintf");
 		return -1;
 	}
 
@@ -163,7 +163,7 @@ static int for_each_option_do(int (*f)(int opt, FILE *fp, struct test_conf *tc),
 
 		ret = snprintf(path, sizeof(path), "%s/%s", tc->dir, devconfs[i]);
 		if (ret < 0) {
-			err("snprintf");
+			pr_perror("snprintf");
 			return -1;
 		}
 
@@ -173,7 +173,7 @@ static int for_each_option_do(int (*f)(int opt, FILE *fp, struct test_conf *tc),
 
 		fp = fopen(path, "r+");
 		if (fp == NULL) {
-			err("fopen");
+			pr_perror("fopen");
 			return -1;
 		}
 

test/zdtm/live/static/netns-nf.c

@@ -16,13 +16,13 @@ static int test_fn(int argc, char **argv)
 	char cmd[128];
 
 	if (system("iptables -A INPUT -t filter --protocol icmp -j DROP")) {
-		err("Can't set input rule");
+		pr_perror("Can't set input rule");
 		return -1;
 	}
 
 	sprintf(cmd, "iptables -L > pre-%s", filename);
 	if (system(cmd)) {
-		err("Can't save iptables");
+		pr_perror("Can't save iptables");
 		return -1;
 	}
 

test/zdtm/live/static/overmount_dev.c

@@ -27,28 +27,28 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (snprintf(path, sizeof(path), "%s/foo", dirname) >= sizeof(path)) {
-		err("directory name \"%s\"is too long", dirname);
+		pr_perror("directory name \"%s\"is too long", dirname);
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	if (mknod(path, mode, dev)) {
-		err("can't make device file \"%s\"", path);
+		pr_perror("can't make device file \"%s\"", path);
 		exit(1);
 	}
 
 	fd = open(path, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", path);
+		pr_perror("can't open %s", path);
 		goto rmdir;
 	}
 
 	if (mount("rien", dirname, "tmpfs", 0, 0) < 0) {
-		err("can't mount tmpfs over %s: %m", dirname);
+		pr_perror("can't mount tmpfs over %s", dirname);
 		goto cleanup;
 	}
 

test/zdtm/live/static/overmount_fifo.c

@@ -25,28 +25,28 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (snprintf(path, sizeof(path), "%s/foo", dirname) >= sizeof(path)) {
-		err("directory name \"%s\"is too long", dirname);
+		pr_perror("directory name \"%s\"is too long", dirname);
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	if (mknod(path, mode, 0)) {
-		err("can't make fifo \"%s\"", path);
+		pr_perror("can't make fifo \"%s\"", path);
 		exit(1);
 	}
 
 	fd = open(path, O_RDWR);
 	if (fd < 0) {
-		err("can't open %s", path);
+		pr_perror("can't open %s", path);
 		goto rmdir;
 	}
 
 	if (mount("rien", dirname, "tmpfs", 0, 0) < 0) {
-		err("can't mount tmpfs over %s: %m", dirname);
+		pr_perror("can't mount tmpfs over %s", dirname);
 		goto cleanup;
 	}
 

test/zdtm/live/static/overmount_file.c

@@ -23,23 +23,23 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (snprintf(path, sizeof(path), "%s/foo", dirname) >= sizeof(path)) {
-		err("directory name \"%s\"is too long", dirname);
+		pr_perror("directory name \"%s\"is too long", dirname);
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
 	fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
 	if (fd < 0) {
-		err("can't open %s", path);
+		pr_perror("can't open %s", path);
 		goto rmdir;
 	}
 
 	if (mount("rien", dirname, "tmpfs", 0, 0) < 0) {
-		err("can't mount tmpfs over %s: %m", dirname);
+		pr_perror("can't mount tmpfs over %s", dirname);
 		goto cleanup;
 	}
 

test/zdtm/live/static/overmount_sock.c

@@ -34,23 +34,23 @@ static int setup_srv_sock(const char *filename)
 	int sock;
 
 	if (fill_sock_name(&name, filename) < 0) {
-		err("filename \"%s\" is too long", filename);
+		pr_perror("filename \"%s\" is too long", filename);
 		return -1;
 	}
 
 	sock = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sock < 0) {
-		err("can't create socket: %m");
+		pr_perror("can't create socket");
 		return -1;
 	}
 
 	if (bind(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
-		err("can't bind to socket \"%s\": %m", filename);
+		pr_perror("can't bind to socket \"%s\"", filename);
 		goto err;
 	}
 
 	if (listen(sock, 1) < 0) {
-		err("can't listen on a socket \"%s\"", filename);
+		pr_perror("can't listen on a socket \"%s\"", filename);
 		goto err;
 	}
 
@@ -92,12 +92,12 @@ int main(int argc, char ** argv)
 	test_init(argc, argv);
 
 	if (snprintf(path, sizeof(path), "%s/foo", dirname) >= sizeof(path)) {
-		err("directory name \"%s\"is too long", dirname);
+		pr_perror("directory name \"%s\"is too long", dirname);
 		exit(1);
 	}
 
 	if (mkdir(dirname, 0700)) {
-		err("can't make directory %s", dirname);
+		pr_perror("can't make directory %s", dirname);
 		exit(1);
 	}
 
@@ -107,7 +107,7 @@ int main(int argc, char ** argv)
 
 	pid = fork();
 	if (pid < 0) {
-		err("can't fork");
+		pr_perror("can't fork");
 		goto out;
 	}
 
@@ -131,7 +131,7 @@ int main(int argc, char ** argv)
 
 	acc_sock = accept(sock, NULL, NULL);
 	if (acc_sock < 0) {
-		err("can't accept() the connection on \"%s\": %m", path);
+		pr_perror("can't accept() the connection on \"%s\"", path);
 		goto out_kill;
 	}
 
@@ -139,7 +139,7 @@ int main(int argc, char ** argv)
 	sock = acc_sock;
 
 	if (mount("rien", dirname, "tmpfs", 0, 0) < 0) {
-		err("can't mount tmpfs over %s: %m", dirname);
+		pr_perror("can't mount tmpfs over %s", dirname);
 		goto out_kill;
 	}
 

test/zdtm/live/static/packet_sock.c

@@ -95,13 +95,13 @@ int main(int argc, char **argv)
 
 	sk1 = socket(PF_PACKET, SOCK_RAW, 0);
 	if (sk1 < 0) {
-		err("Can't create socket 1");
+		pr_perror("Can't create socket 1");
 		return 1;
 	}
 
 	sk2 = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
 	if (sk2 < 0) {
-		err("Can't create socket 2");
+		pr_perror("Can't create socket 2");
 		return 1;
 	}
 
@@ -109,31 +109,31 @@ int main(int argc, char **argv)
 	addr.sll_family = AF_PACKET;
 	addr.sll_ifindex = 1; /* loopback should be 1 in all namespaces */
 	if (bind(sk2, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		err("Can't bind socket %m");
+		pr_perror("Can't bind socket %m");
 		return 1;
 	}
 
 	alen = sizeof(addr1);
 	if (getsockname(sk1, (struct sockaddr *)&addr1, &alen) < 0) {
-		err("Can't get sockname 1");
+		pr_perror("Can't get sockname 1");
 		return 1;
 	}
 
 	alen = sizeof(addr2);
 	if (getsockname(sk2, (struct sockaddr *)&addr2, &alen) < 0) {
-		err("Can't get sockname 2");
+		pr_perror("Can't get sockname 2");
 		return 1;
 	}
 
 	ver = TPACKET_V2;
 	if (setsockopt(sk1, SOL_PACKET, PACKET_VERSION, &ver, sizeof(ver)) < 0) {
-		err("Can't set version %m");
+		pr_perror("Can't set version %m");
 		return 1;
 	}
 
 	yes = 1;
 	if (setsockopt(sk1, SOL_PACKET, PACKET_AUXDATA, &yes, sizeof(yes)) < 0) {
-		err("Can't set auxdata %m");
+		pr_perror("Can't set auxdata %m");
 		return 1;
 	}
 
@@ -143,25 +143,25 @@ int main(int argc, char **argv)
 	ring.tp_frame_size = 1024;
 	ring.tp_frame_nr = (ring.tp_block_size / ring.tp_frame_size) * ring.tp_block_nr;
 	if (setsockopt(sk1, SOL_PACKET, PACKET_RX_RING, &ring, sizeof(ring)) < 0) {
-		err("Can't set rx ring %m");
+		pr_perror("Can't set rx ring %m");
 		return 1;
 	}
 
 	rsv = SK_RESERVE;
 	if (setsockopt(sk2, SOL_PACKET, PACKET_RESERVE, &rsv, sizeof(rsv)) < 0) {
-		err("Can't set reserve %m");
+		pr_perror("Can't set reserve %m");
 		return 1;
 	}
 
 	yes = 1;
 	if (setsockopt(sk2, SOL_PACKET, PACKET_ORIGDEV, &yes, sizeof(yes)) < 0) {
-		err("Can't set origdev %m");
+		pr_perror("Can't set origdev %m");
 		return 1;
 	}
 
 	yes = DEF_FANOUT;
 	if (setsockopt(sk2, SOL_PACKET, PACKET_FANOUT, &yes, sizeof(yes)) < 0) {
-		err("Can't configure fanout %m");
+		pr_perror("Can't configure fanout %m");
 		return 1;
 	}
 
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 	mreq.mr_ifindex = 1;
 	mreq.mr_type = PACKET_MR_PROMISC;
 	if (setsockopt(sk1, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-		err("Can't add promisc member %m");
+		pr_perror("Can't add promisc member %m");
 		return 1;
 	}
 
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 	mreq.mr_type = PACKET_MR_UNICAST;
 	mreq.mr_alen = LO_ADDR_LEN;
 	if (setsockopt(sk2, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-		err("Can't add ucast member %m");
+		pr_perror("Can't add ucast member %m");
 		return 1;
 	}
 
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
 	ring.tp_frame_size = 1024;
 	ring.tp_frame_nr = (ring.tp_block_size / ring.tp_frame_size) * ring.tp_block_nr;
 	if (setsockopt(sk2, SOL_PACKET, PACKET_TX_RING, &ring, sizeof(ring)) < 0) {
-		err("Can't set tx ring %m");
+		pr_perror("Can't set tx ring %m");
 		return 1;
 	}
 

test/zdtm/live/static/packet_sock_mmap.c

@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 
 	sk = socket(PF_PACKET, SOCK_RAW, 0);
 	if (sk < 0) {
-		err("Can't create socket 1");
+		pr_perror("Can't create socket 1");
 		return 1;
 	}
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	ring.tp_frame_size = 1024;
 	ring.tp_frame_nr = (ring.tp_block_size / ring.tp_frame_size) * ring.tp_block_nr;
 	if (setsockopt(sk, SOL_PACKET, PACKET_RX_RING, &ring, sizeof(ring)) < 0) {
-		err("Can't set rx ring %m");
+		pr_perror("Can't set rx ring %m");
 		return 1;
 	}
 
@@ -84,13 +84,13 @@ int main(int argc, char **argv)
 	ring.tp_frame_size = 1024;
 	ring.tp_frame_nr = (ring.tp_block_size / ring.tp_frame_size) * ring.tp_block_nr;
 	if (setsockopt(sk, SOL_PACKET, PACKET_TX_RING, &ring, sizeof(ring)) < 0) {
-		err("Can't set tx ring %m");
+		pr_perror("Can't set tx ring %m");
 		return 1;
 	}
 
 	mem = mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FILE, sk, 0);
 	if (mem == MAP_FAILED) {
-		err("Can't mmap socket %m");
+		pr_perror("Can't mmap socket %m");
 		return 1;
 	}
 

test/zdtm/live/static/pdeath_sig.c

@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 	ret = -1;
 	read(pr[0], &ret, sizeof(ret));
 	if (ret != 0) {
-		err("C start error");
+		pr_perror("C start error");
 		goto out;
 	}
 

test/zdtm/live/static/pipe00.c

@@ -31,16 +31,16 @@ int main(int argc, char ** argv)
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Can't fork");
+		pr_perror("Can't fork");
 		exit(1);
 	} else if (pid == 0) {
 		if (dup2(pipe1[1], 11) == -1 || dup2(pipe2[0], 12) == -1) {
-			err("dup2 failed");
+			pr_perror("dup2 failed");
 			return 1;
 		}
 	} else {
 		if (dup2(pipe1[0], 12) == -1 ||	dup2(pipe2[1], 11) == -1) {
-			err("dup2 failed");
+			pr_perror("dup2 failed");
 			goto err;
 		}
 	}
@@ -59,22 +59,22 @@ int main(int argc, char ** argv)
 
 		ret = read(12, buf, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("read failed: %d", ret);
+			pr_perror("read failed: %d", ret);
 			goto err;
 		}
 		ret = write(11, TEST_STRING, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("write failed: %d", ret);
+			pr_perror("write failed: %d", ret);
 			goto err;
 		}
 		close(11);
 		ret = read(12, buf, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("read failed: %d", ret);
+			pr_perror("read failed: %d", ret);
 			goto err;
 		}
 		if (strcmp(TEST_STRING, buf)) {
-			err("data curruption");
+			pr_perror("data curruption");
 			goto err;
 		}
 
@@ -88,28 +88,28 @@ int main(int argc, char ** argv)
 	} else {
 		ret = write(11, TEST_STRING, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("write failed: %d", ret);
+			pr_perror("write failed: %d", ret);
 			return 1;
 		}
 		ret = read(12, buf, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("read failed: %d", ret);
+			pr_perror("read failed: %d", ret);
 			return 1;
 		}
 		ret = write(11, TEST_STRING, sizeof(TEST_STRING));
 		if (ret != sizeof(TEST_STRING)) {
-			err("write failed: %d", ret);
+			pr_perror("write failed: %d", ret);
 			return 1;
 		}
 		close(11);
 		if (strcmp(TEST_STRING, buf)) {
-			err("data curruption");
+			pr_perror("data curruption");
 			return 1;
 		}
 	}
 
 	return 0;
 err:
-	err("FAIL");
+	pr_perror("FAIL");
 	return 1;
 }

test/zdtm/live/static/pipe01.c

@@ -31,7 +31,7 @@ int main(int argc, char ** argv)
 
 	ret = pipe(pfd);
 	if (ret) {
-		err("pipe() failed: %m");
+		pr_perror("pipe() failed");
 		return 1;
 	}
 
@@ -45,19 +45,19 @@ int main(int argc, char ** argv)
 
 	if (pfd_rop[0] == -1 || pfd_rop[1] == -1 ||
 	    pfd_dup[0] == -1 || pfd_dup[1] == -1) {
-		err("dup() failed");
+		pr_perror("dup() failed");
 		return 1;
 	}
 
 	flags = fcntl(pfd[1], F_GETFL, 0);
 	if (flags == -1) {
-		err("fcntl() failed");
+		pr_perror("fcntl() failed");
 		return 1;
 	}
 
 	ret = fcntl(pfd[1], F_SETFL, flags | O_NONBLOCK);
 	if (ret == -1) {
-		err("fcntl() failed");
+		pr_perror("fcntl() failed");
 		return 1;
 	}
 
@@ -66,7 +66,7 @@ int main(int argc, char ** argv)
 		if (ret == -1) {
 			if (errno == EAGAIN)
 				break;
-			err("write() failed: %m");
+			pr_perror("write() failed");
 			goto err;
 		}
 
@@ -79,24 +79,24 @@ int main(int argc, char ** argv)
 
 	flags = fcntl(pfd[1], F_GETFL, 0);
 	if (!(flags & O_NONBLOCK)) {
-		err("O_NONBLOCK is absent");
+		pr_perror("O_NONBLOCK is absent");
 		goto err;
 	}
 
 	flags = fcntl(pfd_dup[1], F_GETFL, 0);
 	if (!(flags & O_NONBLOCK)) {
-		err("O_NONBLOCK is absent");
+		pr_perror("O_NONBLOCK is absent");
 		goto err;
 	}
 
 	flags = fcntl(pfd_rop[1], F_GETFL, 0);
 	if (flags & O_NONBLOCK) {
-		err("O_NONBLOCK appeared");
+		pr_perror("O_NONBLOCK appeared");
 		goto err;
 	}
 
 	if (close(pfd[1]) == -1) {
-		err("close() failed");
+		pr_perror("close() failed");
 		goto err;
 	}
 
@@ -109,7 +109,7 @@ int main(int argc, char ** argv)
 			break;
 		if (ret == -1) {
 			goto err;
-			err("read() failed: %m");
+			pr_perror("read() failed");
 		}
 		size -= ret;
 

test/zdtm/live/static/pipe02.c

@@ -30,12 +30,12 @@ int main(int argc, char ** argv)
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {
-		err("open");
+		pr_perror("open");
 		return 1;
 	};
 
 	if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK) == -1) {
-		err("fcntl");
+		pr_perror("fcntl");
 		return 1;
 	}
 

test/zdtm/live/static/poll.c

@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 	task_waiter_init(&t);
 
 	if (pipe(pipes)) {
-		err("Can't create pipes");
+		pr_perror("Can't create pipes");
 		exit(1);
 	}
 
@@ -62,18 +62,18 @@ int main(int argc, char *argv[])
 	show_pollfd(ufds, 2);
 
 	if (gettimeofday(&time1, NULL)) {
-		err("Can't get first delta");
+		pr_perror("Can't get first delta");
 		exit(1);
 	}
 	show_timestamp("Init", time1.tv_sec, time1.tv_usec);
 
 	pid = test_fork();
 	if (pid < 0) {
-		err("Fork failed");
+		pr_perror("Fork failed");
 		exit(1);
 	} else if (pid == 0) {
 		if (gettimeofday(&time1, NULL)) {
-			err("Can't get from times");
+			pr_perror("Can't get from times");
 			exit(1);
 		}
 
@@ -85,12 +85,12 @@ int main(int argc, char *argv[])
 			ret = poll(ufds, 2, delta * 1000);
 			show_pollfd(ufds, 2);
 			if (ret && errno != EINTR) {
-				err("Poll-2 returned %d (events?!)", ret);
+				pr_perror("Poll-2 returned %d (events?!)", ret);
 				exit(1);
 			}
 
 			if (gettimeofday(&time2, NULL)) {
-				err("Can't get from times");
+				pr_perror("Can't get from times");
 				exit(1);
 			}
 
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 
 	/* Return immediately if child run or stopped(by SIGSTOP) */
 	if (waitpid(pid, &status, 0) == -1) {
-		err("Unable to wait child");
+		pr_perror("Unable to wait child");
 		exit(1);
 	}
 

test/zdtm/live/static/posix_timers.c

@@ -308,7 +308,7 @@ static int setup_timers(void)
 	}
 
 	if (sigprocmask(SIG_SETMASK, &mask, NULL) == -1) {
-		err("Failed to unlock signal");
+		pr_perror("Failed to unlock signal");
 		return -errno;
 	}
 
@@ -319,12 +319,12 @@ static int setup_timers(void)
 		for (i = 0; i < 10; i++) {
 			ret = timer_create(CLOCK_REALTIME, NULL, &timeridt);
 			if (ret < 0) {
-				err("Can't create temporary posix timer %lx", (long) timeridt);
+				pr_perror("Can't create temporary posix timer %lx", (long) timeridt);
 				return -errno;
 			}
 			ret = timer_delete(timeridt);
 			if (ret < 0) {
-				err("Can't remove temporaty posix timer %lx", (long) timeridt);
+				pr_perror("Can't remove temporaty posix timer %lx", (long) timeridt);
 				return -errno;
 			}
 		}
@@ -334,7 +334,7 @@ static int setup_timers(void)
 		sigemptyset(&info->sa.sa_mask);
 
 		if (sigaction(info->sig, &info->sa, NULL) == -1) {
-			err("Failed to set SIGALRM handler");
+			pr_perror("Failed to set SIGALRM handler");
 			return -errno;
 		}
 
@@ -346,7 +346,7 @@ static int setup_timers(void)
 			sev.sigev_value.sival_ptr = info;
 
 		if (timer_create(info->clock, &sev, &info->timerid) == -1) {
-			err("Can't create timer");
+			pr_perror("Can't create timer");
 			return -errno;
 		}
 
@@ -359,12 +359,12 @@ static int setup_timers(void)
 			its.it_interval.tv_sec = its.it_interval.tv_nsec = 0;
 
 		if (clock_gettime(info->clock, &info->start) == -1) {
-			err("Can't get %s start time", info->name);
+			pr_perror("Can't get %s start time", info->name);
 			return -errno;
 		}
 
 		if (timer_settime(info->timerid, 0, &its, NULL) == -1) {
-			err("Can't set timer");
+			pr_perror("Can't set timer");
 			return -errno;
 		}
 		info++;
@@ -383,12 +383,12 @@ static int get_total_sleep_time(struct timespec *tv, char *type)
 	struct timespec boottime;
 
 	if (clock_gettime(CLOCK_BOOTTIME, &boottime) == -1) {
-		err("Can't get CLOCK_BOOTTIME %s time", type);
+		pr_perror("Can't get CLOCK_BOOTTIME %s time", type);
 		return -errno;
 	}
 
 	if (clock_gettime(CLOCK_MONOTONIC_COARSE, &boottime_coarse) == -1) {
-		err("Can't get CLOCK_MONOTONIC_COARSE %s time", type);
+		pr_perror("Can't get CLOCK_MONOTONIC_COARSE %s time", type);
 		return -errno;
 	}
 

test/zdtm/live/static/proc-self.c

@@ -26,7 +26,7 @@ int read_fd_link(int lfd, char *buf, size_t size)
 	snprintf(t, sizeof(t), "/proc/self/fd/%d", lfd);
 	ret = readlink(t, buf, size - 1);
 	if (ret < 0) {
-		err("Can't read link of fd %d", lfd);
+		pr_perror("Can't read link of fd %d", lfd);
 		return -1;
 	}
 	buf[ret] = 0;
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
 	fd_self = open(nspath, O_RDONLY);
 	if (fd_self < 0) {
-		err("Can't open %s", nspath);
+		pr_perror("Can't open %s", nspath);
 		return -1;
 	}
 
@@ -54,18 +54,18 @@ int main(int argc, char *argv[])
 	test_waitsig();
 
 	if (read_fd_link(fd_self, path_orig, sizeof(path_orig))) {
-		err("Can't fill original path");
+		pr_perror("Can't fill original path");
 		return -1;
 	}
 
 	fd_new = open(nspath, O_RDONLY);
 	if (fd_new < 0) {
-		err("Can't open %s", nspath);
+		pr_perror("Can't open %s", nspath);
 		return -1;
 	}
 
 	if (read_fd_link(fd_new, path_new, sizeof(path_new))) {
-		err("Can't fill new path");
+		pr_perror("Can't fill new path");
 		return -1;
 	}
 

test/zdtm/live/static/pthread01.c

@@ -81,20 +81,20 @@ static void *ch_thread_2(void *arg)
 	task_waiter_wait4(&t2, 2);
 
 	if (memcmp(tls_data.rand_string, __tls_data, sizeof(tls_data.rand_string))) {
-		err("Failed to restore tls_data.rand_string in thread 2");
+		pr_perror("Failed to restore tls_data.rand_string in thread 2");
 		results_map[2] = -1;
 	} else
 		results_map[2] = 1;
 
 	if (memcmp(&tls_data.blk_sigset, &blk_sigset, sizeof(tls_data.blk_sigset))) {
-		err("Failed to restore tls_data.blk_sigset in thread 2");
+		pr_perror("Failed to restore tls_data.blk_sigset in thread 2");
 		results_map[4] = -1;
 	} else
 		results_map[4] = 1;
 
 	pthread_sigmask(SIG_SETMASK, NULL, &new);
 	if (memcmp(&tls_data.blk_sigset, &new, sizeof(tls_data.blk_sigset))) {
-		err("Failed to restore blk_sigset in thread 2");
+		pr_perror("Failed to restore blk_sigset in thread 2");
 		results_map[6] = -1;
 
 		show_sigset(&tls_data.blk_sigset);
@@ -128,13 +128,13 @@ static void *ch_thread_1(void *arg)
 	task_waiter_wait4(&t1, 2);
 
 	if (memcmp(tls_data.rand_string, __tls_data, sizeof(tls_data.rand_string))) {
-		err("Failed to restore tls_data.rand_string in thread 1");
+		pr_perror("Failed to restore tls_data.rand_string in thread 1");
 		results_map[1] = -1;
 	} else
 		results_map[1] = 1;
 
 	if (memcmp(&tls_data.blk_sigset, &blk_sigset, sizeof(tls_data.blk_sigset))) {
-		err("Failed to restore tls_data.blk_sigset in thread 1");
+		pr_perror("Failed to restore tls_data.blk_sigset in thread 1");
 		results_map[3] = -1;
 	} else
 		results_map[3] = 1;
@@ -142,7 +142,7 @@ static void *ch_thread_1(void *arg)
 	sigemptyset(&new);
 	pthread_sigmask(SIG_SETMASK, NULL, &new);
 	if (memcmp(&tls_data.blk_sigset, &new, sizeof(tls_data.blk_sigset))) {
-		err("Failed to restore blk_sigset in thread 1");
+		pr_perror("Failed to restore blk_sigset in thread 1");
 		results_map[5] = -1;
 
 		show_sigset(&tls_data.blk_sigset);

test/zdtm/live/static/ptrace_sig.c

@@ -21,7 +21,7 @@ void sig_handler(int signo, siginfo_t *siginfo, void *data)
 	pid = siginfo->si_pid;
 	ret = write(child_fd, &pid, sizeof(pid));
 	if (ret != sizeof(pid))
-		err("write");
+		pr_perror("write");
 	child_exit = 1;
 }
 
@@ -44,13 +44,13 @@ int child(int fd)
 
 	ret = sigaction(SIGUSR2, &act, &old_act);
 	if (ret < 0) {
-		err("signal failed");
+		pr_perror("signal failed");
 		return 1;
 	}
 
 	ret = ptrace(PTRACE_TRACEME, 0, 0, 0);
 	if (ret < 0) {
-		err("ptrace failed");
+		pr_perror("ptrace failed");
 		return 1;
 	}
 	ret = write(child_fd, &ret, sizeof(ret));
@@ -72,13 +72,13 @@ int main(int argc, char ** argv)
 
 	ret = pipe(child_pipe);
 	if (ret < 0) {
-		err("pipe failed");
+		pr_perror("pipe failed");
 		return 1;
 	}
 
 	cpid = test_fork();
 	if (cpid < 0) {
-		err("fork failed");
+		pr_perror("fork failed");
 		return 1;
 	}
 	else if (cpid == 0) {
@@ -89,25 +89,25 @@ int main(int argc, char ** argv)
 	close(child_pipe[1]);
 	ret = pipe(signal_pipe);
 	if (ret < 0) {
-		err("pipe failed");
+		pr_perror("pipe failed");
 		return 1;
 	}
 
 	spid = test_fork();
 	if (spid < 0) {
-		err("Can't fork signal process");
+		pr_perror("Can't fork signal process");
 		return 1;
 	} else if (spid == 0) {
 		close(signal_pipe[1]);
 		ret = read(signal_pipe[0], &status, sizeof(status));
 		if (ret != sizeof(status)) {
-			err("read");
+			pr_perror("read");
 			return 1;
 		}
 		test_msg("send signal to %d\n", cpid);
 		ret = kill(cpid, SIGUSR2);
 		if (ret < 0) {
-			err("kill failed");
+			pr_perror("kill failed");
 		}
 		return 0;
 	}
@@ -115,20 +115,20 @@ int main(int argc, char ** argv)
 
 	sh = signal(SIGCHLD, sig_chld_handler);
 	if (sh == SIG_ERR) {
-		err("signal failed");
+		pr_perror("signal failed");
 		return 1;
 	}
 
 	test_msg("wait while child initialized");
 	ret = read(child_pipe[0], &status, sizeof(status));
 	if  (ret != sizeof(status)) {
-		err("read from child process failed");
+		pr_perror("read from child process failed");
 		return 1;
 	}
 
 	ret = write(signal_pipe[1], &status, sizeof(status));
 	if (ret != sizeof(status)) {
-		err("write to signal process failed");
+		pr_perror("write to signal process failed");
 	}
 	close(signal_pipe[1]);
 
@@ -140,7 +140,7 @@ int main(int argc, char ** argv)
 		pid = wait(&status);
 		if (pid < 0) {
 			if (errno != ECHILD)
-				err("wait");
+				pr_perror("wait");
 			break;
 		}
 
@@ -151,18 +151,18 @@ int main(int argc, char ** argv)
 
 			ret = ptrace(PTRACE_GETSIGINFO, pid, 0, &siginfo);
 			if (ret < 0) {
-				err("ptrace failed");
+				pr_perror("ptrace failed");
 				return 1;
 			} else
 				test_msg("pid=%d sends signal\n", siginfo.si_pid);
 
 			ret = ptrace(PTRACE_CONT, pid, 0, WSTOPSIG(status));
 			if (ret < 0)
-				err("ptrace failed");
+				pr_perror("ptrace failed");
 
 			ret = read(child_pipe[0], &status, sizeof(status));
 			if  (ret != sizeof(status)) {
-				err("read");
+				pr_perror("read");
 				return 1;
 			}
 

test/zdtm/live/static/pty00.c

@@ -44,7 +44,7 @@ int main(int argc, char ** argv)
 
 	fdm = open("/dev/ptmx", O_RDWR);
 	if (fdm == -1) {
-		err("open(%s) failed", "/dev/ptmx");
+		pr_perror("open(%s) failed", "/dev/ptmx");
 		return 1;
 	}
 	grantpt(fdm);
@@ -52,26 +52,26 @@ int main(int argc, char ** argv)
 	slavename = ptsname(fdm);
 	fds = open(slavename, O_RDWR);
 	if (fds == -1) {
-		err("open(%s) failed", slavename);
+		pr_perror("open(%s) failed", slavename);
 		return 1;
 	}
 
 	tty = open("/dev/tty", O_RDWR);
 	if (tty < 0) {
-		err("open(%s) failed", "/dev/tty");
+		pr_perror("open(%s) failed", "/dev/tty");
 		return 1;
 	}
 
 	/* Try to reproduce a deadlock */
 	if (dup2(fdm, 101) != 101) {
-		err("dup( , 101) failed");
+		pr_perror("dup( , 101) failed");
 		return 1;
 	}
 	close(fdm);
 	fdm = 101;
 
 	if (dup2(fds, 100) != 100) {
-		err("dup( , 100) failed");
+		pr_perror("dup( , 100) failed");
 		return 1;
 	}
 	close(fds);
@@ -84,13 +84,13 @@ int main(int argc, char ** argv)
 	/* Check connectivity */
 	ret = write(fdm, teststr, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("write(fdm) failed");
+		pr_perror("write(fdm) failed");
 		return 1;
 	}
 
 	ret = read(fds, buf, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("read(fds) failed");
+		pr_perror("read(fds) failed");
 		return 1;
 	}
 
@@ -101,13 +101,13 @@ int main(int argc, char ** argv)
 
 	ret = write(fdm, teststr, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("write(fdm) failed");
+		pr_perror("write(fdm) failed");
 		return 1;
 	}
 
 	ret = read(tty, buf, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("read(tty) failed");
+		pr_perror("read(tty) failed");
 		return 1;
 	}
 

test/zdtm/live/static/pty01.c

@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
 	master = open("/dev/ptmx", O_RDWR);
 	if (master == -1) {
-		err("open(%s) failed", "/dev/ptmx");
+		pr_perror("open(%s) failed", "/dev/ptmx");
 		return 1;
 	}
 
@@ -34,13 +34,13 @@ int main(int argc, char *argv[])
 	slavename = ptsname(master);
 	slave1 = open(slavename, O_RDWR);
 	if (slave1 == -1) {
-		err("open(%s) failed", slavename);
+		pr_perror("open(%s) failed", slavename);
 		return 1;
 	}
 
 	slave2 = open(slavename, O_RDWR);
 	if (slave2 == -1) {
-		err("open(%s) failed", slavename);
+		pr_perror("open(%s) failed", slavename);
 		return 1;
 	}
 
@@ -51,13 +51,13 @@ int main(int argc, char *argv[])
 
 	ret = write(master, teststr, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("write(master) failed");
+		pr_perror("write(master) failed");
 		return 1;
 	}
 
 	ret = read(slave1, buf, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("read(slave1) failed");
+		pr_perror("read(slave1) failed");
 		return 1;
 	}
 
@@ -68,13 +68,13 @@ int main(int argc, char *argv[])
 
 	ret = write(master, teststr, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("write(master) failed");
+		pr_perror("write(master) failed");
 		return 1;
 	}
 
 	ret = read(slave2, buf, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("read(slave1) failed");
+		pr_perror("read(slave1) failed");
 		return 1;
 	}
 

test/zdtm/live/static/pty02.c

@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 
 	master = open("/dev/ptmx", O_RDWR);
 	if (master == -1) {
-		err("open(%s) failed", "/dev/ptmx");
+		pr_perror("open(%s) failed", "/dev/ptmx");
 		return 1;
 	}
 
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 	slavename = ptsname(master);
 	slave = open(slavename, O_RDWR);
 	if (slave == -1) {
-		err("open(%s) failed", slavename);
+		pr_perror("open(%s) failed", slavename);
 		return 1;
 	}
 
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
 		new_master = dup(master);
 		if (new_master < 0) {
-			err("can't dup master");
+			pr_perror("can't dup master");
 			exit_shot_parent(1);
 		}
 
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 
 		ret = write(new_master, teststr, sizeof(teststr) - 1);
 		if (ret != sizeof(teststr) - 1) {
-			err("write(new_master) failed (ret = %d)", ret);
+			pr_perror("write(new_master) failed (ret = %d)", ret);
 			exit_shot_parent(1);
 		}
 
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 		close(new_master);
 		exit(0);
 	} else if (pid < 0) {
-		err("test_fork failed");
+		pr_perror("test_fork failed");
 		exit(1);
 	}
 
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
 	ret = read(slave, buf, sizeof(teststr) - 1);
 	if (ret != sizeof(teststr) - 1) {
-		err("read(slave) failed (ret = %d)", ret);
+		pr_perror("read(slave) failed (ret = %d)", ret);
 		return 1;
 	}