svn commit: r236904 - stable/8/sbin/mount

Jaakko Heinonen jh at FreeBSD.org
Mon Jun 11 18:22:04 UTC 2012


Author: jh
Date: Mon Jun 11 18:22:04 2012
New Revision: 236904
URL: http://svn.freebsd.org/changeset/base/236904

Log:
  MFC r230377:
  
  Don't print the nmount(2) provided error message if it is empty.

Modified:
  stable/8/sbin/mount/mount_fs.c
Directory Properties:
  stable/8/sbin/mount/   (props changed)

Modified: stable/8/sbin/mount/mount_fs.c
==============================================================================
--- stable/8/sbin/mount/mount_fs.c	Mon Jun 11 18:10:12 2012	(r236903)
+++ stable/8/sbin/mount/mount_fs.c	Mon Jun 11 18:22:04 2012	(r236904)
@@ -130,7 +130,10 @@ mount_fs(const char *vfstype, int argc, 
 	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
 
 	if (nmount(iov, iovlen, mntflags) == -1) {
-		warn("%s: %s", dev, errmsg);
+		if (*errmsg != '\0')
+			warn("%s: %s", dev, errmsg);
+		else
+			warn("%s", dev);
 		return (1);
 	}
 	return (0);


More information about the svn-src-all mailing list