OSSP CVS Repository

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

Check-in Number: 3325
Date: 2003-Apr-29 10:01:00 (local)
2003-Apr-29 08:01:00 (UTC)
User:rse
Branch:
Comment: Use "env -i /bin/ls" construct in "shtool rotate" and "shtool slo" commands to make sure we have a consistent output not adjusted by some environment variables like LANG, LS_COLORS, LS_OPTIONS, etc.

Hint by: Manuel Hendel <manuel@hendel.net>

Tickets:
Inspections:
Files:
ossp-pkg/shtool/ChangeLog      1.184 -> 1.185     6 inserted, 0 deleted
ossp-pkg/shtool/THANKS      1.28 -> 1.29     1 inserted, 0 deleted
ossp-pkg/shtool/sh.rotate      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/shtool/sh.slo      1.20 -> 1.21     1 inserted, 1 deleted

ossp-pkg/shtool/ChangeLog 1.184 -> 1.185

--- ChangeLog    2003/04/04 16:36:00     1.184
+++ ChangeLog    2003/04/29 08:01:00     1.185
@@ -11,6 +11,12 @@
 
  Changes between 1.6.2 and 2.0b0 (02-Nov-2002 to xx-Apr-2003):
 
+   *) Use "env -i /bin/ls" construct in "shtool rotate" and "shtool slo"
+      commands to make sure we have a consistent output not adjusted by
+      some environment variables like LANG, LS_COLORS, LS_OPTIONS, etc.
+      [Ralf S. Engelschall <rse@engelschall.com>,
+       Manuel Hendel <manuel@hendel.net>]
+
    *) Make sure "shtool rotate" does still correctly determine
       the size of a file if its filename contains whitespaces.
       [Ralf S. Engelschall <rse@engelschall.com>,


ossp-pkg/shtool/THANKS 1.28 -> 1.29

--- THANKS       2003/04/04 16:36:33     1.28
+++ THANKS       2003/04/29 08:01:00     1.29
@@ -21,6 +21,7 @@
   o Daniel Richard G.        <straker@MIT.EDU>
   o Dean Gaudet              <dgaudet@arctic.org>
   o Lars Hecking             <lhecking@nmrc.ucc.ie>
+  o Manuel Hendel            <manuel@hendel.net>
   o Jim Jagielski            <jim@jaguNET.com>
   o Martin Kraemer           <Martin.Kraemer@MchP.Siemens.De>
   o Thomas Linden            <tom@izb.net>


ossp-pkg/shtool/sh.rotate 1.6 -> 1.7

--- sh.rotate    2003/04/04 16:36:01     1.6
+++ sh.rotate    2003/04/29 08:01:01     1.7
@@ -182,7 +182,7 @@
     #   optionally take logfile size into account
     if [ ".$opt_s" != . ]; then
         #   determine size of logfile
-        set -- `/bin/ls -l "$ldir/$file" | sed -e "s;$ldir/$file;;" |\
+        set -- `env -i /bin/ls -l "$ldir/$file" | sed -e "s;$ldir/$file;;" |\
                 sed -e 's; -> .*$;;' -e 's;[    ][      ]*; ;g'`
         n=`expr $# - 3`
         eval "size=\`echo \${$n}\`"


ossp-pkg/shtool/sh.slo 1.20 -> 1.21

--- sh.slo       2003/04/04 16:36:01     1.20
+++ sh.slo       2003/04/29 08:01:01     1.21
@@ -91,7 +91,7 @@
 
         #    search the file
         OIFS3="$IFS"; IFS="$DIFS"
-        for file in '' `cd $dir && /bin/ls lib${lib}.* 2>/dev/null`; do
+        for file in '' `cd $dir && env -i /bin/ls lib${lib}.* 2>/dev/null`; do
              [ ".$file" = . ] && continue
              case $file in
                  *.so|*.so.[0-9]*|*.sl|*.sl.[0-9]* )

CVSTrac 2.0.1