Subject: Re: sysinst prob
To: Patrick Welche <prlw1@newn.cam.ac.uk>
From: Julian Coleman <jdc@coris.demon.co.uk>
List: current-users
Date: 12/21/2000 21:27:53
> src/distrib/utils/sysinst.c:1.30 has
>
> puts(CL); /* XXX */
>
> and the XXX sure is correct, when compiling on i386:
Apologies - my fault - I changed libcurses to make these variables internal
- programs shouldn't really be accessing them.
I'm not completely sure what the code is trying to do here - it's directly
outputing the termcap `clear and home cursor sequence'. I /think/ it can
be done away with but maybe there needs to be a home cursor there. It seems
OK with the following diffs - I'll commit them shortly.
J
--
My other computer also runs NetBSD
http://www.netbsd.org/
---8<---------------------------- Cut here ---------------------------->8---
diff -ur /usr/src/distrib/utils/sysinst/arch/alpha/md.c ./arch/alpha/md.c
--- /usr/src/distrib/utils/sysinst/arch/alpha/md.c Thu Oct 19 11:09:44 2000
+++ ./arch/alpha/md.c Thu Dec 21 21:06:37 2000
@@ -339,7 +339,7 @@
endwin();
md_copy_filesystem ();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/amiga/md.c ./arch/amiga/md.c
--- /usr/src/distrib/utils/sysinst/arch/amiga/md.c Thu Oct 19 11:09:45 2000
+++ ./arch/amiga/md.c Thu Dec 21 21:06:53 2000
@@ -107,7 +107,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/arm32/md.c ./arch/arm32/md.c
--- /usr/src/distrib/utils/sysinst/arch/arm32/md.c Thu Oct 19 11:09:45 2000
+++ ./arch/arm32/md.c Thu Dec 21 21:06:57 2000
@@ -485,7 +485,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/bebox/md.c ./arch/bebox/md.c
--- /usr/src/distrib/utils/sysinst/arch/bebox/md.c Thu Oct 19 11:09:45 2000
+++ ./arch/bebox/md.c Thu Dec 21 21:07:03 2000
@@ -334,7 +334,7 @@
endwin();
md_copy_filesystem ();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/hpcmips/md.c ./arch/hpcmips/md.c
--- /usr/src/distrib/utils/sysinst/arch/hpcmips/md.c Thu Oct 19 11:09:46 2000
+++ ./arch/hpcmips/md.c Thu Dec 21 21:07:06 2000
@@ -462,7 +462,7 @@
md_copy_filesystem();
md_post_newfs();
md_upgrade_mbrtype();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/i386/md.c ./arch/i386/md.c
--- /usr/src/distrib/utils/sysinst/arch/i386/md.c Tue Nov 14 11:05:40 2000
+++ ./arch/i386/md.c Thu Dec 21 21:07:10 2000
@@ -396,7 +396,7 @@
md_copy_filesystem();
md_post_newfs();
md_upgrade_mbrtype();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/mac68k/md.c ./arch/mac68k/md.c
--- /usr/src/distrib/utils/sysinst/arch/mac68k/md.c Thu Oct 19 11:09:47 2000
+++ ./arch/mac68k/md.c Thu Dec 21 21:07:13 2000
@@ -856,7 +856,7 @@
endwin();
md_copy_filesystem ();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/macppc/md.c ./arch/macppc/md.c
--- /usr/src/distrib/utils/sysinst/arch/macppc/md.c Thu Oct 19 11:09:47 2000
+++ ./arch/macppc/md.c Thu Dec 21 21:07:19 2000
@@ -350,7 +350,7 @@
endwin();
md_copy_filesystem ();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/news68k/md.c ./arch/news68k/md.c
--- /usr/src/distrib/utils/sysinst/arch/news68k/md.c Thu Oct 19 11:09:49 2000
+++ ./arch/news68k/md.c Thu Dec 21 21:07:26 2000
@@ -350,7 +350,7 @@
endwin();
md_copy_filesystem ();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/pmax/md.c ./arch/pmax/md.c
--- /usr/src/distrib/utils/sysinst/arch/pmax/md.c Thu Oct 19 11:09:50 2000
+++ ./arch/pmax/md.c Thu Dec 21 21:07:33 2000
@@ -192,7 +192,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/sparc/md.c ./arch/sparc/md.c
--- /usr/src/distrib/utils/sysinst/arch/sparc/md.c Fri Nov 17 11:06:49 2000
+++ ./arch/sparc/md.c Thu Dec 21 21:07:54 2000
@@ -193,7 +193,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/sparc64/md.c ./arch/sparc64/md.c
--- /usr/src/distrib/utils/sysinst/arch/sparc64/md.c Thu Oct 19 11:09:51 2000
+++ ./arch/sparc64/md.c Thu Dec 21 21:07:55 2000
@@ -178,7 +178,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/vax/md.c ./arch/vax/md.c
--- /usr/src/distrib/utils/sysinst/arch/vax/md.c Thu Oct 19 11:09:51 2000
+++ ./arch/vax/md.c Thu Dec 21 21:07:57 2000
@@ -177,7 +177,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/arch/x68k/md.c ./arch/x68k/md.c
--- /usr/src/distrib/utils/sysinst/arch/x68k/md.c Thu Oct 19 11:09:51 2000
+++ ./arch/x68k/md.c Thu Dec 21 21:08:01 2000
@@ -305,7 +305,7 @@
endwin();
md_copy_filesystem();
md_post_newfs();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
return 1;
diff -ur /usr/src/distrib/utils/sysinst/install.c ./install.c
--- /usr/src/distrib/utils/sysinst/install.c Wed Nov 1 11:08:47 2000
+++ ./install.c Thu Dec 21 21:03:05 2000
@@ -127,7 +127,7 @@
msg_display(MSG_disksetupdone);
getchar();
- puts(CL); /* XXX */
+ wmove(stdscr,0, 0);
wclear(stdscr);
wrefresh(stdscr);
diff -ur /usr/src/distrib/utils/sysinst/net.c ./net.c
--- /usr/src/distrib/utils/sysinst/net.c Thu Oct 19 11:09:43 2000
+++ ./net.c Thu Dec 21 21:05:25 2000
@@ -744,7 +744,7 @@
/* Error getting the file. Bad host name ... ? */
msg_display(MSG_ftperror_cont);
getchar();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
touchwin(stdscr);
wclear(stdscr);
wrefresh(stdscr);
@@ -758,7 +758,7 @@
list++;
}
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
touchwin(stdscr);
wclear(stdscr);
wrefresh(stdscr);
diff -ur /usr/src/distrib/utils/sysinst/upgrade.c ./upgrade.c
--- /usr/src/distrib/utils/sysinst/upgrade.c Thu Oct 19 11:09:43 2000
+++ ./upgrade.c Thu Dec 21 21:04:04 2000
@@ -109,7 +109,7 @@
/* Done with disks. Ready to get and unpack tarballs. */
msg_display(MSG_disksetupdone);
getchar();
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);
@@ -266,7 +266,7 @@
return;
fflush(stdout);
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
touchwin(stdscr);
wclear(stdscr);
wrefresh(stdscr);
diff -ur /usr/src/distrib/utils/sysinst/util.c ./util.c
--- /usr/src/distrib/utils/sysinst/util.c Thu Oct 19 11:09:43 2000
+++ ./util.c Thu Dec 21 21:04:19 2000
@@ -530,7 +530,7 @@
}
}
- puts(CL); /* XXX */
+ wmove(stdscr, 0, 0);
wclear(stdscr);
wrefresh(stdscr);