senset/smarter-device-manager
1
0
Fork 0
mirror of https://gitlab.com/arm-research/smarter/smarter-device-manager.git synced 2024-11-25 03:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Fix recursion problem

See merge request arm-research/smarter/smarter-device-manager!18
This commit is contained in:
Alexandre Ferreira 2021-05-18 21:16:01 +00:00
commit 8a304aa5ee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@ -55,7 +55,7 @@ func init() {
flag.Parse() flag.Parse()
} }
func readDevDirectory(dirToList string) (files []string, err error) { func readDevDirectory(dirToList string, allowedRecursions uint8) (files []string, err error) {
var foundFiles []string var foundFiles []string
fType, err := os.Stat(dirToList) fType, err := os.Stat(dirToList)
@ -79,10 +79,12 @@ func readDevDirectory(dirToList string) (files []string, err error) {
f.Close() f.Close()
for _, subDir := range files { for _, subDir := range files {
foundFiles = append(foundFiles, subDir) foundFiles = append(foundFiles, subDir)
filesDir, err := readDevDirectory(dirToList+"/"+subDir) if allowedRecursions > 0 {
if err == nil { filesDir, err := readDevDirectory(dirToList+"/"+subDir,allowedRecursions-1)
for _, fileName := range filesDir { if err == nil {
foundFiles = append(foundFiles, subDir+"/"+fileName) for _, fileName := range filesDir {
foundFiles = append(foundFiles, subDir+"/"+fileName)
}
} }
} }
} }
@ -127,13 +129,13 @@ func main() {
} }
glog.V(0).Info("Reading existing devices on /dev") glog.V(0).Info("Reading existing devices on /dev")
ExistingDevices, err := readDevDirectory("/dev") ExistingDevices, err := readDevDirectory("/dev",10)
if err != nil { if err != nil {
glog.Errorf(err.Error()) glog.Errorf(err.Error())
os.Exit(1) os.Exit(1)
} }
ExistingDevicesSys, err := readDevDirectory("/sys/devices") ExistingDevicesSys, err := readDevDirectory("/sys/devices",0)
if err != nil { if err != nil {
glog.Errorf(err.Error()) glog.Errorf(err.Error())
os.Exit(1) os.Exit(1)