CVS commit: src/distrib/utils/sysinst/arch/mac68k

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Jan  6 20:41:28 UTC 2012

Modified Files:
src/distrib/utils/sysinst/arch/mac68k: md.c

Log Message:
Use getfslabelname() instead of trying to access fstypenames[] directly.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/arch/mac68k/md.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/mac68k/md.c
diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.60 src/distrib/utils/sysinst/arch/mac68k/md.c:1.61
--- src/distrib/utils/sysinst/arch/mac68k/md.c:1.60	Fri Nov  4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/mac68k/md.c	Fri Jan  6 20:41:28 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.60 2011/11/04 11:27:03 martin Exp $ */
+/*	$NetBSD: md.c,v 1.61 2012/01/06 20:41:28 riz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -336,7 +336,7 @@ md_make_bsd_partitions(void)
 		(void)fprintf (f, \t:p%c#%d:o%c#%d:t%c=%s:,
 			   'a'+i, bsdlabel[i].pi_size,
 			   'a'+i, bsdlabel[i].pi_offset,
-			   'a'+i, fstypenames[bsdlabel[i].pi_fstype]);
+			   'a'+i, getfslabelname(bsdlabel[i].pi_fstype));
 		if (bsdlabel[i].pi_fstype == FS_BSDFFS)
 			(void)fprintf (f, b%c#%d:f%c#%d,
 			   'a'+i, bsdlabel[i].pi_fsize * bsdlabel[i].pi_frag,

CVS commit: src/distrib/utils/sysinst/arch/mac68k

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Jan 17 22:47:19 UTC 2010

Modified Files:
src/distrib/utils/sysinst/arch/mac68k: md.c

Log Message:
Close file when finished with it. Found by cppcheck.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/arch/mac68k/md.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/mac68k/md.c
diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.56 src/distrib/utils/sysinst/arch/mac68k/md.c:1.57
--- src/distrib/utils/sysinst/arch/mac68k/md.c:1.56	Sat Jan  2 18:06:58 2010
+++ src/distrib/utils/sysinst/arch/mac68k/md.c	Sun Jan 17 22:47:18 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.56 2010/01/02 18:06:58 dsl Exp $ */
+/*	$NetBSD: md.c,v 1.57 2010/01/17 22:47:18 wiz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -777,6 +777,7 @@
 		strncat(name,  (, len_name-strlen(name));
 		strncat(name, macosblk[37], len_name-strlen(name));
 		strncat(name, ), len_name-strlen(name));
+		close(fd);
 		}
 		break;
 	default:

CVS commit: src/distrib/utils/sysinst/arch/mac68k

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Sat Jan  2 17:15:07 UTC 2010

Modified Files:
src/distrib/utils/sysinst/arch/mac68k: menus.md.de menus.md.en
menus.md.es menus.md.pl

Log Message:
Sanitise whitespace to minimise the differences between these files.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/mac68k/menus.md.de
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/mac68k/menus.md.en
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/mac68k/menus.md.es
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/mac68k/menus.md.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/mac68k/menus.md.de
diff -u src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.3 src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.4
--- src/distrib/utils/sysinst/arch/mac68k/menus.md.de:1.3	Sat May 24 21:42:52 2008
+++ src/distrib/utils/sysinst/arch/mac68k/menus.md.de	Sat Jan  2 17:15:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.de,v 1.3 2008/05/24 21:42:52 hauke Exp $	*/
+/*	$NetBSD: menus.md.de,v 1.4 2010/01/02 17:15:07 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,21 +57,21 @@
 		endwin();
 		return 0;
 		}
-	 	map.size = NEW_MAP_SIZE;
+		map.size = NEW_MAP_SIZE;
 		map.in_use_cnt = new_map[0].pmMapBlkCnt;
 		map.blk = (struct apple_part_map_entry *)calloc(map.size,
 			sizeof(struct apple_part_map_entry));
 		for (i=0;imap.size;i++)
 		memcpy (map.blk[i], new_map[i],
 			 sizeof(struct apple_part_map_entry));
- 	};
+	};
 
 menu editparttable, title  Wählen Sie eine Partition, exit, y=14;
 	display action  { msg_display (MSG_editparttable);
 			  sortmerge();
 			  if (map.selected = map.usable_cnt)
 map.selected = 0;
-  disp_selected_part (map.selected);
+			  disp_selected_part (map.selected);
 			};
 	option Nächste Partition auswählen,  action {
 		map.selected += 1;
@@ -104,7 +104,7 @@
 			strcpy (map.blk[k].pmPartType, Apple_Free);
 			map.blk[k].pmPyPartStart += size;
 			if ((map.blk[k].pmPyPartStart + free_size)  dlsize)
-			map.blk[k].pmPartBlkCnt = 
+			map.blk[k].pmPartBlkCnt =
 dlsize - map.blk[k].pmPyPartStart;
 			else
 			map.blk[k].pmPartBlkCnt = free_size;
@@ -117,39 +117,39 @@
 		} else {
 			msg_display (MSG_diskfull);
 			process_menu (MENU_okabort, NULL);
-		 	if (!yesno) {
+			if (!yesno) {
 			free (map.blk);
-	 		map.size = NEW_MAP_SIZE;
+			map.size = NEW_MAP_SIZE;
 			map.in_use_cnt = new_map[0].pmMapBlkCnt;
 			map.blk = (struct apple_part_map_entry *)calloc(map.size,
 sizeof(struct apple_part_map_entry));
 			for (i=0;imap.size;i++)
-				memcpy (map.blk[i], new_map[i],
-			 	sizeof(struct apple_part_map_entry));
+memcpy (map.blk[i], new_map[i],
+sizeof(struct apple_part_map_entry));
 			map.blk[0].pmSigPad = 0; /* Don't rewrite Block0 */
 			}
 		}
 		} };
