Attachment 39274 Details for Bug 86168

[patch] shtool.gen.diff

shtool.gen.diff (text/plain), 3.38 KB, created by Thomas Biege on 2005-06-15 14:03:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-06-15 14:03:06 UTC

Size: 3.38 KB

patch

obsolete

>Index: shtool
>--- shtool	23 Mar 2005 12:59:15 -0000
>+++ shtool	15 Jun 2005 11:28:07 -0000
>@@ -571,6 +571,7 @@
> 
> #   establish a temporary file on request
> if [ ".$gen_tmpfile" = .yes ]; then
>+    #   create (explicitly) secure temporary directory
>     if [ ".$TMPDIR" != . ]; then
>         tmpdir="$TMPDIR"
>     elif [ ".$TEMPDIR" != . ]; then
>@@ -578,10 +579,19 @@
>     else
>         tmpdir="/tmp"
>     fi
>-    tmpfile="$tmpdir/.shtool.$$"
>-    rm -f $tmpfile >/dev/null 2>&1
>-    touch $tmpfile
>-    chmod 600 $tmpfile
>+    tmpdir="$tmpdir/.shtool.$$"
>+    ( umask 077
>+      rm -rf "$tmpdir" >/dev/null 2>&1 || true
>+      mkdir  "$tmpdir" >/dev/null 2>&1
>+      if [ $? -ne 0 ]; then
>+          echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2
>+          exit 1
>+      fi
>+    )
>+
>+    #   create (implicitly) secure temporary file
>+    tmpfile="$tmpdir/shtool.tmp"
>+    touch "$tmpfile"
> fi
> 
> #   utility function: map string to lower case
>@@ -598,7 +608,7 @@
> shtool_exit () {
>     rc="$1"
>     if [ ".$gen_tmpfile" = .yes ]; then
>-        rm -f $tmpfile >/dev/null 2>&1 || true
>+        rm -rf "$tmpdir" >/dev/null 2>&1 || true
>     fi
>     exit $rc
> }
>@@ -3057,7 +3071,7 @@
>     files="$*"
> 
>     #   walk through the file list and expand archives members
>-    tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
>+    ar_tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
>     nfiles=''
>     if [ ".$files" != . ]; then
>         for file in $files; do
>@@ -3067,13 +3081,13 @@
>             fi
>             case $file in
>                 *.a )
>-                    if [ ! -d $tmpdir ]; then
>+                    if [ ! -d $ar_tmpdir ]; then
>                         if [ ".$opt_t" = .yes ]; then
>-                            echo "mkdir $tmpdir" 1>&2
>+                            echo "mkdir $ar_tmpdir" 1>&2
>                         fi
>-                        mkdir $tmpdir
>+                        mkdir $ar_tmpdir
>                     fi
>-                    case $tmpdir in
>+                    case $ar_tmpdir in
>                          .arx )
>                              from="../$file"
>                              ;;
>@@ -3084,16 +3098,16 @@
>                              ;;
>                     esac
>                     if [ ".$opt_t" = .yes ]; then
>-                        echo "(cd $tmpdir && $ar_prg x $from)" 1>&2
>+                        echo "(cd $ar_tmpdir && $ar_prg x $from)" 1>&2
>                     fi
>-                    (cd $tmpdir && eval $ar_prg x $from)
>+                    (cd $ar_tmpdir && eval $ar_prg x $from)
>                     if [ $? -ne 0 ]; then
>                         echo "$msgprefix:Error: member extraction failed for archive: $file" 1>&2
>                         shtool_exit 1
>                     fi
>                     for member in - `eval $ar_prg t $file | sed -e '/_\.SYMDEF/d'`; do
>                         [ ".$member" = .- ] && continue
>-                        nfiles="$nfiles $tmpdir/$member"
>+                        nfiles="$nfiles $ar_tmpdir/$member"
>                     done
>                     ;;
>                 * )
>@@ -3114,11 +3128,11 @@
>     fi
> 
>     #   cleanup and die gracefully
>-    if [ -d $tmpdir ]; then
>+    if [ -d $ar_tmpdir ]; then
>         if [ ".$opt_t" = .yes ]; then
>-            echo "rm -rf $tmpdir" 1>&2
>+            echo "rm -rf $ar_tmpdir" 1>&2
>         fi
>-        rm -rf $tmpdir
>+        rm -rf $ar_tmpdir
>     fi
> 
>     shtool_exit 0

Actions: View | Diff

Attachments on bug 86168: 38239 | 39274 | 39275