OSSP CVS Repository

ossp - Check-in [3029]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3029
Date: 2002-Dec-23 10:09:40 (local)
2002-Dec-23 09:09:40 (UTC)
User:rse
Branch:
Comment: 1. Make sure that /bin:/usr/bin:/sbin:/usr/sbin is in $PATH when locating tool.

2. Correctly use the path in "Program uuencode <path>" when running uuencode.

Tickets:
Inspections:
Files:
ossp-pkg/shiela/ChangeLog      1.25 -> 1.26     8 inserted, 0 deleted
ossp-pkg/shiela/shiela.pl      1.38 -> 1.39     3 inserted, 3 deleted

ossp-pkg/shiela/ChangeLog 1.25 -> 1.26

--- ChangeLog    2002/12/23 09:05:47     1.25
+++ ChangeLog    2002/12/23 09:09:40     1.26
@@ -11,6 +11,14 @@
 
   Changes between 1.0.1 and 1.0.2 (22-Dec-2002 to xx-Dec-2002):
 
+   *) Make sure that /bin:/usr/bin:/sbin:/usr/sbin is in $PATH
+      when locating tool.
+      [Ralf S. Engelschall]
+
+   *) Correctly use the path in "Program uuencode <path>" when
+      running uuencode.
+      [Ralf S. Engelschall]
+
    *) Fixed typos in manual pages.
       [Ralf S. Engelschall]
 


ossp-pkg/shiela/shiela.pl 1.38 -> 1.39

--- shiela.pl    2002/12/23 08:52:22     1.38
+++ shiela.pl    2002/12/23 09:09:40     1.39
@@ -167,7 +167,7 @@
     sub find_program {
         my ($name) = @_;
         my ($prog) = '';
-        foreach my $dir (split(/:/, "$ENV{PATH}:/usr/local/lib:/usr/lib:/lib")) {
+        foreach my $dir (split(/:/, "$ENV{PATH}:/bin:/usr/bin:/sbin:/usr/sbin")) {
             if (-x "$dir/$name") {
                 $prog = "$dir/$name";
                 last;
@@ -1712,7 +1712,7 @@
                     $io->close;
                     system("$RT->{xdelta} delta $RT->{tmpfile}.null " .
                            "$RT->{tmpfile}.all $RT->{tmpfile}.xdelta >/dev/null 2>&1");
-                    $io = new IO::File "uuencode $RT->{tmpfile}.xdelta $Is.xdelta |"
+                    $io = new IO::File "$RT->{uuencode} $RT->{tmpfile}.xdelta $Is.xdelta |"
                         || die "unable to open uuencode command pipe for reading";
                     $cvsdiff .= $_ while (<$io>);
                     $io->close;
@@ -1811,7 +1811,7 @@
                     unlink("$RT->{tmpfile}.xdelta");
                     system("$RT->{xdelta} delta $RT->{tmpfile}.old " .
                            "$RT->{tmpfile}.new $RT->{tmpfile}.xdelta >/dev/null 2>&1");
-                    $io = new IO::File "uuencode $RT->{tmpfile}.xdelta $Is.xdelta |"
+                    $io = new IO::File "$RT->{uuencode} $RT->{tmpfile}.xdelta $Is.xdelta |"
                         || die "unable to open uuencode command pipe for reading";
                     $cvsdiff .= $_ while (<$io>);
                     $io->close;

CVSTrac 2.0.1