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

- Print the nmount(2) provided error message only when it is set.

Browse Source 
- Ensure that the error message is NUL-terminated before printing it.

PR:		bin/147482
MFC after:	2 weeks
This commit is contained in:
Jaakko Heinonen 2010-10-10 09:24:19 +00:00
parent d0cc54f3b4
commit 7f79e870d2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/mksnap_ffs/mksnap_ffs.c
View File

@ -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)