pamper gcc 8.3.0

mintty · May 24, 2019 · f7df4adf1775638b2aa75defb01822c0c21d6bcd · f7df4ad
1 parent 09c906a
commit f7df4adf1775638b2aa75defb01822c0c21d6bcd
Unified Split

Showing with 7 additions and 3 deletions.

+3 −1 src/child.c

+4 −2 src/winclip.c
diff --git a/src/child.c b/src/child.c
@@ -356,7 +356,9 @@ child_create(char *argv[], struct winsize *winp)
           dev += 3;
         else if (!strncmp(dev, "pts/", 4))
           dev += 4;
-        strncpy(ut.ut_id, dev, sizeof ut.ut_id);
+        //strncpy(ut.ut_id, dev, sizeof ut.ut_id);
+        for (uint i = 0; i < sizeof ut.ut_id && *dev; i++)
+          ut.ut_id[i] = *dev++;
 
         ut.ut_type = USER_PROCESS;
         ut.ut_pid = pid;

diff --git a/src/winclip.c b/src/winclip.c
@@ -860,7 +860,8 @@ buf_path(wchar * wfn)
         else if (strncmp(p, "/cygdrive/", 10) == 0) {
           // convert /cygdrive/X/path referring to mounted drive
           p += 5;
-          strncpy(p, "/mnt", 4);
+          //strncpy(p, "/mnt", 4);
+          memcpy(p, "/mnt", 4);
         }
       }
       else {
@@ -910,7 +911,8 @@ buf_path(wchar * wfn)
           p = mp;
         else if (strncmp(p, "/cygdrive/", 10) == 0) {
           p += 5;
-          strncpy(p, "/mnt", 4);
+          //strncpy(p, "/mnt", 4);
+          memcpy(p, "/mnt", 4);
         }
       }
     }