From 4c87164692f39af790c1a864eea82fb2d487c691 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 17 Dec 2023 12:49:10 -0500
Subject: [PATCH] Fix remaining warnings in windows and linux builds

---
 src/config.c              | 32 ++++++++++++++++----------------
 src/include/86box/86box.h |  2 +-
 src/network/net_rtl8139.c |  2 +-
 src/unix/unix.c           |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/config.c b/src/config.c
index b1ed7094f..8c4ad0de4 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1104,13 +1104,13 @@ load_floppy_and_cdrom_drives(void)
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
                 if (path_abs(p)) {
-                    if (strlen(p) > 255)
-                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 255 "
+                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 2047 "
                               "(fdd_image_history[%i][%i])\n", c, i);
                     else
-                        snprintf(fdd_image_history[c][i], 255, "%s", p);
+                        snprintf(fdd_image_history[c][i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
                 } else
-                    snprintf(fdd_image_history[c][i], 255, "%s%s%s", usr_path,
+                    snprintf(fdd_image_history[c][i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
                              path_get_slash(usr_path), p);
                 path_normalize(fdd_image_history[c][i]);
             }
@@ -1220,13 +1220,13 @@ load_floppy_and_cdrom_drives(void)
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
                 if (path_abs(p)) {
-                    if (strlen(p) > 511)
-                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 511 "
+                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 2047 "
                               "(cdrom[%i].image_history[%i])\n", c, i);
                     else
-                        snprintf(cdrom[c].image_history[i], 511, "%s", p);
+                        snprintf(cdrom[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
                 } else
-                    snprintf(cdrom[c].image_history[i], 511, "%s%s%s", usr_path,
+                    snprintf(cdrom[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
                              path_get_slash(usr_path), p);
                 path_normalize(cdrom[c].image_history[i]);
             }
@@ -1353,13 +1353,13 @@ load_other_removable_devices(void)
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
                 if (path_abs(p)) {
-                    if (strlen(p) > 511)
-                        fatal("load_other_removable_devices(): strlen(p) > 511 "
+                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+                        fatal("load_other_removable_devices(): strlen(p) > 2047 "
                               "(zip_drives[%i].image_history[%i])\n", c, i);
                     else
-                        snprintf(zip_drives[c].image_history[i], 511, "%s", p);
+                        snprintf(zip_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
                 } else
-                    snprintf(zip_drives[c].image_history[i], 511, "%s%s%s", usr_path,
+                    snprintf(zip_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
                              path_get_slash(usr_path), p);
                 path_normalize(zip_drives[c].image_history[i]);
             }
@@ -1469,13 +1469,13 @@ load_other_removable_devices(void)
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
                 if (path_abs(p)) {
-                    if (strlen(p) > 511)
-                        fatal("load_other_removable_devices(): strlen(p) > 511 "
+                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+                        fatal("load_other_removable_devices(): strlen(p) > 2047 "
                               "(mo_drives[%i].image_history[%i])\n", c, i);
                     else
-                        snprintf(mo_drives[c].image_history[i], 511, "%s", p);
+                        snprintf(mo_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
                 } else
-                    snprintf(mo_drives[c].image_history[i], 511, "%s%s%s", usr_path,
+                    snprintf(mo_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
                              path_get_slash(usr_path), p);
                 path_normalize(mo_drives[c].image_history[i]);
             }
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index ae2ea260c..c16cd5efb 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -33,7 +33,7 @@
 
 /* Recently used images */
 #define MAX_PREV_IMAGES    4
-#define MAX_IMAGE_PATH_LEN 256
+#define MAX_IMAGE_PATH_LEN 2048
 
 /* Default language 0xFFFF = from system, 0x409 = en-US */
 #define DEFAULT_LANGUAGE 0x0409
diff --git a/src/network/net_rtl8139.c b/src/network/net_rtl8139.c
index d1e14fb12..6c86bdebf 100644
--- a/src/network/net_rtl8139.c
+++ b/src/network/net_rtl8139.c
@@ -3312,7 +3312,7 @@ nic_init(const device_t *info)
 
     fp = nvr_fopen(eeprom_filename, "rb");
     if (fp) {
-        fread(s->eeprom.contents, 2, 64, fp);
+        (void) !fread(s->eeprom.contents, 2, 64, fp);
         fclose(fp);
         fp = NULL;
     } else {
diff --git a/src/unix/unix.c b/src/unix/unix.c
index ecd17cadb..bac84ead4 100644
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -918,7 +918,7 @@ monitor_thread(void *param)
                 line = f_readline("(86Box) ");
             else {
                 printf("(86Box) ");
-                !getline(&line, &n, stdin);
+                (void) !getline(&line, &n, stdin);
             }
             if (line) {
                 int   cmdargc = 0;