forked from mirrors/tar-split
common: remove in favor of stdlib unicode/utf8
This commit is contained in:
parent
7ef16e6f67
commit
7e38cefd4b
5 changed files with 9 additions and 75 deletions
|
@ -1,6 +1,6 @@
|
|||
package storage
|
||||
|
||||
import "github.com/vbatts/tar-split/tar/common"
|
||||
import "unicode/utf8"
|
||||
|
||||
// Entries is for sorting by Position
|
||||
type Entries []Entry
|
||||
|
@ -44,7 +44,7 @@ type Entry struct {
|
|||
// SetName will check name for valid UTF-8 string, and set the appropriate
|
||||
// field. See https://github.com/vbatts/tar-split/issues/17
|
||||
func (e *Entry) SetName(name string) {
|
||||
if common.IsValidUtf8String(name) {
|
||||
if utf8.ValidString(name) {
|
||||
e.Name = name
|
||||
} else {
|
||||
e.NameRaw = []byte(name)
|
||||
|
@ -54,10 +54,10 @@ func (e *Entry) SetName(name string) {
|
|||
// SetNameBytes will check name for valid UTF-8 string, and set the appropriate
|
||||
// field
|
||||
func (e *Entry) SetNameBytes(name []byte) {
|
||||
if !common.IsValidUtf8Btyes(name) {
|
||||
e.NameRaw = name
|
||||
} else {
|
||||
if utf8.Valid(name) {
|
||||
e.Name = string(name)
|
||||
} else {
|
||||
e.NameRaw = name
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,8 +6,7 @@ import (
|
|||
"errors"
|
||||
"io"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/vbatts/tar-split/tar/common"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
// ErrDuplicatePath occurs when a tar archive has more than one entry for the
|
||||
|
@ -97,7 +96,7 @@ type seenNames map[string]struct{}
|
|||
func (jp *jsonPacker) AddEntry(e Entry) (int, error) {
|
||||
// if Name is not valid utf8, switch it to raw first.
|
||||
if e.Name != "" {
|
||||
if !common.IsValidUtf8String(e.Name) {
|
||||
if !utf8.ValidString(e.Name) {
|
||||
e.NameRaw = []byte(e.Name)
|
||||
e.Name = ""
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue