CVS commit: pkgsrc/emulators/x16-emulator

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Mon Nov 27 04:17:31 UTC 2023

Modified Files:
        pkgsrc/emulators/x16-emulator: distinfo
        pkgsrc/emulators/x16-emulator/patches: patch-src_rendertext.c
Added Files:
        pkgsrc/emulators/x16-emulator/patches: patch-src_cartridge.c

Log Message:
Safely pass chars to ctype(3) functions in cartridge.c, too.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/x16-emulator/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/x16-emulator/patches/patch-src_cartridge.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/x16-emulator/distinfo
diff -u pkgsrc/emulators/x16-emulator/distinfo:1.8 pkgsrc/emulators/x16-emulator/distinfo:1.9
--- pkgsrc/emulators/x16-emulator/distinfo:1.8  Mon Nov 27 03:20:59 2023
+++ pkgsrc/emulators/x16-emulator/distinfo      Mon Nov 27 04:17:30 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2023/11/27 03:20:59 thorpej Exp $
+$NetBSD: distinfo,v 1.9 2023/11/27 04:17:30 thorpej Exp $
 
 BLAKE2s (x16-emulator-46.tar.gz) = ec4ec0c0155843c4c7be5ce103794b02973b31aae3c8af8cc5fade765453a78d
 SHA512 (x16-emulator-46.tar.gz) = d5e2ac7db8dbb710dd400a31e5c4b0d426c7284d899df3a7814c25ca15a4cbe546dbf986223e833f6526a7981c785bbebe47729c79d03a35928c5f72c985d86e
 Size (x16-emulator-46.tar.gz) = 300653 bytes
 SHA1 (patch-Makefile) = bc5fa340969e56d8eb8f6d8e3d6527ac773a6d31
+SHA1 (patch-src_cartridge.c) = 463f4a9edb44c259f28ab9646cc7204e3a810bdd
 SHA1 (patch-src_main.c) = 6b759386bc9e1a87a1b33763cc14da75cd4b755f
-SHA1 (patch-src_rendertext.c) = 2474af4dff454ddd6d4ca2c9abc4eba963c3d51e
+SHA1 (patch-src_rendertext.c) = 86de0b05e64602c861342e9bd41c30f1401b46f6

Index: pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c
diff -u pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c:1.1 pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c:1.2
--- pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c:1.1    Sun Aug  7 17:38:08 2022
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c        Mon Nov 27 04:17:30 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_rendertext.c,v 1.1 2022/08/07 17:38:08 thorpej Exp $
+$NetBSD: patch-src_rendertext.c,v 1.2 2023/11/27 04:17:30 thorpej Exp $
+
+Safely pass a char to ctype(3) functions.
 
 --- src/rendertext.c.orig      2022-08-07 02:20:35.066620319 +0000
 +++ src/rendertext.c   2022-08-07 02:22:17.485680282 +0000

Added files:

Index: pkgsrc/emulators/x16-emulator/patches/patch-src_cartridge.c
diff -u /dev/null pkgsrc/emulators/x16-emulator/patches/patch-src_cartridge.c:1.1
--- /dev/null   Mon Nov 27 04:17:31 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_cartridge.c Mon Nov 27 04:17:30 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_cartridge.c,v 1.1 2023/11/27 04:17:30 thorpej Exp $
+
+Safely pass a char to ctype(3) functions.
+
+--- src/cartridge.c.orig       2023-11-27 04:12:57.695843788 +0000
++++ src/cartridge.c    2023-11-27 04:14:00.358575809 +0000
+@@ -30,7 +30,7 @@ static int
+ x16_strnicmp(char const *s0, char const *s1, int len)
+ {
+       for(int i=0; (i<len) && (*s0 && *s1); ++i) {
+-              if(tolower(*s0) != tolower(*s1)) {
++              if(tolower((unsigned char)*s0) != tolower((unsigned char)*s1)) {
+                       break;
+               }
+               ++s0;
+@@ -216,7 +216,7 @@ static char *
+ rtrim(char *str)
+ {
+     char *c = str + strlen(str) - 1;
+-    while(isspace(*c)) {
++    while(isspace((unsigned char)*c)) {
+               --c;
+       }
+     *(c + 1) = '\0';