 @@ -1,14 +1,14 @@
-/*	$NetBSD: ktrace.c,v 1.45 2011/09/16 15:39:26 joerg Exp $	*/
+/*	$NetBSD: ktrace.c,v 1.46 2013/01/24 17:47:58 christos Exp $	*/
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)ktrace.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ktrace.c,v 1.45 2011/09/16 15:39:26 joerg Exp $");
+__RCSID("$NetBSD: ktrace.c,v 1.46 2013/01/24 17:47:58 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <sys/socket.h>
 #include <err.h>
 @@ -60,27 +60,26 @@ __RCSID("$NetBSD: ktrace.c,v 1.45 2011/0
 #include <unistd.h>
 #include <signal.h>
 #include "ktrace.h"
 #ifdef KTRUSS
 #include "setemul.h"
 #endif
 static int rpid(char *);
 __dead static void usage(void);
 static int do_ktrace(const char *, int, int, int, int, int);
 __dead static void no_ktrace(int);
 static void fset(int fd, int flag);
 static void fclear(int fd, int flag);
 #ifdef KTRUSS
 extern int timestamp, decimal, fancy, tail, maxdata;
 #endif
 int
 main(int argc, char *argv[])
+{
 	enum { NOTSET, CLEAR, CLEARALL } clear;
 	int block, append, ch, fd, trset, ops, pid, pidset, synclog, trpoints;
 	int vers;
 	const char *outfile;
 @@ -260,37 +259,26 @@ rpid(char *p)
 	if (first++) {
 		warnx("only one -g or -p flag is permitted.");
 		usage();
+	}
 	if (!*p) {
 		warnx("illegal process id.");
 		usage();
+	}
 	return (atoi(p));
+}
 static void
 fset(int fd, int flag)
 	int oflag = fcntl(fd, F_GETFL, 0);
 	if (oflag == -1)
 		err(EXIT_FAILURE, "Cannot get file flags");
 	if (fcntl(fd, F_SETFL, oflag | flag) == -1)
 		err(EXIT_FAILURE, "Cannot set file flags");
 static void
 fclear(int fd, int flag)
+{
 	int oflag = fcntl(fd, F_GETFL, 0);
 	if (oflag == -1)
 		err(EXIT_FAILURE, "Cannot get file flags");
 	if (fcntl(fd, F_SETFL, oflag & ~flag) == -1)
 		err(EXIT_FAILURE, "Cannot set file flags");
+}
 static void
 usage(void)
+{
 @@ -330,31 +318,29 @@ no_ktrace(int sig)
+}
 static int
 do_ktrace(const char *tracefile, int vers, int ops, int trpoints, int pid,
     int block)
+{
 	int ret;
 	ops |= vers << KTRFAC_VER_SHIFT;
 	if (KTROP(ops) == KTROP_SET &&
 	    (!tracefile || strcmp(tracefile, "-") == 0)) {
 		int pi[2], dofork;
-		if (pipe(pi) < 0)
+		if (pipe2(pi, O_CLOEXEC) == -1)
 			err(EXIT_FAILURE, "pipe(2)");
 		fset(pi[0], FD_CLOEXEC);
 		fset(pi[1], FD_CLOEXEC);
 		dofork = (pid == getpid());
 		if (dofork) {
 #ifdef KTRUSS
 			/*
 			 * Create a child process and trace it.
 			 */
 			pid = fork();
 			if (pid == -1)
 				err(EXIT_FAILURE, "fork");
 			else if (pid == 0) {
 				pid = getpid();
 				goto trace_and_exec;