diff options
author | rodrigc <rodrigc@FreeBSD.org> | 2014-06-23 22:35:41 +0000 |
---|---|---|
committer | rodrigc <rodrigc@FreeBSD.org> | 2014-06-23 22:35:41 +0000 |
commit | 360ded26576497de493c3acb4a118c97502aa2fa (patch) | |
tree | 20e216fb76e7e6548e699e6a150ad8e1170c241b /sbin | |
parent | 95d8d7a8ec83f0dcf13e036e4b46b53f7cc6a182 (diff) | |
download | FreeBSD-src-360ded26576497de493c3acb4a118c97502aa2fa.zip FreeBSD-src-360ded26576497de493c3acb4a118c97502aa2fa.tar.gz |
Undo bad merge.
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/mount_nullfs/mount_nullfs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index e92680b..e08599f 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -103,25 +103,18 @@ main(int argc, char *argv[]) err(EX_USAGE, "%s", source); if (subdir(target, source) || subdir(source, target)) - errx(EX_USAGE, "%s (%s) and %s are not lldistinct paths", + errx(EX_USAGE, "%s (%s) and %s are not distinct paths", argv[0], target, argv[1]); - printf("Debug: 1\n"); build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1); build_iovec(&iov, &iovlen, "target", target, (size_t)-1); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); - printf("Debug: 2, source: %zd target: %zdd\n", strlen(source), strlen(target)); if (nmount(iov, iovlen, 0) < 0) { - printf("Debug: 3\n"); - if (errmsg[0] != 0) { - printf("Debug 4\n"); + if (errmsg[0] != 0) err(1, "%s: %s", source, errmsg); - } - else { - printf("Debug 5\n"); + else err(1, "%s", source); - } } exit(0); } |