diff options
| author | Jaakko Heinonen <jh@FreeBSD.org> | 2010-10-10 09:24:19 +0000 |
|---|---|---|
| committer | Jaakko Heinonen <jh@FreeBSD.org> | 2010-10-10 09:24:19 +0000 |
| commit | 7f79e870d26a5eff60127bb9d5608ae3471ed53e (patch) | |
| tree | 56e6d912a9f9ebc66cbf96301573d48dfaaf47a3 | |
| parent | d0cc54f3b427a42751bb0a96ca8feaa6ac200073 (diff) | |
| download | src-7f79e870d26a5eff60127bb9d5608ae3471ed53e.tar.gz src-7f79e870d26a5eff60127bb9d5608ae3471ed53e.zip | |
- Print the nmount(2) provided error message only when it is set.
- Ensure that the error message is NUL-terminated before printing it.
PR: bin/147482
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=213668
| -rw-r--r-- | sbin/mksnap_ffs/mksnap_ffs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c index f0db853e8163..7dcf5c216b2e 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.c +++ b/sbin/mksnap_ffs/mksnap_ffs.c @@ -121,8 +121,12 @@ main(int argc, char **argv) build_iovec(&iov, &iovlen, "update", NULL, 0); build_iovec(&iov, &iovlen, "snapshot", NULL, 0); - if (nmount(iov, iovlen, stfsbuf.f_flags) < 0) - err(1, "Cannot create snapshot %s: %s", snapname, errmsg); + *errmsg = '\0'; + if (nmount(iov, iovlen, stfsbuf.f_flags) < 0) { + errmsg[sizeof(errmsg) - 1] = '\0'; + err(1, "Cannot create snapshot %s%s%s", snapname, + *errmsg != '\0' ? ": " : "", errmsg); + } if ((fd = open(snapname, O_RDONLY)) < 0) err(1, "Cannot open %s", snapname); if (fstat(fd, &stbuf) != 0) |