Merge pull request #320 from tychoish/close-files-more-often

close open files

host/host_darwin.go

@@ -104,6 +104,7 @@ func Users() ([]UserStat, error) {
 	if err != nil {
 		return ret, err
 	}
+	defer file.Close()
 
 	buf, err := ioutil.ReadAll(file)
 	if err != nil {

host/host_freebsd.go

@@ -112,6 +112,7 @@ func Users() ([]UserStat, error) {
 	if err != nil {
 		return ret, err
 	}
+	defer file.Close()
 
 	buf, err := ioutil.ReadAll(file)
 	if err != nil {
@@ -180,6 +181,8 @@ func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
 	if err != nil {
 		return ret, err
 	}
+	defer file.Close()
+
 	buf, err := ioutil.ReadAll(file)
 	if err != nil {
 		return ret, err

host/host_linux.go

@@ -131,6 +131,7 @@ func Users() ([]UserStat, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 
 	buf, err := ioutil.ReadAll(file)
 	if err != nil {

host/host_openbsd.go

@@ -123,6 +123,8 @@ func Users() ([]UserStat, error) {
 	if err != nil {
 		return ret, err
 	}
+	defer file.Close()
+
 	buf, err := ioutil.ReadAll(file)
 	if err != nil {
 		return ret, err

internal/common/common_linux.go

@@ -33,9 +33,9 @@ func NumProcs() (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
+	defer f.Close()
 
 	list, err := f.Readdir(-1)
-	defer f.Close()
 	if err != nil {
 		return 0, err
 	}

process/process_posix.go

@@ -40,6 +40,8 @@ func getTerminalMap() (map[uint64]string, error) {
 			return nil, err
 		}
 	}
+	defer ptsd.Close()
+
 	if ptsnames == nil {
 		defer ptsd.Close()
 		ptsnames, err = ptsd.Readdirnames(-1)