From: Jim Meyering <meyering@fb.com>
Date: Mon, 19 Mar 2018 04:32:19 +0000 (-0700)
Subject: maint: avoid -Wstringop-truncation warnings from upcoming GCC8
X-Git-Tag: release_1_31~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a0242582f134c9994bbad77a57f64d388cf9e19;p=thirdparty%2Ftar.git

maint: avoid -Wstringop-truncation warnings from upcoming GCC8

* src/create.c (start_private_header, start_header): Convert
trivial uses of strncpy to memcpy, to avoid warnings like this:
In function 'strncpy',
    inlined from 'start_private_header' at create.c:522:3:
/usr/include/bits/string_fortified.h:106:10: warning: \
  '__builtin_strncpy' output truncated before terminating nul \
  copying 2 bytes from a string of the same length \
  [-Wstringop-truncation]
---

diff --git a/src/create.c b/src/create.c
index 35bcf5b0..7737c524 100644
--- a/src/create.c
+++ b/src/create.c
@@ -518,8 +518,8 @@ start_private_header (const char *name, size_t size, time_t t)
   MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode);
   UID_TO_CHARS (0, header->header.uid);
   GID_TO_CHARS (0, header->header.gid);
-  strncpy (header->header.magic, TMAGIC, TMAGLEN);
-  strncpy (header->header.version, TVERSION, TVERSLEN);
+  memcpy (header->header.magic, TMAGIC, TMAGLEN);
+  memcpy (header->header.version, TVERSION, TVERSLEN);
   return header;
 }
 
@@ -917,8 +917,8 @@ start_header (struct tar_stat_info *st)
 
     case POSIX_FORMAT:
     case USTAR_FORMAT:
-      strncpy (header->header.magic, TMAGIC, TMAGLEN);
-      strncpy (header->header.version, TVERSION, TVERSLEN);
+      memcpy (header->header.magic, TMAGIC, TMAGLEN);
+      memcpy (header->header.version, TVERSION, TVERSLEN);
       break;
 
     default: