Thu Jan 24 17:53:49 2013 UTC ()

use return instead of exit.


(christos)

diff -r1.97 -r1.98 src/sbin/mount/mount.c

--- src/sbin/mount/mount.c 2012/06/14 00:39:33	1.97
+++ src/sbin/mount/mount.c 2013/01/24 17:53:49	1.98

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.c,v 1.97 2012/06/14 00:39:33 christos Exp $	*/
+/*	$NetBSD: mount.c,v 1.98 2013/01/24 17:53:49 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.97 2012/06/14 00:39:33 christos Exp $");
+__RCSID("$NetBSD: mount.c,v 1.98 2013/01/24 17:53:49 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <fs/puffs/puffs_msgif.h>
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
 #include <pwd.h>
 @@ -194,28 +194,27 @@ main(int argc, char *argv[])
 				    fs->fs_mntops, !forceall, NULL, 0))
 					rval = 1;
+			}
 		else {
 			if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)
 				err(EXIT_FAILURE, "getmntinfo");
 			for (i = 0; i < mntsize; i++) {
 				if (checkvfsname(mntbuf[i].f_fstypename,
 				    vfslist))
 					continue;
 				prmount(&mntbuf[i]);
+			}
+		}
-		exit(rval);
+		return rval;
 		/* NOTREACHED */
 	case 1:
 		if (vfslist != NULL) {
 			usage();
 			/* NOTREACHED */
+		}
 		/*
 		 * Create a canonical version of the device or mount path
 		 * passed to us.  It's ok for this to fail.  It's also ok
 		 * for the result to be exactly the same as the original.
 		 */
 		canonical_path = realpath(*argv, canonical_path_buf);
 @@ -315,28 +314,27 @@ out:
 	 * good news.  Pid checks are probably unnecessary, but don't hurt.
 	 */
 	if (rval == 0 && getuid() == 0 &&
 	    (mountdfp = fopen(_PATH_MOUNTDPID, "r")) != NULL) {
 		int pid;
 		if (fscanf(mountdfp, "%d", &pid) == 1 &&
 		    pid > 0 && kill(pid, SIGHUP) == -1 && errno != ESRCH)
 			err(EXIT_FAILURE, "signal mountd");
 		(void)fclose(mountdfp);
+	}
 #endif
-	exit(rval);
+	return rval;
 	/* NOTREACHED */
+}
 int
 hasopt(const char *mntopts, const char *option)
+{
 	int negative, found;
 	char *opt, *optbuf;
 	if (option[0] == 'n' && option[1] == 'o') {
 		negative = 1;
 		option += 2;
 	} else
 		negative = 0;