[src/trunk]: src/games/battlestar games/battlestar: Fix the -Werror=restrict ...

[fox <fox%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc9257d19cb0
branches:  trunk
changeset: 848674:dc9257d19cb0
user:      fox <fox%NetBSD.org@localhost>
date:      Wed Feb 05 20:11:54 2020 +0000

description:
games/battlestar: Fix the -Werror=restrict warning.

Replace strcpy(1) with the safer snprintf(3) which guarantees NULL
termination of strings.

Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.

Reviewed by: kamil@

diffstat:

 games/battlestar/parse.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 1dd1b6216cee -r dc9257d19cb0 games/battlestar/parse.c
--- a/games/battlestar/parse.c  Wed Feb 05 20:06:17 2020 +0000
+++ b/games/battlestar/parse.c  Wed Feb 05 20:11:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $   */
+/*     $NetBSD: parse.c,v 1.16 2020/02/05 20:11:54 fox Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c    8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: parse.c,v 1.16 2020/02/05 20:11:54 fox Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -120,7 +120,7 @@
                        for (i = n + 1; i < wordcount; i++) {
                                wordtype[i - 1] = wordtype[i];
                                wordvalue[i - 1] = wordvalue[i];
-                               strcpy(words[i - 1], words[i]);
+                               snprintf(words[i - 1], WORDLEN, "%s", words[i]);
                        }
                        wordcount--;
                }
@@ -140,7 +140,7 @@
                        for (i = n + 1; i < wordcount; i++) {
                                wordtype[i - 1] = wordtype[i];
                                wordvalue[i - 1] = wordvalue[i];
-                               strcpy(words[i - 1], words[i]);
+                               snprintf(words[i - 1], WORDLEN, "%s", words[i]);
                        }
                        wordcount--;
                }
@@ -164,7 +164,7 @@
                                wordtype[n + 1] = wordtype[n - 1];
                                wordtype[n - 1] = OBJECT;
                                strcpy(tmpword, words[n - 1]);
-                               strcpy(words[n - 1], words[n + 1]);
+                               snprintf(words[n - 1], WORDLEN, "%s", words[n + 1]);
                                strcpy(words[n + 1], tmpword);
                                flag = 1;
                }
@@ -177,7 +177,7 @@
                                for (i = n + 1; i < wordcount; i++) {
                                        wordtype[i - 1] = wordtype[i + 1];
                                        wordvalue[i - 1] = wordvalue[i + 1];
-                                       strcpy(words[i - 1], words[i + 1]);
+                                       snprintf(words[i - 1], WORDLEN, "%s", words[i + 1]);
                                }
                                wordcount--;
                                wordcount--;