cat : TrimSuffix always
This commit is contained in:
parent
63b27faf29
commit
5c1aaeeefc
2 changed files with 5 additions and 4 deletions
|
|
@ -34,7 +34,7 @@ func cat(files []string) (string, error) {
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
dat, err := os.ReadFile(f)
|
dat, err := os.ReadFile(f)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("error opening file: %w", err)
|
return "", fmt.Errorf("error opening target file: %w", err)
|
||||||
}
|
}
|
||||||
ff = append(ff, string(dat))
|
ff = append(ff, string(dat))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,12 @@ func GetStdin() ([]string, error) {
|
||||||
if !isStdinLoaded() {
|
if !isStdinLoaded() {
|
||||||
return nil, errors.New("stdin not loaded")
|
return nil, errors.New("stdin not loaded")
|
||||||
}
|
}
|
||||||
data, err := io.ReadAll(os.Stdin)
|
dat, err := io.ReadAll(os.Stdin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
// TODO: there's got to be a better way:
|
// TODO: there's got to be a better way:
|
||||||
s, _ := strings.CutSuffix(string(data), Newline)
|
s := strings.TrimSuffix(string(dat), Newline)
|
||||||
return strings.Split(s, Newline), nil
|
return strings.Split(s, Newline), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,5 +53,6 @@ func FileListSplit(f string) ([]string, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("error opening file: %w", err)
|
return nil, fmt.Errorf("error opening file: %w", err)
|
||||||
}
|
}
|
||||||
return strings.Split(string(dat), Newline), nil
|
s := strings.TrimSuffix(string(dat), Newline)
|
||||||
|
return strings.Split(s, Newline), nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue