diff options
author | smh <smh@FreeBSD.org> | 2015-11-30 09:13:04 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2015-11-30 09:13:04 +0000 |
commit | 76801872045ff4c113f5d6a14b326152c2d4bb6d (patch) | |
tree | d3ad6525bb474f1f28f9d4db63834afbe59c3e5d | |
parent | ad77d0fb1e49e7ad2358f0793c46acaec2a9726a (diff) | |
download | FreeBSD-src-76801872045ff4c113f5d6a14b326152c2d4bb6d.zip FreeBSD-src-76801872045ff4c113f5d6a14b326152c2d4bb6d.tar.gz |
MFC r291207:
Fix dumpon compatibility with dumpdev kenv
Sponsored by: Multiplay
-rw-r--r-- | sbin/dumpon/dumpon.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index eebcc69..1ecbff3 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -152,16 +152,31 @@ main(int argc, char *argv[]) usage(); 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) - err(EX_OSFILE, "%s", argv[0]); - check_size(fd, argv[0]); + err(EX_OSFILE, "%s", dumpdev); + check_size(fd, dumpdev); u = 0; i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) - printf("kernel dumps on %s\n", argv[0]); + printf("kernel dumps on %s\n", dumpdev); } else { fd = open(_PATH_DEVNULL, O_RDONLY); if (fd < 0) |