summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-17 16:54:44 +0000
committerDerek Jennings <djennings@mageia.org>2013-08-27 10:42:33 +0100
commitac6133db30e2df024a6bbed322ae20297310848d (patch)
treece253ab5b5845e1c0caab5a3106c0aebbd00ea1b
parentc19b9fdd2435af1b1161dbc881f1189a3c4554fc (diff)
downloaddrakwizard-ac6133db30e2df024a6bbed322ae20297310848d.tar
drakwizard-ac6133db30e2df024a6bbed322ae20297310848d.tar.gz
drakwizard-ac6133db30e2df024a6bbed322ae20297310848d.tar.bz2
drakwizard-ac6133db30e2df024a6bbed322ae20297310848d.tar.xz
drakwizard-ac6133db30e2df024a6bbed322ae20297310848d.zip
(get_dir) do not reinvent cat_or_die()
-rwxr-xr-xftp_wizard/Proftpd.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 7af7bbe6..e19c2b43 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -189,10 +189,7 @@ sub true {
sub get_dir {
die "no FTP configuration file found! warning." if !-f $file;
- local *NEW;
- open(NEW, "< $file") or die "error while opening $file: $!";
- local $_;
- while (<NEW>) { # we need 3 elements to consider section as known
+ foreach (cat_or_die($file)) { # we need 3 elements to consider section as known
if (m/^\s*<drakwizard>/s...m!^\s*</drakwizard>!s) {
if (m/^\s*<Anonymous\s*(.*)>/s) {
return $1;