From 9ecdd7859a7c4fb20a4610d65132e59461241920 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Nov 2002 12:46:13 +0000
Subject: fix "ps" and "df" (were broken due to localization of *DF and *PS)

---
 perl-install/commands.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 4d562a7ca..9d45e58a7 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -10,7 +10,7 @@ package commands; # $Id$
 
 use diagnostics;
 use strict;
-use vars qw($printable_chars *ROUTE);
+use vars qw($printable_chars *ROUTE *DF *PS);
 
 #-######################################################################################
 #- misc imports
@@ -237,8 +237,7 @@ sub ps {
     require c;
     my $page = c::getpagesize() / 1024;
 
-    local *PS;
-    open PS, ">&STDOUT";
+    open PS, ">&STDOUT"; #- PS must be not be localised otherwise the "format PS" fails
     format PS_TOP =
   PID   RSS %CPU CMD
 .
@@ -451,8 +450,7 @@ $l{Destination}, $l{Gateway}, $l{Mask}, $l{Iface}
 sub df {
     my ($h) = getopts(\@_, qw(h));
     my ($dev, $size, $free, $used, $use, $mntpoint);
-    local *DF;
-    open DF, ">&STDOUT";
+    open DF, ">&STDOUT"; #- DF must be not be localised otherwise the "format DF" fails
     format DF_TOP =
 Filesystem          Size      Used    Avail     Use  Mounted on
 .
-- 
cgit v1.2.1