Bug#496381: Patch to fix this issue

[Vincent Bernat]

tags 496381 + patch
thanks

Hi!

Here is a patch to fix this issue.


diff --git a/plait b/plait
index da29326..4631565 100755
--- a/plait
+++ b/plait
@@ -498,16 +498,18 @@ querystream ()
 
   if test $ORDER = "random"
   then
+    tmpfile="$(mktemp)"
     cat "$HOME/.plait/playlist.m3u" | awk 'BEGIN{srand()} {print rand() "\t" $0}' | \
-      sort -n | cut -f "2-" > /tmp/cut.$$
-    mv /tmp/cut.$$ "$HOME/.plait/playlist.m3u"
+      sort -n | cut -f "2-" > "$tmpfile"
+    mv "$tmpfile" "$HOME/.plait/playlist.m3u"
   fi
 
   # trim the playlist if it has not been edited interactively
   if test $INTERACTIVE = 0
   then
-    head -n $TRACKS > /tmp/head.$$ "$HOME/.plait/playlist.m3u"
-    mv /tmp/head.$$ "$HOME/.plait/playlist.m3u"
+    tmpfile="$(mktemp)"
+    head -n $TRACKS > "$tmpfile" "$HOME/.plait/playlist.m3u"
+    mv "$tmpfile" "$HOME/.plait/playlist.m3u"
   fi
 }
 
@@ -552,10 +554,11 @@ translate_to_windows_file_paths_old ()
   root="`head -n 1 \"$HOME/.plait/playlist.m3u\" | awk \
     '{match($0, "/*[^/]*/[^/]*/"); print substr($0, RSTART, RLENGTH)}'`"
   root="`cygpath -am $root`"
-  cat "$HOME/.plait/playlist.m3u" | awk > /tmp/awk.$$ -v r="$root" \
+  tmpfile="$(mktemp)"
+  cat "$HOME/.plait/playlist.m3u" | awk > "$tmpfile" -v r="$root" \
     'BEGIN { if (r !~ /\/$/) r = r "/"; gsub (/\//, "\\", r) } \
      { s = $0; sub ("^/*[^/]*/[^/]*/", "", s); gsub (/\//, "\\", s); print r s}'
-  mv /tmp/awk.$$ "$HOME/.plait/playlist2.m3u"
+  mv "$tmpfile" "$HOME/.plait/playlist2.m3u"
 }
 
 
@@ -566,10 +569,11 @@ translate_to_windows_file_paths ()
     cat "$HOME/.plait/playlist.m3u" | xargs > "$HOME/.plait/playlist2.m3u" -i cygpath -am "{}"
   else
     root="`cygpath -am \"$MUSICDIR\"`"
-    cat "$HOME/.plait/playlist.m3u" | awk > /tmp/awk.$$ -v r="$root" -v d="$MUSICDIR" \
+    tmpfile="$(mktemp)"
+    cat "$HOME/.plait/playlist.m3u" | awk > "$tmpfile" -v r="$root" -v d="$MUSICDIR" \
       'BEGIN {if (r !~ /\/$/) r = r "/"; gsub (/\//, "\\", r)} \
        {s = $0; sub (d "/", "", s); gsub (/\//, "\\", s); print r s}'
-    mv /tmp/awk.$$ "$HOME/.plait/playlist2.m3u"
+    mv "$tmpfile" "$HOME/.plait/playlist2.m3u"
   fi
 }
 
diff --git a/plaiter b/plaiter
index 9fcef12..d548362 100755
--- a/plaiter
+++ b/plaiter
@@ -237,8 +237,9 @@ handle_interrupt ()
     tries=0
     while true
     do
-      ps -p $playerpid > /tmp/ps.$$
-      foo=`grep "$HELPERNAME" /tmp/ps.$$`
+      tmpfile="$(mktemp)"
+      ps -p $playerpid > "$tmpfile"
+      foo=`grep "$HELPERNAME" "$tmpfile"`
       if test "-$foo-" = "--"
       then
         if test $VERBOSE -gt 0
@@ -670,9 +671,10 @@ controller_mode ()
   # possibly shuffle the playlist
   if test $ORDER = "random"
   then
+    tmpfile="$(mktemp)"
     cat "$HOME/.plait/plaiter0.m3u" | awk 'BEGIN{srand()} {print rand() "\t" $0}' | \
-      sort -n | cut -f "2-" > /tmp/cut.$$
-    mv /tmp/cut.$$ "$HOME/.plait/plaiter0.m3u"
+      sort -n | cut -f "2-" > "$tmpfile"
+    mv "$tmpfile" "$HOME/.plait/plaiter0.m3u"
   fi
 
   cat "$HOME/.plait/plaiter0.m3u" >> "$HOME/.plait/plaiter.m3u"

-- 
No fortunes found