diff options
| author | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-01-29 17:11:18 +0000 |
|---|---|---|
| committer | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-01-29 17:11:18 +0000 |
| commit | 5a425b2aeda996d3142b6f4f7af0a597c9618d77 (patch) | |
| tree | 70f7c50bf0401f3ce1d2bf2c513f969c6fe2a6ef | |
| parent | b8e16ab5a2301a084932dab8d77b4a5a8089e8c2 (diff) | |
| download | rdiff-backup-5a425b2aeda996d3142b6f4f7af0a597c9618d77.tar.gz | |
DOS filename quoting adjustments from Marc Dyksterhouse.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@782 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 5 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 90d59b9..02f9c48 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -2,9 +2,10 @@ New in v1.1.8 (????/??/??) -------------------------- Add "FilenameMapping.set_init_quote_vals" security exception. -[Marc Dyksterhouse] +(Marc Dyksterhouse) -Escape DOS device filenames when necessary. [Marc Dyksterhouse] +Escape DOS device filenames when necessary. Adjust DOS filename +quoting to work properly with cygwin. (Marc Dyksterhouse) Allow for preservation of FinderInfo for folders and fix typo in Time.py. (Patch from Andrew Ferguson.) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index c9011f1..0bd57e8 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -541,11 +541,13 @@ class BackupSetGlobals(SetGlobals): if self.src_fsa.case_sensitive and not self.dest_fsa.case_sensitive: if self.dest_fsa.extended_filenames: return "A-Z;" # Quote upper case and quoting char - else: return "^a-z0-9_ .-" # quote everything but basic chars + # Quote the following 0 - 31, ", *, /, :, <, >, ?, \, |, ; + # Also quote uppercase A-Z + else: return 'A-Z\000-\037\"*/:<>?\\\\|\177;' if self.dest_fsa.extended_filenames: return "" # Don't quote anything - else: return "^A-Za-z0-9_ .-" + else: return '\000-\037\"*/:<>?\\\\|\177;' def compare_ctq_file(self, rbdir, suggested_ctq): """Compare ctq file with suggested result, return actual ctq""" |