Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst convert tables to use the new table fo...
details: https://anonhg.NetBSD.org/src/rev/2cff8c8f947e
branches: trunk
changeset: 474356:2cff8c8f947e
user: cgd <cgd%NetBSD.org@localhost>
date: Sun Jul 04 08:01:39 1999 +0000
description:
convert tables to use the new table formatting functons. i386 tested,
mac68k and bebox bits compiled to the extent possible. (bebox seems
broken, with duplicated menu names, but it doesn't look like that's my
fault.)
diffstat:
distrib/utils/sysinst/arch/bebox/msg.md.en | 18 +++++++++-
distrib/utils/sysinst/arch/bebox/msg.md.fr | 18 +++++++++-
distrib/utils/sysinst/arch/i386/md.c | 12 ++++---
distrib/utils/sysinst/arch/i386/msg.md.en | 47 ++++++++++++++++++++++++----
distrib/utils/sysinst/arch/i386/msg.md.fr | 47 ++++++++++++++++++++++++----
distrib/utils/sysinst/arch/mac68k/md.c | 6 +-
distrib/utils/sysinst/arch/mac68k/msg.md.en | 10 ++++-
distrib/utils/sysinst/disks.c | 14 ++++---
distrib/utils/sysinst/mbr.c | 10 +++---
distrib/utils/sysinst/msg.mi.en | 22 ++++++++++---
distrib/utils/sysinst/msg.mi.fr | 23 +++++++++++---
11 files changed, 175 insertions(+), 52 deletions(-)
diffs (truncated from 462 to 300 lines):
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/bebox/msg.md.en
--- a/distrib/utils/sysinst/arch/bebox/msg.md.en Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/bebox/msg.md.en Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.5 1999/06/20 06:42:06 cgd Exp $ */
+/* $NetBSD: msg.md.en,v 1.6 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -99,8 +99,20 @@
}
-message part_head
-{No Start(%s) Size(%s) End(%s) Kind\n}
+/* the %s's will expand into three character strings */
+message part_header
+{ Start(%3s) Size(%3s) End(%3s) Kind
+ ---------- ---------- ---------- ----
+}
+
+message part_row_start_unused
+{%-1d: }
+
+message part_row_start_used
+{%-1d: %-10d %-10d %-10d}
+
+message part_row_end
+{ %s\n}
message setbiosgeom
{You will be prompted for the geometry. Please enter the values you
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/bebox/msg.md.fr
--- a/distrib/utils/sysinst/arch/bebox/msg.md.fr Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/bebox/msg.md.fr Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.2 1999/06/20 06:08:18 cgd Exp $ */
+/* $NetBSD: msg.md.fr,v 1.3 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -98,8 +98,20 @@
}
-message part_head
-{Part Début(%s) Taille(%s) Fin(%s) Type\n}
+/* the %s's will expand into three character strings */
+message part_header
+{ Début(%3s) Taille(%3s) Fin(%3s) Type
+ ---------- ----------- ---------- ----
+}
+
+message part_row_start_unused
+{%-1d: }
+
+message part_row_start_used
+{%-1d: %-10d %-11d %-10d}
+
+message part_row_end
+{ %s\n}
message setbiosgeom
{On va vous demander la géométrie. SVP entrer les valeur que vous désirez.
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.29 1999/06/22 00:57:08 cgd Exp $ */
+/* $NetBSD: md.c,v 1.30 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -527,14 +527,16 @@
} else if (nip->ni_nmatches == 1) {
bip = &disklist->dl_biosdisks[nip->ni_biosmatches[0]];
msg_display(MSG_onebiosmatch);
- msg_printf_add("%6x%10d%7d%10d\n", bip->bi_dev - 0x80,
+ msg_table_add(MSG_onebiosmatch_header);
+ msg_table_add(MSG_onebiosmatch_row, bip->bi_dev - 0x80,
bip->bi_cyl, bip->bi_head, bip->bi_sec);
process_menu(MENU_biosonematch);
} else {
msg_display(MSG_biosmultmatch);
+ msg_table_add(MSG_biosmultmatch_header);
for (i = 0; i < nip->ni_nmatches; i++) {
bip = &disklist->dl_biosdisks[nip->ni_biosmatches[i]];
- msg_printf_add("%d: %6x%10d%7d%10d\n", i,
+ msg_table_add(MSG_biosmultmatch_row, i,
bip->bi_dev - 0x80, bip->bi_cyl, bip->bi_head,
bip->bi_sec);
}
@@ -605,9 +607,9 @@
{
int i;
- msg_display_add(MSG_bootselheader);
+ msg_table_add(MSG_bootsel_header);
for (i = 0; i < 4; i++) {
- msg_printf_add("%6d %-32s %s\n",
+ msg_table_add(MSG_bootsel_row,
i, get_partname(i), mbs->nametab[i]);
}
}
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/i386/msg.md.en
--- a/distrib/utils/sysinst/arch/i386/msg.md.en Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/i386/msg.md.en Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.15 1999/06/20 06:42:06 cgd Exp $ */
+/* $NetBSD: msg.md.en,v 1.16 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -67,8 +67,20 @@
real geom: %d cylinders, %d heads, %d sectors
}
-message part_head
-{No Start(%s) Size(%s) End(%s) Kind\n}
+/* the %s's will expand into three character strings */
+message part_header
+{ Start(%3s) Size(%3s) End(%3s) Kind
+ ---------- ---------- ---------- ----
+}
+
+message part_row_start_unused
+{%-1d: }
+
+message part_row_start_used
+{%-1d: %-10d %-10d %-10d}
+
+message part_row_end
+{ %s\n}
message setbiosgeom
{You will be prompted for the geometry. Please enter the values you
@@ -190,12 +202,28 @@
message onebiosmatch
{This disk matches the following BIOS disk:
-BIOS # cylinders heads sectors\n}
+}
+
+message onebiosmatch_header
+{BIOS # cylinders heads sectors
+------ ---------- ------- -------
+}
+
+message onebiosmatch_row
+{%-6x %-10d %-7d %d\n}
message biosmultmatch
{This disk matches the following BIOS disks:
- BIOS # cylinders heads sectors\n}
+}
+
+message biosmultmatch_header
+{ BIOS # cylinders heads sectors
+ ------ ---------- ------- -------
+}
+
+message biosmultmatch_row
+{%-1d: %-6x %-10d %-7d %d\n}
message pickdisk
{Choose disk: }
@@ -250,5 +278,10 @@
message bootseltimeoutval
{Timeout value in seconds (0-3600)}
-message bootselheader
-{Number Type Menu entry\n}
+message bootsel_header
+{Number Type Menu entry
+------ -------------------------------- ----------
+}
+
+message bootsel_row
+{%-6d %-32s %s\n}
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/i386/msg.md.fr
--- a/distrib/utils/sysinst/arch/i386/msg.md.fr Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/i386/msg.md.fr Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.10 1999/06/20 06:08:20 cgd Exp $ */
+/* $NetBSD: msg.md.fr,v 1.11 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -68,8 +68,20 @@
géom réelle: %d cylindres, %d têtes, %d secteurs
}
-message part_head
-{Part Début(%s) Taille(%s) Fin(%s) Type\n}
+/* the %s's will expand into three character strings */
+message part_header
+{ Début(%3s) Taille(%3s) Fin(%3s) Type
+ ---------- ----------- ---------- ----
+}
+
+message part_row_start_unused
+{%-1d: }
+
+message part_row_start_used
+{%-1d: %-10d %-11d %-10d}
+
+message part_row_end
+{ %s\n}
message setbiosgeom
{On va vous demander la géométrie. SVP entrer les valeur que vous désirez.
@@ -193,12 +205,28 @@
message onebiosmatch
{Ce disque correspond au disque du BIOS suivant:
-BIOS # cylinders heads sectors\n}
+}
+
+message onebiosmatch_header
+{BIOS # cylinders heads sectors
+------ ---------- ------- -------
+}
+
+message onebiosmatch_row
+{%-6x %-10d %-7d %-10d\n}
message biosmultmatch
{Ce disque correspond aux disques du BIOS suivants:
- BIOS # cylinders heads sectors\n}
+}
+
+message biosmultmatch_header
+{ BIOS # cylinders heads sectors
+ ------ ---------- ------- -------
+}
+
+message biosmultmatch_row
+{%-1d: %-6x %-10d %-7d %d\n}
message pickdisk
{Choisissez un disque: }
@@ -253,5 +281,10 @@
message bootseltimeoutval
{Temps d'attente en secondes (0-3600)}
-message bootselheader
-{Numéro Type Nom\n}
+message bootsel_header
+{Numéro Type Nom
+------ -------------------------------- ---
+}
+
+message bootsel_row
+{%-6d %-32s %s\n}
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/mac68k/md.c
--- a/distrib/utils/sysinst/arch/mac68k/md.c Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/md.c Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 1999/06/22 00:57:09 cgd Exp $ */
+/* $NetBSD: md.c,v 1.9 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -402,13 +402,13 @@
char name[64], use[16], fstyp[16];
EBZB *bzb;
- msg_display_add (MSG_part_head);
+ msg_display_add(MSG_part_header);
for (i=0;i<map.usable_cnt;i++) {
if (i == sel) msg_standout();
j = map.mblk[i];
part_type(j, fstyp, use, name);
bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
- msg_printf_add ("%s%c%12d%12d%8s%9s %s\n", diskdev,
+ msg_printf_add(MSG_part_row, diskdev,
bzb->flags.part, map.blk[j].pmPartBlkCnt,
map.blk[j].pmPyPartStart, fstyp, use, name);
if (i == sel) msg_standend();
diff -r e8891841a603 -r 2cff8c8f947e distrib/utils/sysinst/arch/mac68k/msg.md.en
--- a/distrib/utils/sysinst/arch/mac68k/msg.md.en Sun Jul 04 07:40:51 1999 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/msg.md.en Sun Jul 04 08:01:39 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.4 1999/06/20 06:42:07 cgd Exp $ */
+/* $NetBSD: msg.md.en,v 1.5 1999/07/04 08:01:40 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,8 +73,12 @@
Shall we continue?}
-message part_head
-{Part size offset fstype use mount point (name)\n}
+message part_header
+{Part size offset fstype use mount point (name)
+---- ---------- ---------- ------ --------- ------------------\n}
+
Home |
Main Index |
Thread Index |
Old Index