gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-21 13:28:08 +01:00
Code Issues Projects Releases Wiki Activity

properly escape characters in script parameters

Browse Source
This commit is contained in:
Adam Blackburn
2009-08-13 05:05:44 -05:00
parent 6e3d6c8d02
commit 078e47a110
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wicd/misc.py
View File

@@ -31,6 +31,7 @@ from threading import Thread
from subprocess import Popen, STDOUT, PIPE, call
from commands import getoutput
from itertools import repeat, chain, izip
from pipes import quote
# wicd imports
import wpath
@@ -192,13 +193,13 @@ def ExecuteScripts(scripts_dir, verbose=False, extra_parameters=()):
def ExecuteScript(script, verbose=False, extra_parameters=()):
""" Execute a command and send its output to the bit bucket. """
extra_parameters = [ quote(s) for s in extra_parameters ]
params = ' '.join(extra_parameters)
# escape script name
script = quote(script)
if verbose:
print "Executing %s with params %s" % (script, ' '.join(extra_parameters))
extra_parameters = [ s.replace('"', '\\"') for s in extra_parameters ]
# escape characters
params = '" "'.join(extra_parameters)
script = script.replace(' ', '\\ ')
ret = call('%s "%s" > /dev/null 2>&1' % (script, params), shell=True)
print "Executing %s with params %s" % (script, params)
ret = call('%s %s > /dev/null 2>&1' % (script, params), shell=True)
if verbose:
print "%s returned %s" % (script, ret)