Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst/arch/mac68k Sanitise whitespace to min...
details: https://anonhg.NetBSD.org/src/rev/e5fbebbd7f1a
branches: trunk
changeset: 750482:e5fbebbd7f1a
user: dsl <dsl%NetBSD.org@localhost>
date: Sat Jan 02 17:15:07 2010 +0000
description:
Sanitise whitespace to minimise the differences between these files.
diffstat:
distrib/utils/sysinst/arch/mac68k/menus.md.de | 60 +-
distrib/utils/sysinst/arch/mac68k/menus.md.en | 60 +-
distrib/utils/sysinst/arch/mac68k/menus.md.es | 60 +-
distrib/utils/sysinst/arch/mac68k/menus.md.pl | 449 ++++++++++++-------------
4 files changed, 314 insertions(+), 315 deletions(-)
diffs (truncated from 892 to 300 lines):
diff -r edd495e50895 -r e5fbebbd7f1a distrib/utils/sysinst/arch/mac68k/menus.md.de
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.de Sat Jan 02 16:08:20 2010 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.de Sat Jan 02 17:15:07 2010 +0000
@@ -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;i<map.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;i<map.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 (map.root_cnt++ == 0)
strcpy (bzb->mount_point, "/");
else {
- if (map.usr_cnt++ == 0)
- strcpy (bzb->mount_point, "/usr");
+ if (map.usr_cnt++ == 0)
+ strcpy (bzb->mount_point, "/usr");
} };
option "MacOS HFS", exit, action {
int j;
diff -r edd495e50895 -r e5fbebbd7f1a distrib/utils/sysinst/arch/mac68k/menus.md.en
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.en Sat Jan 02 16:08:20 2010 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.en Sat Jan 02 17:15:07 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.21 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.en,v 1.22 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;i<map.size;i++)
memcpy (&map.blk[i], &new_map[i],
sizeof(struct apple_part_map_entry));
- };
+ };
menu editparttable, title "Choose your 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 "Select next partition", action {
map.selected += 1;
@@ -104,7 +104,7 @@
strcpy ((char *)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;i<map.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 "Fix selected partition", 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 "Fix selected partition", 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 "Abort?", 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 ((char *)bzb->mount_point, "/");
else
strcpy ((char *)bzb->mount_point, "/altroot");
@@ -233,8 +233,8 @@
if (map.root_cnt++ == 0)
strcpy ((char *)bzb->mount_point, "/");
else {
- if (map.usr_cnt++ == 0)
- strcpy ((char *)bzb->mount_point, "/usr");
+ if (map.usr_cnt++ == 0)
+ strcpy ((char *)bzb->mount_point, "/usr");
} };
option "MacOS HFS", exit, action {
int j;
diff -r edd495e50895 -r e5fbebbd7f1a distrib/utils/sysinst/arch/mac68k/menus.md.es
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.es Sat Jan 02 16:08:20 2010 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.es Sat Jan 02 17:15:07 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.es,v 1.2 2008/05/24 21:42:52 hauke Exp $ */
+/* $NetBSD: menus.md.es,v 1.3 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;i<map.size;i++)
memcpy (&map.blk[i], &new_map[i],
sizeof(struct apple_part_map_entry));
- };
+ };
menu editparttable, title "Escoja su particion", 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 "Seleccione particion siguiente", 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);
Home |
Main Index |
Thread Index |
Old Index