Added extra check if fileContainsNullChar returns err; pass filename to it instead of file
This commit is contained in:
@@ -91,6 +91,7 @@ func main() {
|
|||||||
inputFilenames := flag.Args()[1:]
|
inputFilenames := flag.Args()[1:]
|
||||||
for _, inputFilename := range inputFilenames {
|
for _, inputFilename := range inputFilenames {
|
||||||
inputFile, err := os.Open(inputFilename)
|
inputFile, err := os.Open(inputFilename)
|
||||||
|
defer inputFile.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("%s: %s: No such file or directory\n", os.Args[0], inputFilename)
|
fmt.Printf("%s: %s: No such file or directory\n", os.Args[0], inputFilename)
|
||||||
} else {
|
} else {
|
||||||
@@ -102,8 +103,14 @@ func main() {
|
|||||||
if fileStat.Mode().IsDir() {
|
if fileStat.Mode().IsDir() {
|
||||||
fmt.Printf("%s: %s: Is a directory\n", os.Args[0], inputFilename)
|
fmt.Printf("%s: %s: Is a directory\n", os.Args[0], inputFilename)
|
||||||
} else {
|
} else {
|
||||||
if fileContainsNullChar(inputFile) {
|
var nullCharPresent bool
|
||||||
|
if nullCharPresent, err = fileContainsNullChar(inputFilename); nullCharPresent {
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("%v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
} else {
|
||||||
fmt.Printf("%s: %s: Is a binary file\n", os.Args[0], inputFilename)
|
fmt.Printf("%s: %s: Is a binary file\n", os.Args[0], inputFilename)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
inputFiles = append(inputFiles, inputFile)
|
inputFiles = append(inputFiles, inputFile)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user