diff options
| author | Anurag Shekhar <anurag.shekhar@sun.com> | 2009-08-31 13:02:31 +0530 |
|---|---|---|
| committer | Anurag Shekhar <anurag.shekhar@sun.com> | 2009-08-31 13:02:31 +0530 |
| commit | 9b97856d82dfcded3c317729e1cd48966e7ae0a0 (patch) | |
| tree | 9825757a345c9b7a8d1ef3beb7fb3399b6b5951b /cmd-line-utils/readline/bind.c | |
| parent | 90032c100751d4a864f371dd451fda7d8b12022d (diff) | |
| parent | 2217de25139f5994fc1c5c71f897ff0788813db0 (diff) | |
| download | mariadb-git-9b97856d82dfcded3c317729e1cd48966e7ae0a0.tar.gz | |
merging with changes in bugteam branch.
Diffstat (limited to 'cmd-line-utils/readline/bind.c')
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index aa5bd3d829a..85f6b432bf8 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -339,9 +339,7 @@ rl_generic_bind (type, keyseq, data, map) char *keys; int keys_len; register int i; - KEYMAP_ENTRY k; - - k.function = 0; + KEYMAP_ENTRY k= { 0, NULL }; /* If no keys to bind to, exit right away. */ if (keyseq == 0 || *keyseq == 0) @@ -776,7 +774,7 @@ _rl_read_file (filename, sizep) file_size = (size_t)finfo.st_size; /* check for overflow on very large files */ -if ((sizeof(off_t) > sizeof(size_t) && finfo.st_size > (off_t)(size_t)~0) || + if ((sizeof(off_t) > sizeof(size_t) && finfo.st_size > (off_t)(size_t)~0) || file_size + 1 < file_size) { if (file >= 0) |