From 814bbc465bf54d7214f0c29261eb96e6f712ac3c Mon Sep 17 00:00:00 2001 From: Borut Razem Date: Tue, 23 Nov 2010 22:14:17 +0100 Subject: [PATCH] ping: Sleep 1 second less. --- programs/ping/ping_main.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 70db17f48cf..037fa4d6298 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -18,6 +18,7 @@ */ #include +#include #include #include "wine/debug.h" @@ -26,15 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ping); static void usage(void) { - WINE_MESSAGE( "Usage: ping [-n count] [-w timeout] target_name\n\n" ); - WINE_MESSAGE( "Options:\n" ); - WINE_MESSAGE( " -n Number of echo requests to send.\n" ); - WINE_MESSAGE( " -w Timeout in milliseconds to wait for each reply.\n" ); + printf("Usage: ping [-n count] [-w timeout] target_name\n\n" + "Options:\n" + " -n Number of echo requests to send.\n" + " -w Timeout in milliseconds to wait for each reply.\n"); } int main(int argc, char** argv) { - int n = 0; + unsigned int n = 0; int optc; WINE_FIXME( "this command currently just sleeps based on -n parameter\n" ); @@ -44,7 +45,12 @@ int main(int argc, char** argv) switch(optc) { case 'n': - n = atoi( optarg ); + n = atoi(optarg); + if (n == 0) + { + printf("Bad value for option -n, valid range is from 1 to 4294967295.\n"); + exit(1); + } break; case '?': usage(); @@ -56,6 +62,8 @@ int main(int argc, char** argv) } } - Sleep(n * 1000); + if (n != 0) + Sleep((n - 1) * 1000); + return 0; }