Skip to Content.
Sympa Menu

freetds - Re: [freetds] [PATCH] Don't return newline from VMS-specific readline.

freetds AT lists.ibiblio.org

Subject: FreeTDS Development Group

List archive

Chronological Thread  
  • From: Frediano Ziglio <freddy77 AT gmail.com>
  • To: FreeTDS Development Group <freetds AT lists.ibiblio.org>
  • Subject: Re: [freetds] [PATCH] Don't return newline from VMS-specific readline.
  • Date: Tue, 3 Jun 2014 00:48:51 +0100

Applied all!

Frediano


2014-05-30 19:32 GMT+01:00 Craig A. Berry <craigberry AT mac.com>:

> readline is documented to return a line without the trailing
> newline, but we haven't been doing this in our homegrown version
> so would sometimes see doubled newlines in fisql.
> ---
> vms/getpass.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/vms/getpass.c b/vms/getpass.c
> index b7d1ecb..d11c744 100644
> --- a/vms/getpass.c
> +++ b/vms/getpass.c
> @@ -279,7 +279,7 @@ getpass(const char *prompt)
> char *
> readline(char *prompt)
> {
> - char *buf = NULL, *s = NULL, *p = NULL;
> + char *buf = NULL, *s = NULL, *p = NULL, *newline = NULL;
> if (tds_rl_instream == NULL)
> s = readpassphrase((const char *) prompt, passbuf,
> sizeof(passbuf),
> RPP_ECHO_ON | RPP_TIMEOUT_OFF);
> @@ -290,6 +290,13 @@ readline(char *prompt)
> buf = (char *) malloc(strlen(s) + 1);
> strcpy(buf, s);
> }
> + /* readline is documented to eat the newline. */
> + if (buf) {
> + newline = strchr(buf, '\n');
> + if (newline)
> + *newline = '\0';
> + }
> +
> return buf;
>
> } /* readline */
> --
> 1.8.4.2
> ________________________________________
> Craig A. Berry
> mailto:craigberry AT mac.com
>
> "... getting out of a sonnet is much more
> difficult than getting in."
> Brad Leithauser
>
> _______________________________________________
> FreeTDS mailing list
> FreeTDS AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/freetds
>
>




Archive powered by MHonArc 2.6.24.

Top of Page