Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't output the termcap `cl' sequence. 

XXX: do we really need to home the cursor here?
XXX: should we do clearok() instead or in addition?
This commit is contained in:
jdc 2000-12-21 21:42:00 +00:00
parent f363b73f87
commit dab8e56b56
18 changed files with 44 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/utils/sysinst/arch/alpha/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.22 2000/10/11 23:47:57 fvdl Exp $ */ /* $NetBSD: md.c,v 1.23 2000/12/21 21:42:00 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -339,7 +339,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem (); md_copy_filesystem ();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/amiga/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.4 2000/10/11 23:47:58 fvdl Exp $ */ /* $NetBSD: md.c,v 1.5 2000/12/21 21:42:00 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -107,7 +107,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/arm32/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.26 2000/10/11 23:47:58 fvdl Exp $ */ /* $NetBSD: md.c,v 1.27 2000/12/21 21:42:00 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -485,7 +485,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/bebox/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.18 2000/10/11 23:47:58 fvdl Exp $ */ /* $NetBSD: md.c,v 1.19 2000/12/21 21:42:00 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -334,7 +334,7 @@ md_update (void)
endwin(); endwin();
md_copy_filesystem (); md_copy_filesystem ();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/hpcmips/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.7 2000/10/11 23:47:58 fvdl Exp $ */ /* $NetBSD: md.c,v 1.8 2000/12/21 21:42:01 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -462,7 +462,7 @@ md_update(void)
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
md_upgrade_mbrtype(); md_upgrade_mbrtype();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/i386/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.48 2000/11/12 15:28:48 fvdl Exp $ */ /* $NetBSD: md.c,v 1.49 2000/12/21 21:42:01 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -396,7 +396,7 @@ md_update(void)
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
md_upgrade_mbrtype(); md_upgrade_mbrtype();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/mac68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.15 2000/10/11 23:47:59 fvdl Exp $ */ /* $NetBSD: md.c,v 1.16 2000/12/21 21:42:01 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -856,7 +856,7 @@ md_update (void)
endwin(); endwin();
md_copy_filesystem (); md_copy_filesystem ();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/macppc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.17 2000/10/11 23:47:59 fvdl Exp $ */ /* $NetBSD: md.c,v 1.18 2000/12/21 21:42:01 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -350,7 +350,7 @@ md_update()
endwin(); endwin();
md_copy_filesystem (); md_copy_filesystem ();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/news68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.5 2000/10/11 23:47:59 fvdl Exp $ */ /* $NetBSD: md.c,v 1.6 2000/12/21 21:42:01 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -350,7 +350,7 @@ md_update()
endwin(); endwin();
md_copy_filesystem (); md_copy_filesystem ();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/pmax/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.41 2000/10/11 23:48:00 fvdl Exp $ */ /* $NetBSD: md.c,v 1.42 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -192,7 +192,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/sparc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.22 2000/11/16 15:02:46 abs Exp $ */ /* $NetBSD: md.c,v 1.23 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -193,7 +193,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/sparc64/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.4 2000/10/11 23:48:00 fvdl Exp $ */ /* $NetBSD: md.c,v 1.5 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -178,7 +178,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

4
distrib/utils/sysinst/arch/vax/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.13 2000/10/11 23:48:01 fvdl Exp $ */ /* $NetBSD: md.c,v 1.14 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -177,7 +177,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;

11
distrib/utils/sysinst/arch/x68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.11 2000/10/25 14:48:35 minoura Exp $ */ /* $NetBSD: md.c,v 1.12 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -224,9 +224,6 @@ md_pre_disklabel(void)
int int
md_post_disklabel(void) md_post_disklabel(void)
{ {
if (rammb < 6)
set_swap(diskdev, bsdlabel, 1);
return 0; return 0;
} }
@ -308,7 +305,7 @@ md_update(void)
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
return 1; return 1;
@ -317,7 +314,7 @@ md_update(void)
void void
md_cleanup_install(void) md_cleanup_install(void)
{ {
#ifdef notyet /* sed is too large for ramdisk */ #if notyet /* sed is too large for ramdisk */
char realfrom[STRSIZE]; char realfrom[STRSIZE];
char realto[STRSIZE]; char realto[STRSIZE];
char sedcmd[STRSIZE]; char sedcmd[STRSIZE];
@ -343,8 +340,6 @@ md_cleanup_install(void)
int int
md_pre_update() md_pre_update()
{ {
if (rammb < 6)
set_swap(diskdev, NULL, 1);
return 1; return 1;
} }

4
distrib/utils/sysinst/install.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: install.c,v 1.24 2000/10/22 22:57:04 fvdl Exp $ */ /* $NetBSD: install.c,v 1.25 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -127,7 +127,7 @@ do_install()
msg_display(MSG_disksetupdone); msg_display(MSG_disksetupdone);
getchar(); getchar();
puts(CL); /* XXX */ wmove(stdscr,0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);

