Received: by mail.netbsd.org (Postfix, from userid 605) id D09F484DFC; Fri, 17 Apr 2020 00:21:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 59D5884D37 for ; Fri, 17 Apr 2020 00:21:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id JcjtObeNt0MN for ; Fri, 17 Apr 2020 00:21:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 967AF84D2C for ; Fri, 17 Apr 2020 00:21:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 94705FB27; Fri, 17 Apr 2020 00:21:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587082916150990" MIME-Version: 1.0 Date: Fri, 17 Apr 2020 00:21:56 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/devel/gcvs To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200417002156.94705FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587082916150990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Fri Apr 17 00:21:56 UTC 2020 Modified Files: pkgsrc/devel/gcvs: distinfo pkgsrc/devel/gcvs/patches: patch-af Added Files: pkgsrc/devel/gcvs/patches: patch-common_AppGlue.cpp patch-common_CvsArgs.cpp patch-common_TextBinary.cpp patch-rf_umenu.cpp Log Message: Fix const use around string functions To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/gcvs/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gcvs/patches/patch-af cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gcvs/patches/patch-common_AppGlue.cpp \ pkgsrc/devel/gcvs/patches/patch-common_CvsArgs.cpp \ pkgsrc/devel/gcvs/patches/patch-common_TextBinary.cpp \ pkgsrc/devel/gcvs/patches/patch-rf_umenu.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587082916150990 Content-Disposition: inline Content-Length: 6847 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gcvs/distinfo diff -u pkgsrc/devel/gcvs/distinfo:1.13 pkgsrc/devel/gcvs/distinfo:1.14 --- pkgsrc/devel/gcvs/distinfo:1.13 Tue Nov 3 03:27:27 2015 +++ pkgsrc/devel/gcvs/distinfo Fri Apr 17 00:21:56 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 03:27:27 agc Exp $ +$NetBSD: distinfo,v 1.14 2020/04/17 00:21:56 joerg Exp $ SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc @@ -13,7 +13,7 @@ SHA1 (patch-ab) = 3f9764eb2e67ecc33cbfb5 SHA1 (patch-ac) = d3aea42a044fab09542cbda6956f4bdcb5a05f0b SHA1 (patch-ad) = 595277d9fcf9f4bc62637beae6bf5b9e70a0fb7d SHA1 (patch-ae) = acc2f668834409f379403b08e67ccc0ce4e1ff18 -SHA1 (patch-af) = 6048ade2cb3fe3fda6332159099190e5d8377e23 +SHA1 (patch-af) = 208ecfdc4af4b1fbfa3d1cbb8af01b2cccb48f0d SHA1 (patch-ag) = 495ec4b0b6e54834b2c54facd9ad1f853be188df SHA1 (patch-ah) = fa23ed2155af00d85cfe62d15c01dc77c9ddb55c SHA1 (patch-ai) = c349a5c49d8e0a481a4dd7eb56b713475b3c9e67 @@ -29,8 +29,11 @@ SHA1 (patch-ar) = 05244267342a031e5470e4 SHA1 (patch-as) = c56bf78b4b72ff39eabc6011dce65c2e5650baa2 SHA1 (patch-at) = 9ab6cef9e6122b2f2b4148be1610948f9764b387 SHA1 (patch-au) = 62e0a709039fc73ea131a975fd4a4cbd9e5b134e +SHA1 (patch-common_AppGlue.cpp) = 136104d0d4bbb90f74a1bd20251ed685f9fdf7c7 SHA1 (patch-common_AppGlue.h) = 3ddf2f3cb842cd159407a232bc2122c2c89a5863 +SHA1 (patch-common_CvsArgs.cpp) = e8e13b823ac0718a499ff0e5500ef7241b80f9bb SHA1 (patch-common_Persistent.h) = 4df5170a64a6d3135cb4bb5aad90b4f86f2ed1b9 +SHA1 (patch-common_TextBinary.cpp) = c8f62175cb6470d333c005c053780555e1588d0a SHA1 (patch-common_UCvsConsole.cpp) = 276990c24811183c682410f4324f9e93de356931 SHA1 (patch-common_getline_c) = 038fb5200c692e4b4d82041008b762a2bec55be2 SHA1 (patch-common_getline_h) = ea1153a559b349da6083de7cd913840802c8caa9 @@ -40,3 +43,4 @@ SHA1 (patch-cvsunix_lib_getline_c) = 502 SHA1 (patch-cvsunix_lib_getline_h) = c717385903f2f36e992213cbc8f010d683858d5a SHA1 (patch-cvsunix_src_client.c) = 7f07bf41740470f3c6123a20dba9b005b5dca329 SHA1 (patch-cvsunix_src_server.c) = dce0f6cd59df4dda7f5baf3222f222e1bd1d8deb +SHA1 (patch-rf_umenu.cpp) = 2469c96295a5e0e1fdd8a446fcc0246736af7686 Index: pkgsrc/devel/gcvs/patches/patch-af diff -u pkgsrc/devel/gcvs/patches/patch-af:1.1 pkgsrc/devel/gcvs/patches/patch-af:1.2 --- pkgsrc/devel/gcvs/patches/patch-af:1.1 Wed Sep 8 16:21:53 2004 +++ pkgsrc/devel/gcvs/patches/patch-af Fri Apr 17 00:21:56 2020 @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1 2004/09/08 16:21:53 wiz Exp $ +$NetBSD: patch-af,v 1.2 2020/04/17 00:21:56 joerg Exp $ ---- common/UCvsFiles.cpp.orig 2002-08-13 13:46:40.000000000 +0200 +--- common/UCvsFiles.cpp.orig 2002-08-13 11:46:40.000000000 +0000 +++ common/UCvsFiles.cpp @@ -1214,7 +1214,7 @@ int UCvsFiles::OnCmdUpone(void) { @@ -20,3 +20,21 @@ $NetBSD: patch-af,v 1.1 2004/09/08 16:21 } else { +@@ -2017,7 +2017,7 @@ static int revcmp(const char *rev1, cons + char *tmp; + int v1, v2; + +- if((tmp = strchr(r1, '.')) != 0L) ++ if((tmp = strchr((char *)r1, '.')) != 0L) + { + tmp[0] = '\0'; + q1 = tmp + 1; +@@ -2025,7 +2025,7 @@ static int revcmp(const char *rev1, cons + + v1 = atoi(r1); + +- if((tmp = strchr(r2, '.')) != 0L) ++ if((tmp = strchr((char *)r2, '.')) != 0L) + { + tmp[0] = '\0'; + q2 = tmp + 1; Added files: Index: pkgsrc/devel/gcvs/patches/patch-common_AppGlue.cpp diff -u /dev/null pkgsrc/devel/gcvs/patches/patch-common_AppGlue.cpp:1.1 --- /dev/null Fri Apr 17 00:21:56 2020 +++ pkgsrc/devel/gcvs/patches/patch-common_AppGlue.cpp Fri Apr 17 00:21:56 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-common_AppGlue.cpp,v 1.1 2020/04/17 00:21:56 joerg Exp $ + +--- common/AppGlue.cpp.orig 2020-04-16 19:58:12.070945815 +0000 ++++ common/AppGlue.cpp +@@ -260,7 +260,7 @@ CVS_EXTERN_C const char *glue_getenv(cha + // extract from the cvsroot + const char *ccvsroot = gCvsPrefs; + ccvsroot = Authen::skiptoken(ccvsroot); +- char *login = strchr(ccvsroot, '@'); ++ const char *login = strchr(ccvsroot, '@'); + if(login == NULL) + { + // for WIN32 this means the CVSROOT is local Index: pkgsrc/devel/gcvs/patches/patch-common_CvsArgs.cpp diff -u /dev/null pkgsrc/devel/gcvs/patches/patch-common_CvsArgs.cpp:1.1 --- /dev/null Fri Apr 17 00:21:56 2020 +++ pkgsrc/devel/gcvs/patches/patch-common_CvsArgs.cpp Fri Apr 17 00:21:56 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-common_CvsArgs.cpp,v 1.1 2020/04/17 00:21:56 joerg Exp $ + +--- common/CvsArgs.cpp.orig 2020-04-16 19:55:52.305420243 +0000 ++++ common/CvsArgs.cpp +@@ -198,7 +198,7 @@ void CvsArgs::print(const char *indirect + { + CStr newarg; + newarg = argv[i]; +- bool hasLF = strchr(newarg, '\n') != 0L; ++ bool hasLF = strchr((const char *)newarg, '\n') != 0L; + size_t len = newarg.length(); + + if(len > MAX_PRINT_ARG) +@@ -207,7 +207,7 @@ void CvsArgs::print(const char *indirect + if(hasLF) + newarg = expandLF(newarg, buf); + +- bool hasSpace = strchr(newarg, ' ') != 0L; ++ bool hasSpace = strchr((const char *)newarg, ' ') != 0L; + if(hasSpace) + cvs_out("\""); + cvs_outstr(newarg, newarg.length()); Index: pkgsrc/devel/gcvs/patches/patch-common_TextBinary.cpp diff -u /dev/null pkgsrc/devel/gcvs/patches/patch-common_TextBinary.cpp:1.1 --- /dev/null Fri Apr 17 00:21:56 2020 +++ pkgsrc/devel/gcvs/patches/patch-common_TextBinary.cpp Fri Apr 17 00:21:56 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-common_TextBinary.cpp,v 1.1 2020/04/17 00:21:56 joerg Exp $ + +--- common/TextBinary.cpp.orig 2020-04-16 19:58:28.460381420 +0000 ++++ common/TextBinary.cpp +@@ -463,7 +463,7 @@ bool SplitPath(const char *dir, CStr & u + + void GetExtension(const char *file, CStr & base, CStr & ext) + { +- char *tmp = strrchr(file, '.'); ++ const char *tmp = strrchr(file, '.'); + + if(tmp == 0L) + { Index: pkgsrc/devel/gcvs/patches/patch-rf_umenu.cpp diff -u /dev/null pkgsrc/devel/gcvs/patches/patch-rf_umenu.cpp:1.1 --- /dev/null Fri Apr 17 00:21:56 2020 +++ pkgsrc/devel/gcvs/patches/patch-rf_umenu.cpp Fri Apr 17 00:21:56 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-rf_umenu.cpp,v 1.1 2020/04/17 00:21:56 joerg Exp $ + +--- rf/umenu.cpp.orig 2020-04-16 20:01:12.335654114 +0000 ++++ rf/umenu.cpp +@@ -254,7 +254,7 @@ static void GetMenuTitle(const char *nam + // get the accelerator + UStr copy(name); + char *tmp; +- if((tmp = strchr(copy, '\t')) != 0L) ++ if((tmp = strchr((char *)copy, '\t')) != 0L) + { + *tmp++ = '\0'; + if(strncmp(tmp, CTRLALT_STROKE, strlen(CTRLALT_STROKE)) == 0) +@@ -277,7 +277,7 @@ static void GetMenuTitle(const char *nam + + title = name; + #ifndef WIN32 +- if((tmp = strchr(title, '&')) != 0L) ++ if((tmp = strchr((char *)title, '&')) != 0L) + { + size_t l = tmp - (const char *)title; + memmove(&title[l], &title[l + 1], title.length() - l); --_----------=_1587082916150990--