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

A few style and whitespace fixes.

Browse Source 
Submitted by:	bde
This commit is contained in:
John Baldwin 2008-08-02 12:04:59 +00:00
parent 6d09e4f1a8
commit 52122f3139
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/ldd/ldd.c
View File

@ -83,7 +83,6 @@ execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
int i, rval, status;
unsetenv(LD_ "TRACE_LOADED_OBJECTS");
rval = 0;
i = 0;
argv[i++] = strdup(_PATH_LDD32);
@ -91,15 +90,14 @@ execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
argv[i++] = strdup("-a");
if (vflag)
argv[i++] = strdup("-v");
if (fmt1) {
if (fmt1 != NULL) {
argv[i++] = strdup("-f");
argv[i++] = strdup(fmt1);
}
if (fmt2) {
if (fmt2 != NULL) {
argv[i++] = strdup("-f");
argv[i++] = strdup(fmt2);
}
argv[i++] = strdup(file);
argv[i++] = NULL;
@ -110,16 +108,15 @@ execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
case 0:
execv(_PATH_LDD32, argv);
warn("%s", _PATH_LDD32);
_exit(1);
_exit(127);
break;
default:
if (wait(&status) <= 0) {
if (wait(&status) < 0)
rval = 1;
} else if (WIFSIGNALED(status)) {
else if (WIFSIGNALED(status))
rval = 1;
} else if (WIFEXITED(status) && WEXITSTATUS(status)) {
else if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
rval = 1;
}
break;
}
while (i--)
@ -232,14 +229,15 @@ main(int argc, char *argv[])
err(1, "fork");
break;
default:
if (wait(&status) <= 0) {
if (wait(&status) < 0) {
warn("wait");
rval |= 1;
} else if (WIFSIGNALED(status)) {
fprintf(stderr, "%s: signal %d\n", *argv,
WTERMSIG(status));
rval |= 1;
} else if (WIFEXITED(status) && WEXITSTATUS(status)) {
} else if (WIFEXITED(status) &&
WEXITSTATUS(status) != 0) {
fprintf(stderr, "%s: exit status %d\n", *argv,
WEXITSTATUS(status));
rval |= 1;