From ddbf53e7c53302f86b1345e8aa79ca50027ef93f Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 28 Dec 2015 20:45:14 +0000 Subject: [PATCH] Reject path arguments that start with '-' with a usage error. Signed-off-by: Daira Hopwood --- src/allmydata/util/encodingutil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allmydata/util/encodingutil.py b/src/allmydata/util/encodingutil.py index 10156794..65f5911a 100644 --- a/src/allmydata/util/encodingutil.py +++ b/src/allmydata/util/encodingutil.py @@ -96,7 +96,7 @@ def argv_to_unicode(s): raise usage.UsageError("Argument %s cannot be decoded as %s." % (quote_output(s), io_encoding)) -def argv_to_abspath(s, long_path=True): +def argv_to_abspath(s, **kwargs): """ Convenience function to decode an argv element to an absolute path, with ~ expanded. If this fails, raise a UsageError. @@ -105,7 +105,7 @@ def argv_to_abspath(s, long_path=True): if decoded.startswith(u'-'): raise usage.UsageError("Path argument %s cannot start with '-'.\nUse %s if you intended to refer to a file." % (quote_output(s), quote_output(os.path.join('.', s)))) - return abspath_expanduser_unicode(decoded, long_path=long_path) + return abspath_expanduser_unicode(decoded, **kwargs) def unicode_to_argv(s, mangle=False): """ -- 2.45.2