Updated: cleaned staticcheck, checking errors now.

door/door_linux.go

@@ -116,16 +116,40 @@ func (d *Door) ReadDropfile(filename string) {
 	}
 
 	d.Config.Comm_type, err = strconv.Atoi(lines[0])
+	if err != nil {
+		log.Panicf("Door32 Comm Type (expected integer): %s\n", err)
+	}
 	d.Config.Comm_handle, err = strconv.Atoi(lines[1])
+	if err != nil {
+		log.Panicf("Door32 Comm Handle (expected integer): %s\n", err)
+	}
 	d.Config.Baudrate, err = strconv.Atoi(lines[2])
+	if err != nil {
+		log.Panicf("Door32 Baudrate (expected integer): %s\n", err)
+	}
 	d.Config.BBSID = lines[3]
 	d.Config.User_number, err = strconv.Atoi(lines[4])
+	if err != nil {
+		log.Panicf("Door32 User Number (expected integer): %s\n", err)
+	}
 	d.Config.Real_name = lines[5]
 	d.Config.Handle = lines[6]
 	d.Config.Security_level, err = strconv.Atoi(lines[7])
+	if err != nil {
+		log.Panicf("Door32 Security Level (expected integer): %s\n", err)
+	}
 	d.Config.Time_left, err = strconv.Atoi(lines[8])
+	if err != nil {
+		log.Panicf("Door32 Time Left (expected integer): %s\n", err)
+	}
 	d.Config.Emulation, err = strconv.Atoi(lines[9])
+	if err != nil {
+		log.Panicf("Door32 Emulation (expected integer): %s\n", err)
+	}
 	d.Config.Node, err = strconv.Atoi(lines[10])
+	if err != nil {
+		log.Panicf("Door32 Node Number (expected integer): %s\n", err)
+	}
 
 	d.READFD = d.Config.Comm_handle
 	d.WRITEFD = d.Config.Comm_handle

door/door_windows.go

@@ -114,16 +114,40 @@ func (d *Door) ReadDropfile(filename string) {
 	}
 
 	d.Config.Comm_type, err = strconv.Atoi(lines[0])
+	if err != nil {
+		log.Panicf("Door32 Comm Type (expected integer): %s\n", err)
+	}
 	d.Config.Comm_handle, err = strconv.Atoi(lines[1])
+	if err != nil {
+		log.Panicf("Door32 Comm Handle (expected integer): %s\n", err)
+	}
 	d.Config.Baudrate, err = strconv.Atoi(lines[2])
+	if err != nil {
+		log.Panicf("Door32 Baudrate (expected integer): %s\n", err)
+	}
 	d.Config.BBSID = lines[3]
 	d.Config.User_number, err = strconv.Atoi(lines[4])
+	if err != nil {
+		log.Panicf("Door32 User Number (expected integer): %s\n", err)
+	}
 	d.Config.Real_name = lines[5]
 	d.Config.Handle = lines[6]
 	d.Config.Security_level, err = strconv.Atoi(lines[7])
+	if err != nil {
+		log.Panicf("Door32 Security Level (expected integer): %s\n", err)
+	}
 	d.Config.Time_left, err = strconv.Atoi(lines[8])
+	if err != nil {
+		log.Panicf("Door32 Time Left (expected integer): %s\n", err)
+	}
 	d.Config.Emulation, err = strconv.Atoi(lines[9])
+	if err != nil {
+		log.Panicf("Door32 Emulation (expected integer): %s\n", err)
+	}
 	d.Config.Node, err = strconv.Atoi(lines[10])
+	if err != nil {
+		log.Panicf("Door32 Node Number (expected integer): %s\n", err)
+	}
 
 	d.READFD = d.Config.Comm_handle
 	d.WRITEFD = d.Config.Comm_handle

door/input_linux.go

@@ -379,7 +379,7 @@ func (d *Door) Input(max int) string {
 
 	var c int
 
-	for true {
+	for {
 		c = d.WaitKey(Inactivity, 0)
 		if c < 0 {
 			// timeout/hangup

door/input_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"testing"
 	"time"
 )
@@ -66,7 +67,10 @@ func TestDoorInputConnection(t *testing.T) {
 	// These are the commands sent to detect ... throw this all away.
 	buffer = make([]byte, 128)
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
-	r, err := server.Read(buffer)
+	_, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %#v", err)
+	}
 	// t.Errorf("Buffer : %#v\n", buffer[:r])
 	server.SetReadDeadline(time.Time{})
 
@@ -123,7 +127,11 @@ func TestDoorInputConnection(t *testing.T) {
 
 	buffer = make([]byte, 128)
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
-	r, err = server.Read(buffer)
+	r, err := server.Read(buffer)
+	// input_test.go:131: server.Read: &net.OpError{Op:"read", Net:"tcp", Source:(*net.TCPAddr)(0xc000012f00), Addr:(*net.TCPAddr)(0xc000012f30), Err:(*poll.DeadlineExceededError)(0x6c39c0)}
+	if !strings.Contains(err.Error(), "i/o timeout") {
+		t.Errorf("Expected poll.DeadlineExceededError: %s / %#v", err.Error(), err)
+	}
 	if r != 0 {
 		t.Errorf("Buffer After KeyTest: %#v\n", buffer[:r])
 	}
@@ -149,6 +157,9 @@ func TestDoorInputConnection(t *testing.T) {
 	buffer = make([]byte, 128)
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %#v", err)
+	}
 	result := string(buffer[:r])
 	expected := "     \x08\x08\x08\x08\x0812345\x07\x07\x07\x07\x07"
 	if result != expected {

door/input_windows.go

@@ -327,7 +327,7 @@ func (d *Door) Input(max int) string {
 
 	var c int
 
-	for true {
+	for {
 		c = d.WaitKey(Inactivity, 0)
 		if c < 0 {
 			// timeout/hangup

door/menu_test.go

@@ -104,6 +104,9 @@ func TestMenuConnection(t *testing.T) {
 	buffer = make([]byte, 1024)
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
 	_, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	// t.Errorf("Buffer : %#v\n", buffer[:r])
 	server.SetReadDeadline(time.Time{})
 
@@ -147,6 +150,9 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err := server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
 	output := string(buffer[:r])
 	// t.Errorf("OUTPUT: (len %d) %#v", r, output)
@@ -173,7 +179,11 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
+	// TODO:  Check Menu output and verify it is correct.
 	// output = string(buffer[:r])
 
 	// Test HOME, END, selecting an option, 8 & 2.
@@ -191,6 +201,9 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
 	// output = string(buffer[:r])
 
@@ -207,6 +220,9 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
 	// output = string(buffer[:r])
 
@@ -222,6 +238,9 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
 	// output = string(buffer[:r])
 
@@ -238,6 +257,9 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
+	if err != nil {
+		t.Errorf("server.Read: %s", err)
+	}
 	server.SetReadDeadline(time.Time{})
 	// output = string(buffer[:r])