diff options
author | Jim Meyering <meyering@redhat.com> | 2009-08-10 08:11:33 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2009-08-10 09:17:07 +0200 |
commit | e32320de66f0587f288803330ea5e09341297153 (patch) | |
tree | 62ac1010cc3559d6cb40cbdd31eefa6ad25c136d /src | |
parent | eb2f9e84b951001970c6d2f6524f070cfc251007 (diff) | |
download | coreutils-e32320de66f0587f288803330ea5e09341297153.tar.xz |
nl, pinky: replace uses of strcat
* src/nl.c (main): Avoid strcat, on principle. Use stpcpy instead.
* src/pinky.c (print_long_entry): Likewise.
Diffstat (limited to 'src')
-rw-r--r-- | src/nl.c | 6 | ||||
-rw-r--r-- | src/pinky.c | 12 |
2 files changed, 7 insertions, 11 deletions
@@ -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 25052367e..8ddd218fa 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) |