diff options
| author | jh <jh@FreeBSD.org> | 2010-10-10 09:24:19 +0000 |
|---|---|---|
| committer | jh <jh@FreeBSD.org> | 2010-10-10 09:24:19 +0000 |
| commit | 598579df4eadd7452320cc91a3ba2916ce3f1a8e (patch) | |
| tree | 56e6d912a9f9ebc66cbf96301573d48dfaaf47a3 /sbin/mksnap_ffs | |
| parent | 4036cd070dc5c10e56ee81b7b59fac9c3d1b21b5 (diff) | |
| download | FreeBSD-src-598579df4eadd7452320cc91a3ba2916ce3f1a8e.zip FreeBSD-src-598579df4eadd7452320cc91a3ba2916ce3f1a8e.tar.gz | |
- 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
Diffstat (limited to 'sbin/mksnap_ffs')
| -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 f0db853..7dcf5c2 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) |
