 @@ -1,17 +1,17 @@
-/*	$NetBSD: swapctl.c,v 1.39 2013/01/01 19:01:10 dsl Exp $	*/
+/*	$NetBSD: swapctl.c,v 1.40 2015/10/11 23:58:16 mrg Exp $	*/
 /*
- * Copyright (c) 1996, 1997, 1999 Matthew R. Green
+ * Copyright (c) 1996, 1997, 1999, 2015 Matthew R. Green
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -54,27 +54,27 @@
  *	-p <pri>	use this priority
  *	-c		change priority
+ *
  * or, if invoked as "swapon" (compatibility mode):
+ *
  *	-a		all devices listed as `sw' in /etc/fstab
  *	-t		same as -t above (feature not present in old
  *			swapon(8) command)
  *	<dev>		add this device
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: swapctl.c,v 1.39 2013/01/01 19:01:10 dsl Exp $");
+__RCSID("$NetBSD: swapctl.c,v 1.40 2015/10/11 23:58:16 mrg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/swap.h>
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <unistd.h>
 #include <err.h>
 @@ -141,27 +141,27 @@ static int	fflag;		/* first swap becomes
 #define	FFLAG_CMDS	(CMD_A)
 static int	oflag;		/* only autoset dump device */
 #define	OFLAG_CMDS	(CMD_A)
 static int	nflag;		/* no execute, just print actions */
 #define	NFLAG_CMDS	(CMD_A | CMD_U)
 static int	pri;		/* uses 0 as default pri */
 static	void change_priority(char *);
 static	int  add_swap(char *, int);
 static	int  delete_swap(char *);
-static	void set_dumpdev1(char *);
+static	int set_dumpdev1(char *);
 static	void set_dumpdev(char *);
 static	int get_dumpdev(void);
 __dead static	void do_fstab(int);
 static	int check_fstab(void);
 static	void do_localdevs(int);
 static	void do_localdisk(const char *, int);
 static	int do_wedgesofdisk(int fd, int);
 static	int do_partitionsofdisk(const char *, int fd, int);
 __dead static	void usage(void);
 __dead static	void swapon_command(int, char **);
 #if 0
 static	void swapoff_command(int, char **);
 #endif
 @@ -465,81 +465,89 @@ add_swap(char *path, int priority)
 	if (fflag || oflag) {
 		set_dumpdev1(spec);
 		if (oflag)
 			exit(0);
 		else
 			fflag = 0;
+	}
 	if (nflag)
 		return 1;
 	if (swapctl(SWAP_ON, spec, priority) < 0) {
 oops:
-		err(1, "%s", path);
+		warn("%s", path);
 		return 0;
+	}
-	return (1);
+	return 1;
+}
 /*
  * delete_swap:  remove the pathname to the list of swap devices.
  */
 static int
 delete_swap(char *path)
+{
 	char buf[MAXPATHLEN];
 	char *spec;
-	if (getfsspecname(buf, sizeof(buf), path) == NULL)
+	if (getfsspecname(buf, sizeof(buf), path) == NULL) {
-		err(1, "%s", path);
+		warn("%s", path);
 		return 0;
+	}
 	spec = buf;
 	if (nflag)
 		return 1;
-	if (swapctl(SWAP_OFF, spec, pri) < 0)
+	if (swapctl(SWAP_OFF, spec, pri) < 0) {
-		err(1, "%s", path);
+		warn("%s", path);
-	return (1);
+		return 0;
+	}
 	return 1;
+}
-static void
+static int
 set_dumpdev1(char *spec)
+{
 	int rv = 0;
 	if (!nflag) {
 		if (strcmp(spec, "none") == 0)
 			rv = swapctl(SWAP_DUMPOFF, NULL, 0);
 		else
 			rv = swapctl(SWAP_DUMPDEV, spec, 0);
+	}
 	if (rv == -1)
-		err(1, "could not set dump device to %s", spec);
+		warn("could not set dump device to %s", spec);
 	else
 		printf("%s: setting dump device to %s\n", getprogname(), spec);
 	return rv == -1 ? 0 : 1;
+}
 static void
 set_dumpdev(char *path)
+{
 	char buf[MAXPATHLEN];
 	char *spec;
 	if (getfsspecname(buf, sizeof(buf), path) == NULL)
 		err(1, "%s", path);
 	spec = buf;
-	return set_dumpdev1(spec);
+	if (! set_dumpdev1(spec))
 		exit(1);
+}
 static int
 get_dumpdev(void)
+{
 	dev_t	dev;
 	char 	*name;
 	if (swapctl(SWAP_GETDUMPDEV, &dev, 0) == -1) {
 		warn("could not get dump device");
 		return 0;
 	} else if (dev == NODEV) {
 		printf("no dump device set\n");