commit bash-20091119 snapshot

This commit is contained in:
Chet Ramey
2011-12-08 20:21:07 -05:00
parent e6062848eb
commit cd0ef72721
28 changed files with 2754 additions and 288 deletions
+1 -1
View File
@@ -1030,7 +1030,7 @@ glob_filename (pathname, flags)
dflags |= GX_ALLDIRS|GX_ADDCURDIR;
#if 0
/* If we want all directories (dflags & GX_ALLDIRS) and we're not
being called recursively as something like `echo **/*.o'
being called recursively as something like `echo [star][star]/[star].o'
((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from
adding a null directory name to the front of the temp_results
array. We turn off ADDCURDIR if not called recursively and
+2
View File
@@ -517,7 +517,9 @@ prepare_terminal_settings (meta_flag, oldtio, tiop)
TIOTYPE oldtio, *tiop;
{
_rl_echoing_p = (oldtio.c_lflag & ECHO);
#if defined (ECHOCTL)
_rl_echoctl = (oldtio.c_lflag & ECHOCTL);
#endif
tiop->c_lflag &= ~(ICANON | ECHO);
+8 -5
View File
@@ -65,6 +65,9 @@
#if defined(DEBUG) && !defined (MACOSX)
# undef HAVE_SNPRINTF
# undef HAVE_ASPRINTF
# define HAVE_SNPRINTF 0
# define HAVE_ASPRINTF 0
#endif
#if defined(DRIVER) && !defined(HAVE_CONFIG_H)
@@ -83,7 +86,7 @@
#define intmax_t long
#endif
#if !defined (HAVE_SNPRINTF) || !defined (HAVE_ASPRINTF)
#if !HAVE_SNPRINTF || !HAVE_ASPRINTF
#include <bashtypes.h>
@@ -1641,7 +1644,7 @@ dfallback (data, fs, fe, d)
}
#endif /* FLOATING_POINT */
#ifndef HAVE_SNPRINTF
#if !HAVE_SNPRINTF
int
#if defined (__STDC__)
@@ -1691,7 +1694,7 @@ snprintf(string, length, format, va_alist)
#endif /* HAVE_SNPRINTF */
#ifndef HAVE_ASPRINTF
#if !HAVE_ASPRINTF
int
#if defined (__STDC__)
@@ -1736,9 +1739,9 @@ asprintf(stringp, format, va_alist)
return rval;
}
#endif
#endif /* !HAVE_ASPRINTF */
#endif
#endif /* !HAVE_SNPRINTF || !HAVE_ASPRINTF */
#ifdef DRIVER
+13 -5
View File
@@ -62,9 +62,12 @@
#endif
/* GCC 4.2 on Snow Leopard doesn't like the snprintf prototype */
#if defined(DEBUG) /* && !defined (MACOSX) */
#if defined(DEBUG) && !defined (MACOSX)
# undef HAVE_SNPRINTF
# undef HAVE_ASPRINTF
# define HAVE_SNPRINTF 0
# define HAVE_ASPRINTF 0
#endif
#if defined(DRIVER) && !defined(HAVE_CONFIG_H)
@@ -83,7 +86,7 @@
#define intmax_t long
#endif
#if !defined (HAVE_SNPRINTF) || !defined (HAVE_ASPRINTF)
#if !HAVE_SNPRINTF || !HAVE_ASPRINTF
#include <bashtypes.h>
@@ -1641,7 +1644,7 @@ dfallback (data, fs, fe, d)
}
#endif /* FLOATING_POINT */
#ifndef HAVE_SNPRINTF
#if !HAVE_SNPRINTF
int
#if defined (__STDC__)
@@ -1691,7 +1694,7 @@ snprintf(string, length, format, va_alist)
#endif /* HAVE_SNPRINTF */
#ifndef HAVE_ASPRINTF
#if !HAVE_ASPRINTF
int
#if defined (__STDC__)
@@ -1736,8 +1739,13 @@ asprintf(stringp, format, va_alist)
return rval;
}
#endif
#endif /* HAVE_ASPRINTF */
static void
fake_snprintf_asprintf_symbol()
{
;
}
#endif
#ifdef DRIVER