diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/FilenameMapping.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 38a6ebf..0e1fb19 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -12,6 +12,8 @@ RPM specfile update from Gordon Rowell. Add "FilenameMapping.set_init_quote_vals" security exception. [Marc Dyksterhouse] +Escape DOS device filenames when necessary. [Marc Dyksterhouse] + New in v1.1.7 (2006/11/12) -------------------------- diff --git a/rdiff-backup/rdiff_backup/FilenameMapping.py b/rdiff-backup/rdiff_backup/FilenameMapping.py index b730fd3..cecf76c 100644 --- a/rdiff-backup/rdiff_backup/FilenameMapping.py +++ b/rdiff-backup/rdiff_backup/FilenameMapping.py @@ -83,7 +83,17 @@ def quote(path): the quoting character. """ - return chars_to_quote_regexp.sub(quote_single, path) + QuotedPath = chars_to_quote_regexp.sub(quote_single, path) + if not Globals.must_escape_dos_devices: + return QuotedPath + + # Escape first char of any special DOS device files even if filename has an + # extension. Special names are: aux, prn, con, nul, com0-9, and lpt1-2. + if not re.search(r"^aux(\..*)*$|^prn(\..*)*$|^con(\..*)*$|^nul(\..*)*$|" \ + r"^com[0-9](\..*)*$|^lpt[12]{1}(\..*)*$", QuotedPath, \ + re.I): + return QuotedPath + return "%s%03d" % (quoting_char, ord(QuotedPath[0])) + QuotedPath[1:] def quote_single(match): """Return replacement for a single character""" |