[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] maint: s/strncpy/memcpy/, when equivalent
From: |
Jim Meyering |
Subject: |
[PATCH 1/3] maint: s/strncpy/memcpy/, when equivalent |
Date: |
Thu, 3 May 2012 23:18:29 +0200 |
From: Jim Meyering <address@hidden>
* src/output.c (output_skeleton): Use memcpy, not strncpy,
since the source is known to fit in the destination buffer.
* src/parse-gram.y (%skeleton): Likewise.
* src/parse-gram.c: Likewise.
---
src/output.c | 2 +-
src/parse-gram.c | 2 +-
src/parse-gram.y | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/output.c b/src/output.c
index 08922bc..95ad5da 100644
--- a/src/output.c
+++ b/src/output.c
@@ -589,7 +589,7 @@ output_skeleton (void)
full_skeleton = xmalloc (pkgdatadirlen + 1
+ (skeleton_size < sizeof m4sugar
? sizeof m4sugar : skeleton_size));
- strncpy (full_skeleton, pkgdatadir, pkgdatadirlen);
+ memcpy (full_skeleton, pkgdatadir, pkgdatadirlen);
full_skeleton[pkgdatadirlen] = '/';
strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
full_m4sugar = xstrdup (full_skeleton);
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 024da72..7125d12 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -2435,7 +2435,7 @@ yyreduce:
xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
if (dir_length > 0)
{
- strncpy (skeleton_build, current_file, dir_length);
+ memcpy (skeleton_build, current_file, dir_length);
skeleton_build[dir_length++] = '/';
}
strcpy (skeleton_build + dir_length, skeleton_user);
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 532349b..2cf436b 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -353,7 +353,7 @@ prologue_declaration:
xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
if (dir_length > 0)
{
- strncpy (skeleton_build, current_file, dir_length);
+ memcpy (skeleton_build, current_file, dir_length);
skeleton_build[dir_length++] = '/';
}
strcpy (skeleton_build + dir_length, skeleton_user);
--
1.7.10.1.433.g34875f4
- nuke strncpy, Jim Meyering, 2012/05/03
- [PATCH 1/3] maint: s/strncpy/memcpy/, when equivalent,
Jim Meyering <=
- [PATCH 3/3] maint: regen src/parse-gram.[ch], Jim Meyering, 2012/05/03
- [PATCH 2/3] maint: simplify parse-gram.y, Jim Meyering, 2012/05/03
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Akim Demaille, 2012/05/04
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Jim Meyering, 2012/05/04
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Jim Meyering, 2012/05/05
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Akim Demaille, 2012/05/06
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Jim Meyering, 2012/05/06
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Akim Demaille, 2012/05/06
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Jim Meyering, 2012/05/06
- Re: [PATCH 2/3] maint: simplify parse-gram.y, Akim Demaille, 2012/05/09