mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-05 08:00:30 +00:00
Avoid null dereference on verbose output.
Submitted-By: Doug Ambrisko <ambrisko@whistle.com> Don't print a warning on exit status 0.
This commit is contained in:
parent
d21c76f6ef
commit
a27816e5a5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=53677
|
@ -611,15 +611,15 @@ find_action(struct usb_device_info *devinfo)
|
|||
(action->protocol == WILDCARD_INT ||
|
||||
action->protocol == devinfo->protocol)) {
|
||||
/* found match !*/
|
||||
break;
|
||||
if (verbose)
|
||||
printf("%s: Found action '%s' for %s, %s\n",
|
||||
__progname, action->name,
|
||||
devinfo->product, devinfo->vendor);
|
||||
return(action);
|
||||
}
|
||||
}
|
||||
|
||||
if (verbose)
|
||||
printf("%s: Found action '%s' for %s, %s\n",
|
||||
__progname, action->name,
|
||||
devinfo->product, devinfo->vendor);
|
||||
return(action);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -695,7 +695,7 @@ execute_command(char *cmd)
|
|||
} else if (status == 127) {
|
||||
fprintf(stderr, "%s: Shell failed for '%s'\n",
|
||||
__progname, cmd);
|
||||
} else if (WIFEXITED(status)) {
|
||||
} else if (WIFEXITED(status) && WEXITSTATUS(status)) {
|
||||
fprintf(stderr, "%s: '%s' returned %d\n",
|
||||
__progname, cmd, WEXITSTATUS(status));
|
||||
} else if (WIFSIGNALED(status)) {
|
||||
|
|
Loading…
Reference in a new issue