version 2.0.0

This commit is contained in:
ston1th 2018-09-19 21:12:43 +02:00
commit de6a48c088
10 changed files with 84 additions and 108 deletions

View file

@ -1,8 +1,13 @@
// Copyright (C) 2017 Marius Schellenberger
// Copyright (C) 2018 Marius Schellenberger
// +build go1.11
package godrop
import "strconv"
import (
"os/user"
"strconv"
)
func atoi(a string) (int, error) {
i, err := strconv.Atoi(a)
@ -12,18 +17,18 @@ func atoi(a string) (int, error) {
return i, nil
}
func userID(username string) (uid int, err error) {
id, err := lookupUID(username)
func userID(username string) (int, error) {
u, err := user.Lookup(username)
if err != nil {
return -1, err
}
return atoi(id)
return atoi(u.Uid)
}
func groupID(name string) (int, error) {
id, err := lookupGID(name)
g, err := user.LookupGroup(name)
if err != nil {
return -1, err
}
return atoi(id)
return atoi(g.Gid)
}