From: Eric Wong <e@80x24.org>
To: dtas-all@nongnu.org
Subject: [PATCH] do not shell-quote filenames for environment
Date: Tue, 25 May 2021 10:30:05 +0000 [thread overview]
Message-ID: <20210525103005.17234-1-e@80x24.org> (raw)
This allows dtas-player to play files with wonky filenames
when piping ffmpeg (or avconv) to sox. SoX-only code
dtas-player paths are not affected since they don't require
an extra Bourne shell.
All of our internal shell pipelines quote "$INFILE",
anyways, so there was never any need to escape for those.
This may cause compatibility problems for splitfx users, but
splitfx is probably too esoteric to have any users besides
myself. And I expect anybody editing audio with dtas-splitfx to
pick shell-friendly filenames.
dtas-player is far more general, and likely to encounter
shell-unfriendly filenames which require quoting.
---
lib/dtas/partstats.rb | 3 +--
lib/dtas/source/av_ff_common.rb | 2 +-
lib/dtas/source/sox.rb | 2 +-
lib/dtas/splitfx.rb | 8 +++-----
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/dtas/partstats.rb b/lib/dtas/partstats.rb
index 75f9236..45eff34 100644
--- a/lib/dtas/partstats.rb
+++ b/lib/dtas/partstats.rb
@@ -3,7 +3,6 @@
# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
# frozen_string_literal: true
require_relative '../dtas'
-require_relative 'xs'
require_relative 'process'
require_relative 'sigevent'
@@ -56,7 +55,7 @@ def partstats_spawn(trim_part, opts)
rd, wr = IO.pipe
env = opts[:env]
env = env ? env.dup : {}
- env["INFILE"] = xs(@infile)
+ env["INFILE"] = @infile
env["TRIMFX"] = "trim #{trim_part.tbeg}s #{trim_part.tlen}s"
opts = { pgroup: true, close_others: true, err: wr }
pid = spawn(env, CMD, opts)
diff --git a/lib/dtas/source/av_ff_common.rb b/lib/dtas/source/av_ff_common.rb
index 88bfe50..6f92762 100644
--- a/lib/dtas/source/av_ff_common.rb
+++ b/lib/dtas/source/av_ff_common.rb
@@ -186,7 +186,7 @@ def src_spawn(player_format, rg_state, opts)
e["PROBE"] = @probe_harder ? @probe_harder.join(' ') : nil
# make sure these are visible to the source command...
- e["INFILE"] = xs(@infile)
+ e["INFILE"] = @infile
e["AMAP"] = amap
e["SSPOS"] = sspos
e["RGFX"] = rg_state.effect(self) || nil
diff --git a/lib/dtas/source/sox.rb b/lib/dtas/source/sox.rb
index d63f0df..3a7fe7d 100644
--- a/lib/dtas/source/sox.rb
+++ b/lib/dtas/source/sox.rb
@@ -113,7 +113,7 @@ def __load_comments
def src_spawn(player_format, rg_state, opts)
raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io
e = @env.merge!(player_format.to_env)
- e["INFILE"] = xs(@infile)
+ e["INFILE"] = @infile
# make sure these are visible to the "current" command...
e["TRIMFX"] = trimfx
diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb
index 58c8ff4..9e1cfd0 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -4,7 +4,6 @@
require_relative '../dtas'
require_relative 'format'
require_relative 'process'
-require_relative 'xs'
require 'tempfile'
# The backend for dtas-splitfx(1) command, but also supported by dtas-player
@@ -13,7 +12,6 @@
class DTAS::SplitFX # :nodoc:
CMD = 'sox "$INFILE" $COMMENTS $OUTFMT $OUTDST $TRIMFX $FX $RATEFX $DITHERFX'
include DTAS::Process
- include DTAS::XS
attr_reader :infile, :env, :command
# for --trim on the command-line
@@ -404,10 +402,10 @@ def cuebreakpoints
end
def infile_env(env, infile)
- env["INFILE"] = xs(infile)
+ env["INFILE"] = infile
dir, base = File.split(File.expand_path(infile))
- env["INDIR"] = xs(dir)
- env["INBASE"] = xs(base)
+ env["INDIR"] = dir
+ env["INBASE"] = base
end
def expand_cmd(env, command) # for display purposes only
reply other threads:[~2021-05-25 10:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://80x24.org/dtas/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210525103005.17234-1-e@80x24.org \
--to=e@80x24.org \
--cc=dtas-all@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).