From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 4C037384241E; Fri, 7 Aug 2020 13:16:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C037384241E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: utils: cygcheck: avoid GCC warning concatenating strings X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 238c2b14ca3cd7cc785e67846cce63380b4679ae X-Git-Newrev: 9beb7b977162bd576da325ce8e23152e70989f78 Message-Id: <20200807131624.4C037384241E@sourceware.org> Date: Fri, 7 Aug 2020 13:16:24 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2020 13:16:24 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9beb7b977162bd576da325ce8e23152e70989f78 commit 9beb7b977162bd576da325ce8e23152e70989f78 Author: Corinna Vinschen Date: Fri Aug 7 13:30:40 2020 +0200 Cygwin: utils: cygcheck: avoid GCC warning concatenating strings Signed-off-by: Corinna Vinschen Diff: --- winsup/utils/dump_setup.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index 4415954f9..ec70da0db 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -77,11 +77,15 @@ parse_filename (const char *in_fn, fileparse& f) else if (strcasecmp (ver, "-src") == 0 || strcasecmp (ver, "-patch") == 0) { + size_t len; + *ver++ = '\0'; strcpy (f.pkg, p); strcpy (f.what, strlwr (ver)); strcpy (f.pkgtar, p); - strcat (f.pkgtar, f.tail); + len = strlen (f.pkgtar); + strncpy (f.pkgtar + len, f.tail, sizeof (f.pkgtar) - len); + f.pkgtar[MAX_PATH] = '\0'; ver = strchr (ver, '\0'); break; }