Skip to content

Commit aee2491

Browse files
committed
Refactor file reading methods to use os and io packages
1 parent 78adda5 commit aee2491

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
*.iml
44
.vscode/
55
.history/
6-
bin/
6+
bin/
7+
*.exe

configuration.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package main
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"net/http"
8+
"os"
89
"path/filepath"
910
"regexp"
1011
"strings"
@@ -87,13 +88,13 @@ func (c *Configuration) getConfiguration(configFile string) *Configuration {
8788
if err != nil {
8889
LogFatal(fmt.Sprintf("Configuration file URL unreachable %v", err))
8990
}
90-
yamlContent, err = ioutil.ReadAll(response.Body)
91+
yamlContent, err = io.ReadAll(response.Body)
9192
if err != nil {
9293
LogFatal(fmt.Sprintf("Configuration file URL content unreadable %v", err))
9394
}
9495
response.Body.Close()
9596
} else {
96-
yamlContent, err = ioutil.ReadFile(configFile)
97+
yamlContent, err = os.ReadFile(configFile)
9798
if err != nil {
9899
LogFatal(fmt.Sprintf("Configuration file reading error %v ", err))
99100
}

finder.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66
"crypto/sha1"
77
"crypto/sha256"
88
"fmt"
9-
"io/ioutil"
9+
"io"
10+
"os"
1011
"runtime/debug"
1112
"strings"
1213
"time"
@@ -36,11 +37,11 @@ func FindInFilesContent(files *[]string, patterns []string, rules *yara.Rules, h
3637
var matchingFiles []string
3738

3839
for _, path := range *files {
39-
b, err := ioutil.ReadFile(path)
40+
b, err := os.ReadFile(path)
4041
if err != nil {
4142
if triageMode {
4243
time.Sleep(500 * time.Millisecond)
43-
b, err = ioutil.ReadFile(path)
44+
b, err = os.ReadFile(path)
4445
if err != nil {
4546
LogMessage(LOG_ERROR, "(ERROR)", "Unable to read file", path)
4647
continue
@@ -107,7 +108,7 @@ func FindInFilesContent(files *[]string, patterns []string, rules *yara.Rules, h
107108
}
108109
defer fr.Close()
109110

110-
body, err := ioutil.ReadAll(fr)
111+
body, err := io.ReadAll(fr)
111112
if err != nil {
112113
LogMessage(LOG_ERROR, "(ERROR)", "Unable to read file archive member:", path, subFile.Name)
113114
continue

scanner_pipeline.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"io/ioutil"
54
"os"
65
"path/filepath"
76
"runtime/debug"
@@ -209,7 +208,7 @@ func (sp *ScannerPipeline) scanFiles(
209208

210209
// Scan file content if criteria exist
211210
if len(patterns) > 0 || len(hashList) > 0 || (rules != nil && len(rules.GetRules()) > 0) {
212-
b, err := ioutil.ReadFile(filePath)
211+
b, err := os.ReadFile(filePath)
213212
if err != nil {
214213
LogMessage(LOG_ERROR, "(ERROR)", "Unable to read file", filePath)
215214
continue

ui_terminal.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"strings"
@@ -157,7 +156,7 @@ func OpenFileDialog() {
157156

158157
// function definition for adding files and directories to the treeview
159158
add := func(target *tview.TreeNode, p string) {
160-
files, err := ioutil.ReadDir(p)
159+
files, err := os.ReadDir(p)
161160
if err != nil {
162161
UIapp.Stop()
163162
}

utils_linux.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
_ "embed"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"os"
1312
"os/exec"
1413
"regexp"
@@ -80,7 +79,7 @@ func CreateMutex(name string) (uintptr, error) {
8079
lockFile := "fastfinder.lock"
8180
currentPid := os.Getpid()
8281

83-
lockContent, err := ioutil.ReadFile(lockFile)
82+
lockContent, err := os.ReadFile(lockFile)
8483
if err == nil {
8584
if len(lockContent) > 0 && string(lockContent) != fmt.Sprintf("%d", currentPid) {
8685
lockProcessId, _ := strconv.Atoi(string(lockContent))
@@ -144,14 +143,14 @@ func EnumLogicalDrives() (drivesInfo []DriveInfo, excludedPaths []string) {
144143
// Fallback for containers: if nothing was found, use a mounted scan root
145144
if len(drivesInfo) == 0 {
146145
LogMessage(LOG_VERBOSE, "[COMPAT]", "No block devices found - checking for container environment")
147-
146+
148147
root := os.Getenv("FASTFINDER_SCAN_ROOT")
149148
if root == "" {
150149
root = "/scan"
151150
}
152151

153152
LogMessage(LOG_VERBOSE, "[COMPAT]", "Attempting to use fallback scan root:", root)
154-
153+
155154
if info, err := os.Stat(root); err == nil && info.IsDir() {
156155
LogMessage(LOG_INFO, "[COMPAT]", "Container detected: using fallback scan root", root)
157156
drivesInfo = append(drivesInfo, DriveInfo{Name: root, Type: DRIVE_FIXED})

yaraprocessing.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"net/http"
88
"os"
99
"path/filepath"
@@ -123,7 +123,7 @@ func LoadYaraRules(path []string, rc4key string) (compiler *yara.Compiler, err e
123123
LogMessage(LOG_ERROR, "YARA file URL unreachable", dir, err)
124124
continue
125125
}
126-
f, err = ioutil.ReadAll(response.Body)
126+
f, err = io.ReadAll(response.Body)
127127
if err != nil {
128128
LogMessage(LOG_ERROR, "YARA file URL content unreadable", dir, err)
129129
continue

0 commit comments

Comments
 (0)