List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:April 18 2011 7:26am
Subject:Re: bzr commit into mysql-trunk branch (nirbhay.choubey:3327) Bug#49967
View as plain text  
Hi Jonathan,

I have committed the changeset for the updated libedit package.
Can you (or somebody from you team) please verify a couple
of additions marked below, for suitability on all supported platforms?

Best Regards,
Nirbhay

The entire delta can be found here :

http://lists.mysql.com/commits/135581

On Sunday 17 April 2011 07:10 PM, Nirbhay Choubey wrote:
> #At file:///home/nirbhay/Project/mysql/repo/libedit/mysql-trunk.new/ based on
> revid:bjorn.munch@stripped
>
>   3327 Nirbhay Choubey	2011-04-17
>        Upgraded libedit to the latest version alongwith
>        fix or bug#49967.
>
>      added:
>        cmd-line-utils/libedit/chartype.c
>        cmd-line-utils/libedit/chartype.h
>        cmd-line-utils/libedit/eln.c
>      modified:
>        cmake/os/WindowsCache.cmake
>        cmd-line-utils/libedit/README
>        cmd-line-utils/libedit/chared.c
>        cmd-line-utils/libedit/chared.h
>        cmd-line-utils/libedit/common.c
>        cmd-line-utils/libedit/el.c
>        cmd-line-utils/libedit/el.h
>        cmd-line-utils/libedit/el_term.h
>        cmd-line-utils/libedit/emacs.c
>        cmd-line-utils/libedit/filecomplete.c
>        cmd-line-utils/libedit/filecomplete.h
>        cmd-line-utils/libedit/hist.c
>        cmd-line-utils/libedit/hist.h
>        cmd-line-utils/libedit/histedit.h
>        cmd-line-utils/libedit/history.c
>        cmd-line-utils/libedit/key.c
>        cmd-line-utils/libedit/key.h
>        cmd-line-utils/libedit/makelist.sh
>        cmd-line-utils/libedit/map.c
>        cmd-line-utils/libedit/map.h
>        cmd-line-utils/libedit/np/strlcat.c
>        cmd-line-utils/libedit/np/strlcpy.c
>        cmd-line-utils/libedit/np/unvis.c
>        cmd-line-utils/libedit/np/vis.c
>        cmd-line-utils/libedit/np/vis.h
>        cmd-line-utils/libedit/parse.c
>        cmd-line-utils/libedit/parse.h
>        cmd-line-utils/libedit/prompt.c
>        cmd-line-utils/libedit/prompt.h
>        cmd-line-utils/libedit/read.c
>        cmd-line-utils/libedit/read.h
>        cmd-line-utils/libedit/readline.c
>        cmd-line-utils/libedit/readline/readline.h
>        cmd-line-utils/libedit/refresh.c
>        cmd-line-utils/libedit/refresh.h
>        cmd-line-utils/libedit/search.c
>        cmd-line-utils/libedit/search.h
>        cmd-line-utils/libedit/sig.c
>        cmd-line-utils/libedit/sig.h
>        cmd-line-utils/libedit/sys.h
>        cmd-line-utils/libedit/term.c
>        cmd-line-utils/libedit/tokenizer.c
>        cmd-line-utils/libedit/tty.c
>        cmd-line-utils/libedit/tty.h
>        cmd-line-utils/libedit/vi.c
>        config.h.cmake
>        configure.cmake
> === modified file 'cmake/os/WindowsCache.cmake'
> --- a/cmake/os/WindowsCache.cmake	2011-04-13 19:16:45 +0000
> +++ b/cmake/os/WindowsCache.cmake	2011-04-17 13:40:20 +0000
> @@ -104,6 +104,10 @@ ENDIF()
>   SET(HAVE_ISINF CACHE  INTERNAL "")
>   SET(HAVE_ISNAN CACHE  INTERNAL "")
>   SET(HAVE_ISSETUGID CACHE  INTERNAL "")
> +SET(HAVE_GETUID CACHE  INTERNAL "")
> +SET(HAVE_GETEUID CACHE  INTERNAL "")
> +SET(HAVE_GETGID CACHE  INTERNAL "")
> +SET(HAVE_GETEGID CACHE  INTERNAL "")
>   SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
>   SET(HAVE_LDIV 1 CACHE  INTERNAL "")
>   SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
^^^
I believe, we add this to avoid these checks on Windows platform.

> === modified file 'cmd-line-utils/libedit/README'
> --- a/cmd-line-utils/libedit/README	2009-04-30 11:53:30 +0000
> +++ b/cmd-line-utils/libedit/README	2011-04-17 13:40:20 +0000
> @@ -2,7 +2,7 @@ An approximate method to merge from upst
>
>   	# Fetch latest from upstream (we also include some compat stuff)
>   	$ CVS_RSH=ssh; export CVS_RSH
> -	$ CVSROOT="anoncvs@stripped:/cvsroot"
> +	$ CVSROOT="anoncvs@stripped:/cvsroot"
>   	$ cvs co -d libedit -P src/lib/libedit
>   	$ mkdir libedit/np
>   	$ for f in src/common/lib/libc/string/strlcat.c \
> @@ -46,5 +46,5 @@ a 'clean' diff against upstream you can
>
>   to fetch the baseline of most recent merge.
>
> -Please feed any fixes to Jonathan Perkin<jperkin@stripped>  who will
> endeavour
> -to merge them upstream and keep diffs minimal.
> +Please feed any fixes to Jonathan Perkin<jonathan.perkin@stripped>  who
> will

