alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

lib/encoder: add encoding of square brackets

Browse source
This commit is contained in:
Ivan Andreev 2021-06-23 17:05:39 +03:00
parent 69f4b48719
commit 48e7246163
4 changed files with 28871 additions and 26586 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/encoder/encoder.go
View file

@ -63,6 +63,7 @@ const (
EncodeRightCrLfHtVt // Trailing CR LF HT VT
EncodeInvalidUtf8 // Invalid UTF-8 bytes
EncodeDot // . and .. names
EncodeSquareBracket // []
// Synthetic
EncodeWin = EncodeColon | EncodeQuestion | EncodeDoubleQuote | EncodeAsterisk | EncodeLtGt | EncodePipe // :?"*<>|
@ -120,6 +121,7 @@ func init() {
alias("None", EncodeZero)
alias("Slash", EncodeSlash)
alias("LtGt", EncodeLtGt)
alias("SquareBracket", EncodeSquareBracket)
alias("DoubleQuote", EncodeDoubleQuote)
alias("SingleQuote", EncodeSingleQuote)
alias("BackQuote", EncodeBackQuote)
@ -315,6 +317,13 @@ func (mask MultiEncoder) Encode(in string) string {
return true
}
}
if mask.Has(EncodeSquareBracket) { // []
switch r {
case '[', ']',
'［', '］':
return true
}
}
if mask.Has(EncodeQuestion) { // ?
switch r {
case '?',
@ -473,6 +482,17 @@ func (mask MultiEncoder) Encode(in string) string {
continue
}
}
if mask.Has(EncodeSquareBracket) { // []
switch r {
case '[', ']':
out.WriteRune(r + fullOffset)
continue
case '［', '］':
out.WriteRune(QuoteRune)
out.WriteRune(r)
continue
}
}
if mask.Has(EncodeQuestion) { // ?
switch r {
case '?':
@ -713,6 +733,13 @@ func (mask MultiEncoder) Decode(in string) string {
return true
}
}
if mask.Has(EncodeSquareBracket) { // []
switch r {
case '［', '］':
return true
}
}
if mask.Has(EncodeQuestion) { // ?
switch r {
case '？':
@ -857,6 +884,17 @@ func (mask MultiEncoder) Decode(in string) string {
continue
}
}
if mask.Has(EncodeSquareBracket) { // []
switch r {
case '［', '］':
if unquote {
out.WriteRune(r)
} else {
out.WriteRune(r - fullOffset)
}
continue
}
}
if mask.Has(EncodeQuestion) { // ?
switch r {
case '？':