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

Fix dumpon compatibility with dumpdev kenv

Browse Source 
The dumpdev kenv supports devices without the /dev/ prefix, fix dumpon to
also support this which is required after r288153.

MFC after:	1 week
Sponsored by:	Multiplay
This commit is contained in:
Steven Hartland 2015-11-23 14:06:21 +00:00
parent 477f6d2e17
commit 45a9027de4
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sbin/dumpon/dumpon.c
View File

@ -152,16 +152,31 @@ main(int argc, char *argv[])
usage(); usage();
if (strcmp(argv[0], "off") != 0) { if (strcmp(argv[0], "off") != 0) {
fd = open(argv[0], O_RDONLY); char tmp[PATH_MAX];
char *dumpdev;
if (strncmp(argv[0], _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) {
dumpdev = argv[0];
} else {
i = snprintf(tmp, PATH_MAX, "%s%s", _PATH_DEV, argv[0]);
if (i < 0) {
err(EX_OSERR, "%s", argv[0]);
} else if (i >= PATH_MAX) {
errno = EINVAL;
err(EX_DATAERR, "%s", argv[0]);
}
dumpdev = tmp;
}
fd = open(dumpdev, O_RDONLY);
if (fd < 0) if (fd < 0)
err(EX_OSFILE, "%s", argv[0]); err(EX_OSFILE, "%s", dumpdev);
check_size(fd, argv[0]); check_size(fd, dumpdev);
u = 0; u = 0;
i = ioctl(fd, DIOCSKERNELDUMP, &u); i = ioctl(fd, DIOCSKERNELDUMP, &u);
u = 1; u = 1;
i = ioctl(fd, DIOCSKERNELDUMP, &u); i = ioctl(fd, DIOCSKERNELDUMP, &u);
if (i == 0 && verbose) if (i == 0 && verbose)
printf("kernel dumps on %s\n", argv[0]); printf("kernel dumps on %s\n", dumpdev);
} else { } else {
fd = open(_PATH_DEVNULL, O_RDONLY); fd = open(_PATH_DEVNULL, O_RDONLY);
if (fd < 0) if (fd < 0)