From 4bc554bb8b46d9b47bb847a72bb5c0226d54b8e5 Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Thu, 5 Mar 2015 01:48:34 +0900 Subject: 34636: replace broken isprint() on Mac OS X --- Src/compat.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Src/compat.c') diff --git a/Src/compat.c b/Src/compat.c index b0bcb6265..09b3d6a5f 100644 --- a/Src/compat.c +++ b/Src/compat.c @@ -951,3 +951,18 @@ int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) /**/ #endif /* BROKEN_WCWIDTH && (__STDC_ISO_10646__ || __APPLE__) */ +/**/ +#if defined(__APPLE__) && defined(BROKEN_ISPRINT) + +/**/ +int +isprint_ascii(int c) +{ + if (!strcmp(nl_langinfo(CODESET), "UTF-8")) + return (c >= 0x20 && c <= 0x7e); + else + return isprint(c); +} + +/**/ +#endif /* __APPLE__ && BROKEN_ISPRINT */ -- cgit v1.2.3 From 89a689e69376909265d94ad8c2119d607ef7cb3d Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sat, 25 Apr 2015 10:48:43 -0700 Subject: 34961: replace a couple of free() with zfree() for consistency --- ChangeLog | 3 +++ Src/compat.c | 2 +- Src/init.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'Src/compat.c') diff --git a/ChangeLog b/ChangeLog index cd6637c86..a76808be2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-04-25 Barton E. Schaefer + * 34961: Src/compat.c, Src/init.c: replace a couple of free() with + zfree() for consistency. + * 34961: Completion/Base/Completer/_expand: add backslash to alias expansion matching (related to workers/32186) diff --git a/Src/compat.c b/Src/compat.c index 09b3d6a5f..b3a8b063c 100644 --- a/Src/compat.c +++ b/Src/compat.c @@ -443,7 +443,7 @@ zgetcwd(void) ret = getcwd(cwdbuf, PATH_MAX); if (ret) ret = dupstring(ret); - free(cwdbuf); + zfree(cwdbuf, PATH_MAX); #endif /* GETCWD_CALLS_MALLOC */ } #endif /* HAVE_GETCWD */ diff --git a/Src/init.c b/Src/init.c index 3e41fb9dd..102276a64 100644 --- a/Src/init.c +++ b/Src/init.c @@ -1409,7 +1409,7 @@ source(char *s) retflag = 0; scriptname = old_scriptname; scriptfilename = old_scriptfilename; - free(cmdstack); + zfree(cmdstack, CMDSTACKSZ); cmdstack = ocs; cmdsp = ocsp; -- cgit v1.2.3