* [PATCH 2/3] escape INFILE and related environment variables
2015-04-13 1:04 5% [PATCH 0/3] filename escaping fixups Eric Wong
@ 2015-04-13 1:04 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-04-13 1:04 UTC (permalink / raw)
To: dtas-all
We may expand them, so ensure they're properly escaped, first
for use in shell snippets.
---
lib/dtas/partstats.rb | 2 +-
lib/dtas/source/av_ff_common.rb | 2 +-
lib/dtas/source/sox.rb | 2 +-
lib/dtas/splitfx.rb | 6 ++++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/dtas/partstats.rb b/lib/dtas/partstats.rb
index 9d3312b..bc13480 100644
--- a/lib/dtas/partstats.rb
+++ b/lib/dtas/partstats.rb
@@ -55,7 +55,7 @@ class DTAS::PartStats
rd, wr = IO.pipe
env = opts[:env]
env = env ? env.dup : {}
- env["INFILE"] = @infile
+ env["INFILE"] = xs(@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 189e135..9f29b02 100644
--- a/lib/dtas/source/av_ff_common.rb
+++ b/lib/dtas/source/av_ff_common.rb
@@ -158,7 +158,7 @@ module DTAS::Source::AvFfCommon # :nodoc:
e["PROBE"] = @probe_harder ? @probe_harder.join(' ') : nil
# make sure these are visible to the source command...
- e["INFILE"] = @infile
+ e["INFILE"] = xs(@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 91a3c40..6f02f99 100644
--- a/lib/dtas/source/sox.rb
+++ b/lib/dtas/source/sox.rb
@@ -78,7 +78,7 @@ class DTAS::Source::Sox # :nodoc:
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"] = @infile
+ e["INFILE"] = xs(@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 022fbfe..fcd0028 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -362,8 +362,10 @@ class DTAS::SplitFX # :nodoc:
end
def infile_env(env, infile)
- env["INFILE"] = infile
- env["INDIR"], env["INBASE"] = File.split(File.expand_path(infile))
+ env["INFILE"] = xs(infile)
+ dir, base = File.split(File.expand_path(infile))
+ env["INDIR"] = xs(dir)
+ env["INBASE"] = xs(base)
end
def _expand_cmd(env, command)
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] filename escaping fixups
@ 2015-04-13 1:04 5% Eric Wong
2015-04-13 1:04 7% ` [PATCH 2/3] escape INFILE and related environment variables Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-04-13 1:04 UTC (permalink / raw)
To: dtas-all
There was a problem found while attempting to play a file with the '`'
(backtick) character in it, 2/3 is a critical fix. 1/3 is a minor
preparation cleanup and 3/3 was a following cleanup for existing call
sites.
New release coming in a day or so since this is a user-visible bug
(and we might as well release with some of our new features anyways,
since I might not have time to work on more fadefx processing for
another 2-3 weeks).
[PATCH 1/3] xs: allow taking a string as input
[PATCH 2/3] escape INFILE and related environment variables
[PATCH 3/3] cleanup: avoid redundant Array conversion for escapes
bin/dtas-cueedit | 4 ++--
lib/dtas/partstats.rb | 2 +-
lib/dtas/player.rb | 2 +-
lib/dtas/player/client_handler.rb | 2 +-
lib/dtas/process.rb | 2 +-
lib/dtas/source/av_ff_common.rb | 2 +-
lib/dtas/source/sox.rb | 2 +-
lib/dtas/splitfx.rb | 8 +++++---
lib/dtas/xs.rb | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-04-13 1:04 5% [PATCH 0/3] filename escaping fixups Eric Wong
2015-04-13 1:04 7% ` [PATCH 2/3] escape INFILE and related environment variables Eric Wong
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).