>From e32320de66f0587f288803330ea5e09341297153 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyer...@redhat.com> Date: Mon, 10 Aug 2009 08:11:33 +0200 Subject: [PATCH] nl, pinky: replace uses of strcat
* src/nl.c (main): Avoid strcat, on principle. Use stpcpy instead. * src/pinky.c (print_long_entry): Likewise. --- src/nl.c | 6 +++--- src/pinky.c | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/nl.c b/src/nl.c index 56d5a39..2deb314 100644 --- a/src/nl.c +++ b/src/nl.c @@ -577,15 +577,15 @@ main (int argc, char **argv) header_del_len = len * 3; header_del = xmalloc (header_del_len + 1); - strcat (strcat (strcpy (header_del, section_del), section_del), section_del); + stpcpy (stpcpy (stpcpy (header_del, section_del), section_del), section_del); body_del_len = len * 2; body_del = xmalloc (body_del_len + 1); - strcat (strcpy (body_del, section_del), section_del); + stpcpy (stpcpy (body_del, section_del), section_del); footer_del_len = len; footer_del = xmalloc (footer_del_len + 1); - strcpy (footer_del, section_del); + stpcpy (footer_del, section_del); /* Initialize the input buffer. */ initbuffer (&line_buf); diff --git a/src/pinky.c b/src/pinky.c index 2505236..8ddd218 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -363,10 +363,8 @@ print_long_entry (const char name[]) char buf[1024]; const char *const baseproject = "/.project"; char *const project = - xmalloc (strlen (pw->pw_dir) + strlen (baseproject) + 1); - - strcpy (project, pw->pw_dir); - strcat (project, baseproject); + xmalloc (strlen (pw->pw_dir) + strlen (baseproject) + 1); + stpcpy (stpcpy (project, pw->pw_dir), baseproject); stream = fopen (project, "r"); if (stream) @@ -389,10 +387,8 @@ print_long_entry (const char name[]) char buf[1024]; const char *const baseplan = "/.plan"; char *const plan = - xmalloc (strlen (pw->pw_dir) + strlen (baseplan) + 1); - - strcpy (plan, pw->pw_dir); - strcat (plan, baseplan); + xmalloc (strlen (pw->pw_dir) + strlen (baseplan) + 1); + stpcpy (stpcpy (plan, pw->pw_dir), baseplan); stream = fopen (plan, "r"); if (stream) -- 1.6.4.284.g34125