mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-09 10:51:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified argvquote

Browse source
This commit is contained in:
Morten Enemark Lund 2016-04-22 16:36:02 +02:00
parent 4863a94b1c
commit 57bb16882f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xonsh/tools.py
View file

@ -422,14 +422,16 @@ def escape_windows_cmd_string(s):
def argvquote(arg, force=False): def argvquote(arg, force=False):
""" It Converts arguments to a command line such """ Returns an argument quoted in such a way that that CommandLineToArgvW
that CommandLineToArgvW will return the argument string unchanged. on Windows will return the argument string unchanged.
This is the same thing Popen does when supplied with an list of arguments.
Arguments in a command line should be separated by spaces; this Arguments in a command line should be separated by spaces; this
function does not add these spaces. This follows the suggestions outlined function does not add these spaces. This implementation follows the
here: https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/ suggestions outlined here:
https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
""" """
if not force and len(arg) != 0 and not any([c in arg for c in ' \t\n\v"']): if not force and len(arg) != 0 and not any([c in arg for c in ' \t\n\v"']):
cmdline = arg return arg
else: else:
n_backslashes = 0 n_backslashes = 0
cmdline = '"' cmdline = '"'
@ -443,8 +445,7 @@ def argvquote(arg, force=False):
n_backslashes = 0 n_backslashes = 0
else: else:
n_backslashes += 1 n_backslashes += 1
cmdline += n_backslashes * 2 * '\\' + '"' return cmdline + n_backslashes * 2 * '\\' + '"'
return cmdline
def on_main_thread(): def on_main_thread():