[taler-taler-mdb] 03/03: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-mdb.

commit f53522a3bb661e64228dbaed6b660d819990a721
Merge: 01cc8d8 583b2f7
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Dec 5 16:50:23 2019 +0100

    merge

 src/Makefile.am |  3 ++-
 src/main.c      | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --cc src/Makefile.am
index 4b5e750,5bd904f..f7daf36
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -6,9 -6,9 +6,9 @@@ if USE_COVERAG
    XLIB = -lgcov
  endif
  
 -taler_nfc_SOURCES = \
 +taler_mdb_SOURCES = \
-   main.c 
+   main.c
 -taler_nfc_LDADD = \
 +taler_mdb_LDADD = \
    -ltalermerchant \
    -ltalerjson \
    -ltalerutil \
diff --cc src/main.c
index 47a4573,03b0ae3..205b98d
--- a/src/main.c
+++ b/src/main.c
@@@ -1302,31 -842,14 +1317,31 @@@ read_keyboard_command (void *cls
  static void
  start_read_keyboard ()
  {
-   struct GNUNET_DISK_FileHandle fh = { STDIN_FILENO };
+   static struct GNUNET_DISK_FileHandle fh = { STDIN_FILENO };
  
    GNUNET_assert (NULL == keyboard_task);
 -  for (unsigned int i = 0; i < products_length; i++)
 -    printf ("'%c' to buy %s\n",
 -            products[i].key,
 -            products[i].description);
 -  printf ("'c' to cancel last purchase\n'x' to quit\n");
 +  if (NULL == payment_activity)
 +  {
 +    for (unsigned int i = 0; i < products_length; i++)
 +      printf ("'%c' to buy %s\n",
 +              products[i].key,
 +              products[i].description);
 +  }
 +  else
 +  {
 +    if (GNUNET_NO == payment_activity->paid)
 +    {
 +      printf ("'a' to fake payment for the last purchase\n"
 +              "'c' to cancel last purchase\n");
 +    }
 +    else
 +    {
 +      if (disable_mdb)
 +        printf ("'y' to simulate product successfully dispensed\n"
 +                "'n' to simulate product failed to be dispensed\n");
 +    }
 +  }
 +  printf ("'x' to quit\n");
    printf ("Waiting for keyboard input\n");
    keyboard_task = GNUNET_SCHEDULER_add_read_file 
(GNUNET_TIME_UNIT_FOREVER_REL,
                                                    &fh,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.