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

Add FBSDID. Do not \n terminate warnx() argument. fprint() -> warnx().

Browse Source
This commit is contained in:
Philippe Charnier 2003-09-07 15:50:43 +00:00
parent fed771de60
commit b956c13cfe
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/truss/main.c
View File

@ -29,10 +29,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint #include <sys/cdefs.h>
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
/* /*
* The main module for truss. Suprisingly simple, but, then, the other * The main module for truss. Suprisingly simple, but, then, the other
@ -129,7 +127,7 @@ set_etype(struct trussinfo *trussinfo) {
if (funcs->type == NULL) { if (funcs->type == NULL) {
funcs = &ex_types[0]; funcs = &ex_types[0];
warn("Execution type %s is not supported -- using %s\n", warn("execution type %s is not supported -- using %s",
progt, funcs->type); progt, funcs->type);
} }
return funcs; return funcs;

9
usr.bin/truss/setup.c
View File

@ -29,10 +29,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint #include <sys/cdefs.h>
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
/* /*
* Various setup functions for truss. Not the cleanest-written code, * Various setup functions for truss. Not the cleanest-written code,
@ -45,7 +43,6 @@ static const char rcsid[] =
#include <sys/wait.h> #include <sys/wait.h>
#include <err.h> #include <err.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -115,7 +112,7 @@ setup_and_wait(char *command[]) {
if (ioctl(fd, PIOCWAIT, &pfs) == -1) if (ioctl(fd, PIOCWAIT, &pfs) == -1)
err(6, "PIOCWAIT"); err(6, "PIOCWAIT");
if (pfs.why == S_EXIT) { if (pfs.why == S_EXIT) {
fprintf(stderr, "process exited before exec'ing\n"); warnx("process exited before exec'ing");
ioctl(fd, PIOCCONT, 0); ioctl(fd, PIOCCONT, 0);
wait(0); wait(0);
exit(7); exit(7);