From 24cf7637edf3a2bf268a8e8a5cab92d950a8004a Mon Sep 17 00:00:00 2001 From: ayin Date: Mon, 7 Jan 2008 12:41:31 +0000 Subject: [PATCH] Replace strncpy with memcpy where appropriate. --- src/background.C | 4 ++-- src/misc.C | 2 +- src/rxvtfont.C | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/background.C b/src/background.C index 1ab6504a..9e3dab5a 100644 --- a/src/background.C +++ b/src/background.C @@ -276,7 +276,7 @@ bgPixmap_t::set_geometry (const char *geom) char *ops; new_flags |= geometrySet; - strncpy (str, geom, n); + memcpy (str, geom, n); str[n] = '\0'; if (str[0] == ':') ops = &str[0]; @@ -670,7 +670,7 @@ bgPixmap_t::set_file (const char *file) { size_t len = f - file; f = (char *)malloc (len + 1); - strncpy (f, file, len); + memcpy (f, file, len); f[len] = '\0'; original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); free (f); diff --git a/src/misc.C b/src/misc.C index 8e5a0f68..d589b895 100644 --- a/src/misc.C +++ b/src/misc.C @@ -287,7 +287,7 @@ rxvt_splitcommastring (const char *cs) NOTHROW for ( ; *t && *t != ','; t++) ; p = t - s; ret[l] = (char *)malloc (p + 1); - strncpy (ret[l], s, p); + memcpy (ret[l], s, p); ret[l][p] = '\0'; rxvt_strtrim (ret[l]); s = ++t; diff --git a/src/rxvtfont.C b/src/rxvtfont.C index 843dfddf..9aaaef83 100644 --- a/src/rxvtfont.C +++ b/src/rxvtfont.C @@ -633,7 +633,7 @@ replace_field (char **ptr, const char *name, int index, const char old, const ch { size_t len = field - name; *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); - strncpy (*ptr, name, len); + memcpy (*ptr, name, len); strcpy (*ptr + len, replace); strcat (*ptr, end); @@ -1534,7 +1534,7 @@ rxvt_fontset::add_fonts (const char *desc) if (end - desc < 511) { - strncpy (buf, desc, end - desc); + memcpy (buf, desc, end - desc); buf[end - desc] = 0; fonts.push_back (new_font (buf, cs)); -- 2.34.1