-option Partition korrigieren, action {
-int i = map.mblk[map.selected];
-EBZB *bzb = (EBZB *)map.blk[i].pmBootArgs[0];
-msg_display(MSG_partdebug, diskdev, bzb-flags.part,
-map.blk[i].pmPyPartStart,
-map.blk[i].pmPartBlkCnt);
-if ((map.blk[i].pmPyPartStart +
-map.blk[i].pmPartBlkCnt)  dlsize) {
+	option Partition korrigieren, action {
+		int i = map.mblk[map.selected];
+		EBZB *bzb = (EBZB *)map.blk[i].pmBootArgs[0];
+		msg_display(MSG_partdebug, diskdev, bzb-flags.part,
+			map.blk[i].pmPyPartStart,
+			map.blk[i].pmPartBlkCnt);
+		if ((map.blk[i].pmPyPartStart +
+		map.blk[i].pmPartBlkCnt)  dlsize) {
 			msg_display_add(MSG_parttable_fix_fixing,
-diskdev, bzb-flags.part);
-map.blk[i].pmPartBlkCnt =
-dlsize - map.blk[i].pmPyPartStart;
-map.blk[i].pmDataCnt =
-map.blk[i].pmPartBlkCnt;
-} else {
+diskdev, bzb-flags.part);
+			map.blk[i].pmPartBlkCnt =
+			dlsize - map.blk[i].pmPyPartStart;
+			map.blk[i].pmDataCnt =
+			map.blk[i].pmPartBlkCnt;
+		} else {
 		msg_display_add(MSG_parttable_fix_fine,
-diskdev, bzb-flags.part);
-}
-process_menu(MENU_ok, NULL);
-};
+			diskdev, bzb-flags.part);
+		}
+		process_menu(MENU_ok, NULL);
+		};
 
 
 menu ok2, title Abbrechen?, y=17;
@@ -184,7 +184,7 @@
 		if (whichType(map.blk[j]) == ROOT_PART) {
 			bzb = (EBZB *)map.blk[j].pmBootArgs[0];
 			if (bzb-type == APPLE_BZB_TYPEFS  bzb-flags.root) {
-			   if (map.root_cnt++ == 0) 
+			   if (map.root_cnt++ == 0)
 strcpy (bzb-mount_point, /);
 			   else
 strcpy (bzb-mount_point, /altroot);
@@ -233,8 +233,8 @@
 		if 

CVS commit: src/distrib/utils/sysinst/arch/mac68k

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Tue May 26 20:29:04 UTC 2009

Modified Files:
src/distrib/utils/sysinst/arch/mac68k: md.c

Log Message:
Fix build by explicitly narrowing dlsize to an unsigned 32-bit quantity as
supported by disklabel.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/arch/mac68k/md.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/sysinst/arch/mac68k/md.c
diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.53 src/distrib/utils/sysinst/arch/mac68k/md.c:1.54
--- src/distrib/utils/sysinst/arch/mac68k/md.c:1.53	Tue Oct  7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/mac68k/md.c	Tue May 26 20:29:04 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.53 2008/10/07 09:58:15 abs Exp $ */
+/*	$NetBSD: md.c,v 1.54 2009/05/26 20:29:04 sborrill Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -44,6 +44,7 @@
 #include fcntl.h
 #include sys/ioctl.h
 #include sys/utsname.h
+#include machine/int_fmtio.h
 #include defs.h
 #include md.h
 #include msg_defs.h
@@ -1083,7 +1084,7 @@
 	(void)fprintf (f, %s|NetBSD installation generated:\\\n, bsddiskname);
 	(void)fprintf (f, \t:dt=%s:ty=winchester:\\\n, disktype);
 	(void)fprintf (f, \t:nc#%d:nt#%d:ns#%d:\\\n, dlcyl, dlhead, dlsec);
-	(void)fprintf (f, \t:sc#%d:su#%d:\\\n, dlhead*dlsec, dlsize);
+	(void)fprintf (f, \t:sc#%d:su#% PRIu32 :\\\n, dlhead*dlsec, (uint32_t)dlsize);
 	(void)fprintf (f, \t:se#%d:%s\\\n, blk_size, doessf);
 	for (i=0; i8; i++) {
 		if (bsdlabel[i].pi_fstype == FS_HFS)