From e15766c491dd49883d35ae3a5fd795189c0b7e43 Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 4 Nov 1994 21:38:37 +0000 Subject: [PATCH] Fix a potential bug in stage2. disable the dialog_msgbox in TellEm(), until we find out why it hangs on second or third invocation. --- sbin/sysinstall/stage2.c | 3 ++- sbin/sysinstall/utils.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sbin/sysinstall/stage2.c b/sbin/sysinstall/stage2.c index 52b8d6aef63d..bfc1c6832b56 100644 --- a/sbin/sysinstall/stage2.c +++ b/sbin/sysinstall/stage2.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: stage2.c,v 1.10 1994/11/02 06:19:46 jkh Exp $ + * $Id: stage2.c,v 1.11 1994/11/02 11:00:35 jkh Exp $ * */ @@ -41,6 +41,7 @@ stage2() for (i = 1; Fname[i]; i++) Fsize[i] = i; + Fsize[i] = 0; for (j = 1; j;) for (j = 0, i = 1; Fsize[i+1]; i++) { diff --git a/sbin/sysinstall/utils.c b/sbin/sysinstall/utils.c index b3a09e94519a..ac2fe2d91de1 100644 --- a/sbin/sysinstall/utils.c +++ b/sbin/sysinstall/utils.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: utils.c,v 1.19 1994/11/02 22:06:24 phk Exp $ + * $Id: utils.c,v 1.20 1994/11/03 00:28:05 ache Exp $ * */ @@ -92,7 +92,9 @@ TellEm(char *fmt, ...) write(debug_fd,"Progress <",10); write(debug_fd,p,strlen(p)); write(debug_fd,">\n\r",3); +/* XXX This is broken just now, on second or third call it will hang dialog_msgbox("Progress", p, strheight(p)+2, strwidth(p)+4, 0); +*/ free(p); }