RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac sftp.c openbsd-compat/openbsd-compat.h] Cater for 

platforms that don't have multibyte character support (specifically,
    mblen).
This commit is contained in:
Darren Tucker 2013-06-06 08:30:20 +10:00
parent 408eaf3ab7
commit ae133d4b31
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -46,6 +46,9 @@
- dtucker@cvs.openbsd.org 2013/06/05 22:00:28 - dtucker@cvs.openbsd.org 2013/06/05 22:00:28
[readconf.c] [readconf.c]
plug another memleak. bz#1967, from Zhenbo Xu, detected by Melton, ok djm plug another memleak. bz#1967, from Zhenbo Xu, detected by Melton, ok djm
- (dtucker) [configure.ac sftp.c openbsd-compat/openbsd-compat.h] Cater for
platforms that don't have multibyte character support (specifically,
mblen).
20130602 20130602
- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy

6
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.533 2013/06/04 02:55:24 dtucker Exp $ # $Id: configure.ac,v 1.534 2013/06/05 22:30:21 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.533 $) AC_REVISION($Revision: 1.534 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -310,6 +310,7 @@ AC_CHECK_HEADERS([ \
ia.h \ ia.h \
iaf.h \ iaf.h \
limits.h \ limits.h \
locale.h \
login.h \ login.h \
maillock.h \ maillock.h \
ndir.h \ ndir.h \
@ -1563,6 +1564,7 @@ AC_CHECK_FUNCS([ \
inet_ntop \ inet_ntop \
innetgr \ innetgr \
login_getcapbool \ login_getcapbool \
mblen \
md5_crypt \ md5_crypt \
memmove \ memmove \
mkdtemp \ mkdtemp \

7
openbsd-compat/openbsd-compat.h
View File

@ -1,4 +1,4 @@
/* $Id: openbsd-compat.h,v 1.57 2013/05/16 10:47:32 dtucker Exp $ */ /* $Id: openbsd-compat.h,v 1.58 2013/06/05 22:30:21 dtucker Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -207,6 +207,11 @@ unsigned long long strtoull(const char *, char **, int);
long long strtonum(const char *, long long, long long, const char **); long long strtonum(const char *, long long, long long, const char **);
#endif #endif
/* multibyte character support */
#ifndef HAVE_MBLEN
# define mblen(x, y) 1
#endif
#if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF) #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
# include <stdarg.h> # include <stdarg.h>
#endif #endif

4
sftp.c
View File

@ -38,7 +38,9 @@
#ifdef HAVE_LIBGEN_H #ifdef HAVE_LIBGEN_H
#include <libgen.h> #include <libgen.h>
#endif #endif
#include <locale.h> #ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
#ifdef USE_LIBEDIT #ifdef USE_LIBEDIT
#include <histedit.h> #include <histedit.h>
#else #else