pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-11 20:50:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20090430 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-08 20:08:57 -05:00
parent d0ca35030a
commit 414f1864e0
6 changed files with 1247 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/glob/glob.c
+4 -7
View File
@@ -665,8 +665,9 @@ glob_vector (pat, dir, flags)
(void) closedir (d);
}
/* compat: if GX_ALLDIRS, add the passed directory also */
if (add_current)
/* compat: if GX_ALLDIRS, add the passed directory also, but don't add an
empty directory name. */
if (add_current && (flags & GX_NULLDIR) == 0)
{
sdlen = strlen (dir);
nextname = (char *)malloc (sdlen + 1);
@@ -678,10 +679,7 @@ glob_vector (pat, dir, flags)
nextlink->name = nextname;
nextlink->next = lastlink;
lastlink = nextlink;
if (flags & GX_NULLDIR)
nextname[0] = '\0';
else
bcopy (dir, nextname, sdlen + 1);
bcopy (dir, nextname, sdlen + 1);
++count;
}
}
@@ -941,7 +939,6 @@ glob_filename (pathname, flags)
{
char **array;
register unsigned int l;
int free_array;
/* If we're expanding **, we don't need to glue the directory
name to the results; we've already done it in glob_vector */
lib/readline/text.c
+11 -7
View File
@@ -67,6 +67,10 @@ static int _rl_insert_next_callback PARAMS((_rl_callback_generic_arg *));
static int _rl_char_search_callback PARAMS((_rl_callback_generic_arg *));
#endif
/* The largest chunk of text that can be inserted in one call to
rl_insert_text. Text blocks larger than this are divided. */
#define TEXT_COUNT_MAX 1024
/* **************************************************************** */
/* */
/* Insert and Delete */
@@ -707,7 +711,7 @@ _rl_insert_char (count, c)
/* If we can optimize, then do it. But don't let people crash
readline because of extra large arguments. */
if (count > 1 && count <= 1024)
if (count > 1 && count <= TEXT_COUNT_MAX)
{
#if defined (HANDLE_MULTIBYTE)
string_size = count * incoming_length;
@@ -735,11 +739,11 @@ _rl_insert_char (count, c)
return 0;
}
if (count > 1024)
if (count > TEXT_COUNT_MAX)
{
int decreaser;
#if defined (HANDLE_MULTIBYTE)
string_size = incoming_length * 1024;
string_size = incoming_length * TEXT_COUNT_MAX;
string = (char *)xmalloc (1 + string_size);
i = 0;
@@ -751,7 +755,7 @@ _rl_insert_char (count, c)
while (count)
{
decreaser = (count > 1024) ? 1024 : count;
decreaser = (count > TEXT_COUNT_MAX) ? TEXT_COUNT_MAX : count;
string[decreaser*incoming_length] = '\0';
rl_insert_text (string);
count -= decreaser;
@@ -761,14 +765,14 @@ _rl_insert_char (count, c)
incoming_length = 0;
stored_count = 0;
#else /* !HANDLE_MULTIBYTE */
char str[1024+1];
char str[TEXT_COUNT_MAX+1];
for (i = 0; i < 1024; i++)
for (i = 0; i < TEXT_COUNT_MAX; i++)
str[i] = c;
while (count)
{
decreaser = (count > 1024 ? 1024 : count);
decreaser = (count > TEXT_COUNT_MAX ? TEXT_COUNT_MAX : count);
str[decreaser] = '\0';
rl_insert_text (str);
count -= decreaser;