summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-11-06 00:43:09 +0000
committerUlrich Drepper <drepper@redhat.com>1997-11-06 00:43:09 +0000
commitd378e4204d643dc5ee5d6439dc80aae5ffc0119b (patch)
treea55006f8098266bc5756c724b7294f96a6ffd338
parente7e9b799c4775c0591786b4053e89dbcbd1f5beb (diff)
downloadgunmake-d378e4204d643dc5ee5d6439dc80aae5ffc0119b.tar.gz
automatically generated from GPLed version
-rw-r--r--getopt.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/getopt.c b/getopt.c
index 570cb9d..2d3f3b6 100644
--- a/getopt.c
+++ b/getopt.c
@@ -331,9 +331,9 @@ exchange (argv)
nonoption_flags_len = nonoption_flags_max_len = 0;
else
{
- memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
- memset (&new_str[nonoption_flags_max_len], '\0',
- top + 1 - nonoption_flags_max_len);
+ memset (__mempcpy (new_str, __getopt_nonoption_flags,
+ nonoption_flags_max_len),
+ '\0', top + 1 - nonoption_flags_max_len);
nonoption_flags_max_len = top + 1;
__getopt_nonoption_flags = new_str;
}
@@ -442,11 +442,8 @@ _getopt_initialize (argc, argv, optstring)
if (__getopt_nonoption_flags == NULL)
nonoption_flags_max_len = -1;
else
- {
- memcpy (__getopt_nonoption_flags, orig_str, len);
- memset (&__getopt_nonoption_flags[len], '\0',
- nonoption_flags_max_len - len);
- }
+ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+ '\0', nonoption_flags_max_len - len);
}
}
nonoption_flags_len = nonoption_flags_max_len;