Modified your email ID in README file.

And, I think we need to make a modification in the date too (from README):

     " To generate
     a 'clean' diff against upstream you can use the above commands but use

         cvs co -D "2009/02/06 20:09:00" [..]

     to fetch the baseline of most recent merge."

How to get this ?

> +endeavour to merge them upstream and keep diffs minimal.
> === modified file 'cmd-line-utils/libedit/np/unvis.c'
> --- a/cmd-line-utils/libedit/np/unvis.c	2009-06-11 16:21:32 +0000
> +++ b/cmd-line-utils/libedit/np/unvis.c	2011-04-17 13:40:20 +0000
> @@ -1,4 +1,4 @@
> -/*	$NetBSD: unvis.c,v 1.28 2005/09/13 01:44:09 christos Exp $	*/
> +/*	$NetBSD: unvis.c,v 1.36 2011/03/18 09:07:20 martin Exp $	*/
>
>   /*-
>    * Copyright (c) 1989, 1993
> @@ -31,6 +31,7 @@
>
>   #include "config.h"
>
> +#include<sys/cdefs.h>
>   #if defined(LIBC_SCCS)&&  !defined(lint)
>   #if 0
>   static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
> @@ -38,11 +39,18 @@ static char sccsid[] = "@(#)unvis.c	8.1
>   #endif
>   #endif /* LIBC_SCCS and not lint */
>
> +/* XXXMYSQL : Make compiler happy. */
> +#ifdef _LIBC
> +#include "namespace.h"
> +#endif
> +

Please verify this change ^.


> === modified file 'cmd-line-utils/libedit/np/vis.h'
> --- a/cmd-line-utils/libedit/np/vis.h	2009-06-11 16:21:32 +0000
> +++ b/cmd-line-utils/libedit/np/vis.h	2011-04-17 13:40:20 +0000
> @@ -1,4 +1,4 @@
> -/*	$NetBSD: vis.h,v 1.16 2005/09/13 01:44:32 christos Exp $	*/
> +/*	$NetBSD: vis.h,v 1.19 2011/03/12 19:52:45 christos Exp $	*/
>
>   /*-
>    * Copyright (c) 1990, 1993
> @@ -39,24 +39,29 @@
>   /*
>    * to select alternate encoding format
>    */
> -#define	VIS_OCTAL	0x01	/* use octal \ddd format */
> -#define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropiate */
> +#define	VIS_OCTAL	0x001	/* use octal \ddd format */
> +#define	VIS_CSTYLE	0x002	/* use \[nrft0..] where appropiate */
>
>   /*
>    * to alter set of characters encoded (default is to encode all
>    * non-graphic except space, tab, and newline).
>    */
> -#define	VIS_SP		0x04	/* also encode space */
> -#define	VIS_TAB		0x08	/* also encode tab */
> -#define	VIS_NL		0x10	/* also encode newline */
> +#define	VIS_SP		0x004	/* also encode space */
> +#define	VIS_TAB		0x008	/* also encode tab */
> +#define	VIS_NL		0x010	/* also encode newline */
>   #define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
> -#define	VIS_SAFE	0x20	/* only encode "unsafe" characters */
> +#define	VIS_SAFE	0x020	/* only encode "unsafe" characters */
>
>   /*
>    * other
>    */
> -#define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
> -#define	VIS_HTTPSTYLE	0x80	/* http-style escape % HEX HEX */
> +#define	VIS_NOSLASH	0x040	/* inhibit printing '\' */
> +#define	VIS_HTTP1808	0x080	/* http-style escape % hex hex */
> +#define	VIS_HTTPSTYLE	0x080	/* http-style escape % hex hex */
> +#define	VIS_MIMESTYLE	0x100	/* mime-style escape = HEX HEX */
> +#define	VIS_HTTP1866	0x200	/* http-style&#num; or&string; */
> +#define	VIS_NOESCAPE	0x400	/* don't decode `\' */
> +#define	_VIS_END	0x800	/* for unvis */
>
>   /*
>    * unvis return codes
> @@ -70,18 +75,41 @@
>   /*
>    * unvis flags
>    */
> -#define	UNVIS_END	1	/* no more characters */
> +#define	UNVIS_END	_VIS_END	/* no more characters */
> +#include<sys/cdefs.h>
> +/* XXXMYSQL */
> +#ifndef __RENAME
> +#define __RENAME(x)
> +#endif

And this ^^ .
Do we have a better way to resolve this ?


Best Regards,
Nirbhay


Thread
bzr commit into mysql-trunk branch (nirbhay.choubey:3327) Bug#49967Nirbhay Choubey17 Apr
  • Re: bzr commit into mysql-trunk branch (nirbhay.choubey:3327) Bug#49967Nirbhay Choubey18 Apr