diff options
| author | Rob Landley | 2005-08-13 00:26:01 +0000 |
|---|---|---|
| committer | Rob Landley | 2005-08-13 00:26:01 +0000 |
| commit | fc455b2101edbf97331384831de2989ce9cdb731 (patch) | |
| tree | 521f09b4ca5cb42280e51c7618930ea4f0e68dfb /busybox/shell/cmdedit.c | |
| parent | 365a345e92c25c60c977aa1596e31a1e6b9cea80 (diff) | |
| download | busybox-fc455b2101edbf97331384831de2989ce9cdb731.zip busybox-fc455b2101edbf97331384831de2989ce9cdb731.tar.gz | |
1.0 backports of:
10861, 10875, 10881, 10888 ash fix
10865 suid thing? (look at this)
10886 telnet bugfix
10866 ftp fix for RFC 959 compliance.
10867 Remove spurious newline from cp -i prompt.
10874 ksyslogd fix
10876 msh fix
10877 httpd fix
10880, 10889, 11005 dhcp fixes
Diffstat (limited to 'busybox/shell/cmdedit.c')
| -rw-r--r-- | busybox/shell/cmdedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/busybox/shell/cmdedit.c b/busybox/shell/cmdedit.c index 56b789a..3380dff 100644 --- a/busybox/shell/cmdedit.c +++ b/busybox/shell/cmdedit.c @@ -782,8 +782,8 @@ static int match_compare(const void *a, const void *b) #define QUOT (UCHAR_MAX+1) #define collapse_pos(is, in) { \ - memcpy(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \ - memcpy(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); } + memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \ + memmove(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); } static int find_match(char *matchBuf, int *len_with_quotes) { |