From 4cab89345f8c236cdc91f596b5168763f6051ab2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Dec 2012 03:09:27 -0800 Subject: xattr-helper.py: fix backslash quoting --- bin/xattr-helper.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py index d40217c9a..b832f5ea7 100755 --- a/bin/xattr-helper.py +++ b/bin/xattr-helper.py @@ -94,11 +94,14 @@ def dump_xattrs(file_in, file_out): attrs = xattr.list(pathname) if not attrs: continue - file_out.write(b'# file: ' + quote(pathname, b'\n\r') + b'\n') + + # NOTE: Always quote backslashes, in order to ensure that they are + # not interpreted as quotes when they are processed by unquote. + file_out.write(b'# file: ' + quote(pathname, b'\n\r\\\\') + b'\n') for attr in attrs: attr = unicode_encode(attr) - file_out.write(quote(attr, b'=\n\r') + b'="' + - quote(xattr.get(pathname, attr), b'\\\0\n\r"') + b'"\n') + file_out.write(quote(attr, b'=\n\r\\\\') + b'="' + + quote(xattr.get(pathname, attr), b'\0\n\r"\\\\') + b'"\n') def restore_xattrs(file_in): -- cgit v1.2.3-1-g7c22