[src/netbsd-1-6]: src/distrib/utils/sysinst Pull back up changes from 1.81 to...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4af7404ca016
branches:  netbsd-1-6
changeset: 530900:4af7404ca016
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Oct 20 06:01:25 2003 +0000

description:
Pull back up changes from 1.81 to enable the progress bar. (ticket #1167)

diffstat:

 distrib/utils/sysinst/util.c |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 0efbb0cecf39 -r 4af7404ca016 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Mon Oct 20 05:26:11 2003 +0000
+++ b/distrib/utils/sysinst/util.c      Mon Oct 20 06:01:25 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.67.2.11 2003/02/14 02:52:21 jmc Exp $       */
+/*     $NetBSD: util.c,v 1.67.2.12 2003/10/20 06:01:25 jmc Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -437,7 +437,7 @@
 
        if (verbose < 0) {
                msg_display(MSG_verboseextract);
-               process_menu(MENU_noyes);
+               process_menu(MENU_extract);
                verbose = yesno;
                wclear(stdscr);
                wrefresh(stdscr);
@@ -467,8 +467,15 @@
        target_chdir_or_die("/");       
 
        /* now extract set files files into "./". */
-       tarexit = run_prog(RUN_DISPLAY, NULL,
-           "pax -zr%spe -O -f %s", verbose ? "v" : "", path);
+       if (verbose==1)
+         tarexit = run_prog(RUN_DISPLAY, NULL,
+           "progress -zf %s pax -rpe -O", path);
+       else if (verbose==2)
+         tarexit = run_prog(RUN_DISPLAY, NULL,
+           "pax -zrvpe -f %s -O", path);
+       else
+         tarexit = run_prog(RUN_DISPLAY, NULL,
+           "pax -zrpe -f %s -O", path);
 
        /* Check tarexit for errors and give warning. */
        if (tarexit) {