[git] Pinentry - branch, master, updated. pinentry-0.9.2-34-g6fdcad6

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  6fdcad6a1f91bc769b03d2cb32f0b8001ed3ae19 (commit)
       via  cade1ae102d5f4972f68b5bef0003f1ad1b3bde3 (commit)
       via  85646e9c08875214f6888df507c6f9ceb463a000 (commit)
      from  25e77c0fd10e9a1d26c31c0a8ec1917b51da5cd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6fdcad6a1f91bc769b03d2cb32f0b8001ed3ae19
Author: Neal H. Walfield <neal at gnu.org>
Date:   Mon May 18 22:34:50 2015 +0200

    curses: When creating the button text, respect underscores.
    
    * pinentry/pinentry-curses.c (MAKE_BUTTON): When creating the button
    text, respect underscores.

diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
index fa88bdc..c3c202e 100644
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -271,6 +271,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
         {								\
 	  int len;							\
 	  char *msg;							\
+	  int i, j;							\
 									\
 	  msg = pinentry->which;					\
 	  if (! msg)							\
@@ -284,10 +285,22 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
               pinentry->specific_err = ASSUAN_Out_Of_Core;              \
 	      goto out;							\
 	    }								\
-	  new[0] = '<';							\
-	  memcpy (&new[1], msg, len);					\
-          new[len + 1] = '>';						\
-	  new[len + 2] = '\0';						\
+									\
+	  new[0] = '<'; 						\
+	  for (i = 0, j = 1; i < len; i ++, j ++)			\
+	    {								\
+	      if (msg[i] == '_')					\
+		{							\
+		  i ++;							\
+		  if (msg[i] == 0)					\
+		    /* _ at end of string.  */				\
+		    break;						\
+		}							\
+	      new[j] = msg[i];						\
+	    }								\
+									\
+	  new[j] = '>';							\
+	  new[j + 1] = 0;						\
         }								\
       dialog->which = pinentry_utf8_to_local (pinentry->lc_ctype,	\
 					      new ? new : default);	\

commit cade1ae102d5f4972f68b5bef0003f1ad1b3bde3
Author: Neal H. Walfield <neal at gnu.org>
Date:   Mon May 18 22:23:56 2015 +0200

    curses: Make control-l repaint the screen.
    
    * pinentry/pinentry-curses.c (dialog_input): Make control-l repaint
    the screen.

diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
index 20e2a22..fa88bdc 100644
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -705,6 +705,12 @@ dialog_input (dialog_t diag, int alt, int chr)
 	}
       break;
 
+    case 'l' - 'a' + 1: /* control-l */
+      /* Refresh the screen.  */
+      endwin ();
+      refresh ();
+      break;
+
     case 'u' - 'a' + 1: /* control-u */
       /* Erase the whole line.  */
       if (diag->pin_len > 0)

commit 85646e9c08875214f6888df507c6f9ceb463a000
Author: Neal H. Walfield <neal at gnu.org>
Date:   Mon May 18 22:23:26 2015 +0200

    curses: Make control-h an alias for backspace.
    
    * pinentry/pinentry-curses.c (dialog_input): Add control-h an alias
    for backspace.

diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
index 183fdb4..20e2a22 100644
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -691,6 +691,7 @@ dialog_input (dialog_t diag, int alt, int chr)
   switch (chr)
     {
     case KEY_BACKSPACE:
+    case 'h' - 'a' + 1: /* control-h.  */
       if (diag->pin_len > 0)
 	{
 	  diag->pin_len--;

-----------------------------------------------------------------------

Summary of changes:
 pinentry/pinentry-curses.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org