X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=group.go;h=4741171fcfcbb2fdd36d108b586cd59baac13348;hb=886b911524a2f14bd7fc76e5a7478e0cfb2fc14d;hp=4ca213a0edfabc48fd7a95e4280509c4547c9d5c;hpb=a3031f694a0d58d23d383346ee848a6c78a1e4b9;p=nsscash%2Fnsscash.git diff --git a/group.go b/group.go index 4ca213a..4741171 100644 --- a/group.go +++ b/group.go @@ -23,10 +23,10 @@ import ( "encoding/binary" "fmt" "io" + "math" "sort" "strconv" "strings" - "math" "github.com/pkg/errors" ) @@ -68,6 +68,11 @@ func ParseGroups(r io.Reader) ([]Group, error) { t, err := s.ReadString('\n') if err != nil { if err == io.EOF { + if t != "" { + return nil, fmt.Errorf( + "no newline in last line: %q", + t) + } break } return nil, err @@ -189,7 +194,7 @@ func SerializeGroups(w io.Writer, grs []Group) error { tmp := make([]byte, 8) // Create index "sorted" in input order, used when iterating over all - // passwd entries (getgrent_r); keeping the original order makes + // group entries (getgrent_r); keeping the original order makes // debugging easier var indexOrig bytes.Buffer for _, g := range grs {