 @@ -1,14 +1,14 @@
-/*	$NetBSD: interact.c,v 1.30 2006/11/26 16:16:31 jmmv Exp $	*/
+/*	$NetBSD: interact.c,v 1.31 2009/03/16 13:33:36 lukem Exp $	*/
 /*
  * Copyright (c) 1997 Christos Zoulas.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -25,27 +25,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: interact.c,v 1.30 2006/11/26 16:16:31 jmmv Exp $");
+__RCSID("$NetBSD: interact.c,v 1.31 2009/03/16 13:33:36 lukem Exp $");
 #endif /* lint */
 #include <sys/param.h>
 #define FSTYPENAMES
 #define DKTYPENAMES
 #include <err.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #if HAVE_NBTOOL_CONFIG_H
 #define	getmaxpartitions()	MAXPARTITIONS
 @@ -498,30 +498,30 @@ cmd_part(struct disklabel *lp, char *s,
 		if (line[1] == '\0' &&
 	    		line[0] >= 'a' && line[0] < 'a' + getmaxpartitions()) {
 			struct partition *cp = lp->d_partitions;
 			if ((cp[line[0] - 'a'].p_offset +
 			    cp[line[0] - 'a'].p_size) >= lp->d_secperunit) {
 				printf("Bad offset `%s'\n", line);
 				continue;
 			} else {
 				p->p_offset = cp[line[0] - 'a'].p_offset +
 				    cp[line[0] - 'a'].p_size;
+			}
 		} else {
-			if ((i = getnum(lp, line, 0)) == -1) {
+			if ((i = getnum(lp, line, 0)) == -1 || i < 0) {
 				printf("Bad offset `%s'\n", line);
 				continue;
-			} else if (i > lp->d_secperunit) {
+			} else if ((uint32_t)i > lp->d_secperunit) {
 				printf("Offset `%s' out of range\n", line);
 				continue;
+			}
 			p->p_offset = i;
+		}
 		break;
+	}
 	for (;;) {
 		defnum(lp, def, p->p_size);
 		i = getinput(":", "Partition size ('$' for all remaining)",
 		    def, line);
 		if (i == -1)
 			return;
 @@ -537,27 +537,27 @@ cmd_part(struct disklabel *lp, char *s,
 			continue;
+		}
 		p->p_size = i;
 		break;
+	}
 	if (memcmp(&ps, p, sizeof(ps)))
 		showpartition(stdout, lp, part, Cflag);
 	if (chaining) {
 		int offs = -1;
 		struct partition *cp = lp->d_partitions;
 		for (i = 0; i < lp->d_npartitions; i++) {
 			if (cp[i].p_fstype != FS_UNUSED) {
-				if (offs != -1 && cp[i].p_offset != offs) {
+				if (offs != -1 && cp[i].p_offset != (uint32_t)offs) {
 					cp[i].p_offset = offs;
 					showpartition(stdout, lp, i, Cflag);
+					}
 				offs = cp[i].p_offset + cp[i].p_size;
+			}
+		}
+	}
+}
 static void
 cmd_label(struct disklabel *lp, char *s, int fd)
+{
 @@ -640,29 +640,29 @@ getinput(const char *sep, const char *pr
+}
 static int
 alphacmp(const void *a, const void *b)
+{
 	return (strcasecmp(*(const char * const*)a, *(const char * const*)b));
+}
 static void
 dumpnames(const char *prompt, const char * const *olist, size_t numentries)
+{
-	int	i, w;
+	int	w;
-	int	entry;
+	size_t	i, entry, lines;
-	int	columns, width, lines;
+	int	columns, width;
 	const char *p;
 	const char **list;
 	if ((list = (const char **)malloc(sizeof(char *) * numentries)) == NULL)
 		err(1, "malloc");
 	width = 0;
 	printf("%s:\n", prompt);
 	for (i = 0; i < numentries; i++) {
 		list[i] = olist[i];
 		w = strlen(list[i]);
 		if (w > width)
 			width = w;
+	}