25
distrib/utils/sysinst/net.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: net.c,v 1.65 2000/12/17 22:55:53 jmc Exp $ */ /* $NetBSD: net.c,v 1.66 2000/12/21 21:42:02 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -744,7 +744,7 @@ get_via_ftp()
/* Error getting the file. Bad host name ... ? */ /* Error getting the file. Bad host name ... ? */
msg_display(MSG_ftperror_cont); msg_display(MSG_ftperror_cont);
getchar(); getchar();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
touchwin(stdscr); touchwin(stdscr);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
@ -758,7 +758,7 @@ get_via_ftp()
list++; list++;
} }
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
touchwin(stdscr); touchwin(stdscr);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
@ -856,8 +856,6 @@ mnt_net_config(void)
{ {
char ans [5] = "y"; char ans [5] = "y";
char ifconfig_fn [STRSIZE]; char ifconfig_fn [STRSIZE];
char to [STRSIZE];
char cmd [STRSIZE];
FILE *f; FILE *f;
if (!network_up) if (!network_up)
@ -942,21 +940,8 @@ mnt_net_config(void)
} }
fclose(f); fclose(f);
} }
} else { }
strncpy(to, target_expand("/etc/rc.conf"), STRSIZE);
sprintf(cmd, "echo dhclient=YES >> %s", to);
if (logging)
(void)fprintf(log, "%s\n", cmd);
if (scripting)
(void)fprintf(script, "%s\n", cmd);
do_system(cmd);
sprintf(cmd, "echo dhclient_flags=\"%s\" >> %s", net_dev, to);
if (logging)
(void)fprintf(log, "%s\n", cmd);
if (scripting)
(void)fprintf(script, "%s\n", cmd);
do_system(cmd);
}
fflush(NULL); fflush(NULL);
} }

10
distrib/utils/sysinst/upgrade.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: upgrade.c,v 1.26 2000/12/18 09:18:46 hubertf Exp $ */ /* $NetBSD: upgrade.c,v 1.27 2000/12/21 21:42:03 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -107,9 +107,9 @@ do_upgrade()
return; return;
/* Done with disks. Ready to get and unpack tarballs. */ /* Done with disks. Ready to get and unpack tarballs. */
msg_display(MSG_disksetupdoneupdate); msg_display(MSG_disksetupdone);
getchar(); getchar();
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
@ -239,7 +239,7 @@ merge_X()
} }
/* /*
* Unpacks sets, clobbering existing contents. * Unpacks sets, clobbering existintg contents.
*/ */
void void
do_reinstall_sets() do_reinstall_sets()
@ -266,7 +266,7 @@ do_reinstall_sets()
return; return;
fflush(stdout); fflush(stdout);
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
touchwin(stdscr); touchwin(stdscr);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);

10
distrib/utils/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.59 2000/12/18 09:39:50 hubertf Exp $ */ /* $NetBSD: util.c,v 1.60 2000/12/21 21:42:03 jdc Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -109,9 +109,6 @@ distribution_sets_exist_p(path)
snprintf(buf, STRSIZE, "%s/%s", path, "etc.tgz"); snprintf(buf, STRSIZE, "%s/%s", path, "etc.tgz");
result = result && file_exists_p(buf); result = result && file_exists_p(buf);
snprintf(buf, STRSIZE, "%s/%s", path, "base.tgz");
result = result && file_exists_p(buf);
return(result); return(result);
} }
@ -533,7 +530,7 @@ extract_dist()
} }
} }
puts(CL); /* XXX */ wmove(stdscr, 0, 0);
wclear(stdscr); wclear(stdscr);
wrefresh(stdscr); wrefresh(stdscr);
@ -557,7 +554,7 @@ extract_dist()
* files to kill from the target. For each file, test if it is present on * files to kill from the target. For each file, test if it is present on
* the target. Then display the list of files which will be removed, * the target. Then display the list of files which will be removed,
* ask user for confirmation, and process. * ask user for confirmation, and process.
* Non-empty directories will be renamed to <directory.old>. * Non-empty directories will be renaned to <directory.old>.
*/ */
/* definition for a list of files. */ /* definition for a list of files. */
@ -636,7 +633,6 @@ cleanup_dist(name)
fprintf(log, "Adding file %s, type %d to list of " fprintf(log, "Adding file %s, type %d to list of "
"obsolete file\n", current->name, current->type); "obsolete file\n", current->name, current->type);
} }
fclose(list_file);
if (head == NULL) if (head == NULL)
return 1; return 1;
#if 0 #if 0