[xiph-cvs] cvs commit: BlueberryArmageddon blueberry_armageddon

[Monty]

xiphmont    02/04/10 23:29:38

  Modified:    .        blueberry_armageddon
  Log:
  escaping fix

Revision  Changes    Path
1.4       +8 -5      BlueberryArmageddon/blueberry_armageddon

Index: blueberry_armageddon
===================================================================
RCS file: /usr/local/cvsroot/BlueberryArmageddon/blueberry_armageddon,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blueberry_armageddon	2002/04/01 20:32:27	1.3
+++ blueberry_armageddon	2002/04/11 06:29:38	1.4
@@ -626,13 +626,12 @@
             print STDERR "moving $outfile to $trackname\n";
             unlink $wavfile;
 
-	    $trackname=~s/\"/\\\"/g;
-	    die "could not move file!: $!" if `mv "$outfile" "$trackname"`;
-
             # add to unfiled list
-	    $trackname.='\n';
-	    `echo "$trackname" >> $unfiled;`;
+	    `echo "$trackname\n" >> $unfiled;`;
 
+	    $trackname=~s/([\"\$\`\\])/\\$1/g;
+	    die "could not move file!: $!" if `mv "$outfile" "$trackname"`;
+
             # unclick the rip button
             Recheck();
 
@@ -655,6 +654,10 @@
             $metaalbum=$album;
             $wavfile="/tmp/$$.wav";
             $outfile="/tmp/$$.ogg";
+
+	    $metatitle=~s/([\"\$\`\\])/\\$1/g;
+	    $metaartist=~s/([\"\$\`\\])/\\$1/g;
+	    $metaalbum=~s/([\"\$\`\\])/\\$1/g;
 
             $metatitle=~s/\"/\\\"/g;
             $metaartist=~s/\"/\\\"/g;

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.