CVS commit: pkgsrc/devel/argp

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Aug  6 18:49:17 UTC 2024

Modified Files:
        pkgsrc/devel/argp: Makefile distinfo
        pkgsrc/devel/argp/patches: patch-argp-fmtstream.c

Log Message:
devel/argp: Fix ctype(3) abuse.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/argp/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/argp/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/argp/patches/patch-argp-fmtstream.c

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

Modified files:

Index: pkgsrc/devel/argp/Makefile
diff -u pkgsrc/devel/argp/Makefile:1.7 pkgsrc/devel/argp/Makefile:1.8
--- pkgsrc/devel/argp/Makefile:1.7      Wed Jan 13 09:17:24 2021
+++ pkgsrc/devel/argp/Makefile  Tue Aug  6 18:49:16 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2021/01/13 09:17:24 nia Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/06 18:49:16 riastradh Exp $
 
 DISTNAME=      argp-standalone-1.3
 PKGNAME=       argp-1.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.lysator.liu.se/~nisse/misc/
 

Index: pkgsrc/devel/argp/distinfo
diff -u pkgsrc/devel/argp/distinfo:1.10 pkgsrc/devel/argp/distinfo:1.11
--- pkgsrc/devel/argp/distinfo:1.10     Sun Mar 12 12:38:56 2023
+++ pkgsrc/devel/argp/distinfo  Tue Aug  6 18:49:16 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2023/03/12 12:38:56 js Exp $
+$NetBSD: distinfo,v 1.11 2024/08/06 18:49:16 riastradh Exp $
 
 BLAKE2s (argp-standalone-1.3.tar.gz) = aadc55df51b443d36f081b06a48d864aba802b8239e132f5d88b18cc1fedcca2
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 Size (argp-standalone-1.3.tar.gz) = 130255 bytes
 SHA1 (patch-aa) = f6053a22f3267392d6dbd312faf3b6b140d27e7a
 SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
-SHA1 (patch-argp-fmtstream.c) = c7e763bb317702e5072570783629d8e973e5f077
+SHA1 (patch-argp-fmtstream.c) = c89a906b168aec0145b3a7e5a4a9282a92b95a7e
 SHA1 (patch-argp-fmtstream.h) = c0b740fc31d51d0295d6bd01a9ed1a84ff2b5205
 SHA1 (patch-argp-parse.c) = 0e6e61ec639dc9afb6863709038ec27bd6cda527
 SHA1 (patch-argp.h) = 82e8035a12779c392f291838fd956101433f2ff9

Index: pkgsrc/devel/argp/patches/patch-argp-fmtstream.c
diff -u pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.1 pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.2
--- pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.1        Tue Jul  3 18:13:47 2012
+++ pkgsrc/devel/argp/patches/patch-argp-fmtstream.c    Tue Aug  6 18:49:16 2024
@@ -1,7 +1,45 @@
-$NetBSD: patch-argp-fmtstream.c,v 1.1 2012/07/03 18:13:47 joerg Exp $
+$NetBSD: patch-argp-fmtstream.c,v 1.2 2024/08/06 18:49:16 riastradh Exp $
+
+Avoid ctype(3) abuse.
 
 --- argp-fmtstream.c.orig      2003-12-11 08:37:05.000000000 +0000
 +++ argp-fmtstream.c
+@@ -206,7 +206,7 @@ __argp_fmtstream_update (argp_fmtstream_
+         int i;
+ 
+         p = buf + (r + 1 - fs->point_col);
+-        while (p >= buf && !isblank (*p))
++        while (p >= buf && !isblank ((unsigned char) *p))
+           --p;
+         nextline = p + 1;     /* This will begin the next line.  */
+ 
+@@ -216,7 +216,7 @@ __argp_fmtstream_update (argp_fmtstream_
+             if (p >= buf)
+               do
+                 --p;
+-              while (p >= buf && isblank (*p));
++              while (p >= buf && isblank ((unsigned char) *p));
+             nl = p + 1;       /* The newline will replace the first blank. */
+           }
+         else
+@@ -227,7 +227,7 @@ __argp_fmtstream_update (argp_fmtstream_
+             /* Find the end of the long word.  */
+             do
+               ++p;
+-            while (p < nl && !isblank (*p));
++            while (p < nl && !isblank ((unsigned char) *p));
+             if (p == nl)
+               {
+                 /* It already ends a line.  No fussing required.  */
+@@ -240,7 +240,7 @@ __argp_fmtstream_update (argp_fmtstream_
+             /* Swallow separating blanks.  */
+             do
+               ++p;
+-            while (isblank (*p));
++            while (isblank ((unsigned char) *p));
+             /* The next line will start here.  */
+             nextline = p;
+           }
 @@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
  weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
  #endif