diff --git a/cat/cat.go b/cat/cat.go index 58c8473..d56265d 100644 --- a/cat/cat.go +++ b/cat/cat.go @@ -34,7 +34,7 @@ func cat(files []string) (string, error) { for _, f := range files { dat, err := os.ReadFile(f) 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)) } diff --git a/pipe/pipe.go b/pipe/pipe.go index 930b650..47a6af1 100644 --- a/pipe/pipe.go +++ b/pipe/pipe.go @@ -20,12 +20,12 @@ func GetStdin() ([]string, error) { if !isStdinLoaded() { return nil, errors.New("stdin not loaded") } - data, err := io.ReadAll(os.Stdin) + dat, err := io.ReadAll(os.Stdin) if err != nil { log.Fatal(err) } // 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 } @@ -53,5 +53,6 @@ func FileListSplit(f string) ([]string, error) { if err != nil { 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 }