From: Jim Meyering <meyering@redhat.com>
Date: Mon, 10 Aug 2009 06:11:33 +0000 (+0200)
Subject: nl, pinky: replace uses of strcat
X-Git-Tag: v7.5~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e32320de66f0587f288803330ea5e09341297153;p=thirdparty%2Fcoreutils.git

nl, pinky: replace uses of strcat

* src/nl.c (main): Avoid strcat, on principle.  Use stpcpy instead.
* src/pinky.c (print_long_entry): Likewise.
---

diff --git a/src/nl.c b/src/nl.c
index 56d5a3998c..2deb314a45 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 25052367e4..8ddd218fae 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)