r160 - trunk

[Laurent Fousse]

Author: lfousse
Date: 2005-01-05 11:16:17 +0100 (Wed, 05 Jan 2005)
New Revision: 160

Modified:
   trunk/ca-createsendout
   trunk/ca-dosign
   trunk/ca-recv
   trunk/ca-sendout
Log:
Remove 4 UUOC, closes: #285866.


Modified: trunk/ca-createsendout
===================================================================
--- trunk/ca-createsendout	2005-01-05 10:02:53 UTC (rev 159)
+++ trunk/ca-createsendout	2005-01-05 10:16:17 UTC (rev 160)
@@ -29,7 +29,15 @@
 
 my $config = $ENV{'HOME'} . '/.cabotrc';
 -f $config or die "No file $config present.  See ca-config(5).\n";
-unless (scalar eval `cat $config`) {
+my $confblurb = '';
+open CONFIG, $config;
+{
+    local $/;
+    $confblurb = <CONFIG>;
+}
+close CONFIG;
+
+unless (scalar eval $confblurb) {
 	die "Couldn't parse $config: $EVAL_ERROR\n" if $EVAL_ERROR
 };
 

Modified: trunk/ca-dosign
===================================================================
--- trunk/ca-dosign	2005-01-05 10:02:53 UTC (rev 159)
+++ trunk/ca-dosign	2005-01-05 10:16:17 UTC (rev 160)
@@ -31,7 +31,15 @@
 
 my $config = $ENV{'HOME'} . '/.cabotrc';
 -f $config or die "No file $config present.  See ca-config(5).\n";
-unless (scalar eval `cat $config`) {
+my $confblurb = '';
+open CONFIG, $config;
+{
+    local $/;
+    $confblurb = <CONFIG>;
+}
+close CONFIG;
+
+unless (scalar eval $confblurb) {
         die "Couldn't parse $_: $@.\n" if $@;
 };
 

Modified: trunk/ca-recv
===================================================================
--- trunk/ca-recv	2005-01-05 10:02:53 UTC (rev 159)
+++ trunk/ca-recv	2005-01-05 10:16:17 UTC (rev 160)
@@ -29,7 +29,15 @@
 
 my $config = $ENV{'HOME'} . '/.cabotrc';
 -f $config or die "No file $config present.  See ca-config(5).\n";
-unless (scalar eval `cat $config`) {
+my $confblurb = '';
+open CONFIG, $config;
+{
+    local $/;
+    $confblurb = <CONFIG>;
+}
+close CONFIG;
+
+unless (scalar eval $confblurb) {
         die "Couldn't parse $_: $@.\n" if $@;
 };
 

Modified: trunk/ca-sendout
===================================================================
--- trunk/ca-sendout	2005-01-05 10:02:53 UTC (rev 159)
+++ trunk/ca-sendout	2005-01-05 10:16:17 UTC (rev 160)
@@ -29,7 +29,15 @@
 
 my $config = $ENV{'HOME'} . '/.cabotrc';
 -f $config or die "No file $config present.  See ca-config(5).\n";
-unless (scalar eval `cat $config`) {
+my $confblurb = '';
+open CONFIG, $config;
+{
+    local $/;
+    $confblurb = <CONFIG>;
+}
+close CONFIG;
+
+unless (scalar eval $confblurb) {
         die "Couldn't parse $_: $@.\n" if $@;
 };