vim: src/os_mswin.c comparison

updated for version 7.0109

comparison

equal deleted inserted replaced

-:3da34f87c760
+:8f41fe56e2fc
 	    if (wname != NULL && _wfullpath(wbuf, wname, MAX_PATH - 1) != NULL)
 	    {
 		cname = ucs2_to_enc((short_u *)wbuf, NULL);
 		if (cname != NULL)
 		{
-		    STRNCPY(buf, cname, len);
+		    vim_strncpy(buf, cname, len - 1);
-		    buf[len - 1] = NUL;
 		    nResult = OK;
 		}
 	    }
 	    vim_free(wname);
 	    vim_free(cname);
 	if (nResult == FAIL)	    /* fall back to non-wide function */
 #endif
 	{
 	    if (_fullpath(buf, fname, len - 1) == NULL)
 	    {
-		STRNCPY(buf, fname, len);   /* failed, use relative path name */
+		/* failed, use relative path name */
-		buf[len - 1] = NUL;
+		vim_strncpy(buf, fname, len - 1);
 	    }
 	    else
 		nResult = OK;
 	}
 }
 vim_stat(const char *name, struct stat *stp)
 {
 char	buf[_MAX_PATH + 1];
 char	*p;
-STRNCPY(buf, name, _MAX_PATH);
+vim_strncpy(buf, name, _MAX_PATH);
-buf[_MAX_PATH] = NUL;
 p = buf + strlen(buf);
 if (p > buf)
 	mb_ptr_back(buf, p);
 if (p > buf && (*p == '\\' || *p == '/') && p[-1] != ':')
 	*p = NUL;
 {
 	LPSTR lpszMem = (LPSTR)GlobalLock(hMem);
 	if (lpszMem)
 	{
-	    STRNCPY(lpszMem, str, metadata.txtlen);
+	    vim_strncpy(lpszMem, str, metadata.txtlen);
-	    lpszMem[metadata.txtlen] = NUL;
 	    GlobalUnlock(hMem);
 	}
 }
 /* Set up metadata: */

Mercurial > vim