From 9be469e2eeade6ccdbbd24f99cd37aa424e9afb9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 18 Jan 2016 20:37:15 +0000 Subject: [PATCH] use getc() as in demo.c instead of sleep() --- src/examples/authorization_example.c | 13 ++++++++++--- src/examples/demo.c | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c index 796ad072..eb478104 100644 --- a/src/examples/authorization_example.c +++ b/src/examples/authorization_example.c @@ -90,22 +90,29 @@ ahc_echo (void *cls, return ret; } + int main (int argc, char *const *argv) { struct MHD_Daemon *d; + unsigned int port; - if (argc != 3) + if ( (argc != 2) || + (1 != sscanf (argv[1], "%u", &port)) || + (UINT16_MAX < port) ) { - printf ("%s PORT SECONDS-TO-RUN\n", argv[0]); + fprintf (stderr, + "%s PORT\n", argv[0]); return 1; } + d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, atoi (argv[1]), NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); if (d == NULL) return 1; - sleep (atoi (argv[2])); + fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n"); + (void) getc (stdin); MHD_stop_daemon (d); return 0; } diff --git a/src/examples/demo.c b/src/examples/demo.c index 6cf882cc..7d6d1bd8 100644 --- a/src/examples/demo.c +++ b/src/examples/demo.c @@ -856,9 +856,9 @@ main (int argc, char *const *argv) "%s PORT\n", argv[0]); return 1; } - #ifndef MINGW +#ifndef MINGW ignore_sigpipe (); - #endif +#endif magic = magic_open (MAGIC_MIME_TYPE); (void) magic_load (magic, NULL);