diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-30 11:49:56 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 13:18:53 +0100 |
| commit | ae3495e0a32885cf9fd1a2d86d1a67f60ea73482 (patch) | |
| tree | e8c4aa41e51dccbd8894326ce04257217a83b94b /freebsd/sbin/ping | |
| parent | Delete unused variables (diff) | |
| download | rtems-libbsd-ae3495e0a32885cf9fd1a2d86d1a67f60ea73482.tar.bz2 | |
PING(8): Do not use signals
Diffstat (limited to 'freebsd/sbin/ping')
| -rw-r--r-- | freebsd/sbin/ping/ping.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/freebsd/sbin/ping/ping.c b/freebsd/sbin/ping/ping.c index 4a2554c0..c320a8fb 100644 --- a/freebsd/sbin/ping/ping.c +++ b/freebsd/sbin/ping/ping.c @@ -212,8 +212,10 @@ static void pr_icmph(struct icmp *); static void pr_iph(struct ip *); static void pr_pack(char *, int, struct sockaddr_in *, struct timeval *); static void pr_retip(struct ip *); +#ifndef __rtems__ static void status(int); static void stopit(int); +#endif /* __rtems__ */ static void tvsub(struct timeval *, struct timeval *); static void usage(void) __dead2; @@ -533,13 +535,11 @@ main(argc, argv) break; default: usage(); - } } if (argc - optind != 1) usage(); - target = argv[optind]; switch (options & (F_MASK|F_TIME)) { @@ -805,6 +805,7 @@ main(argc, argv) (void)printf("PING %s: %d data bytes\n", hostname, datalen); } +#ifndef __rtems__ /* * Use sigaction() instead of signal() to get unambiguous semantics, * in particular with SA_RESTART not set. @@ -818,18 +819,19 @@ main(argc, argv) err(EX_OSERR, "sigaction SIGINT"); } -#ifdef SIGINFO si_sa.sa_handler = status; if (sigaction(SIGINFO, &si_sa, 0) == -1) { err(EX_OSERR, "sigaction"); } -#endif if (alarmtimeout > 0) { si_sa.sa_handler = stopit; if (sigaction(SIGALRM, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGALRM"); } +#else /* __rtems__ */ + (void) si_sa; +#endif /* __rtems__ */ bzero(&msg, sizeof(msg)); msg.msg_name = (caddr_t)&from; @@ -953,17 +955,11 @@ main(argc, argv) } } finish(); -#ifdef __rtems__ - /* RTEMS shell programs return -- they do not exit */ - if (nreceived) - return(0); - else - return(2); -#endif /* NOTREACHED */ exit(0); /* Make the compiler happy */ } +#ifndef __rtems__ /* * stopit -- * Set the global bit that causes the main loop to quit. @@ -983,6 +979,7 @@ stopit(sig) _exit(nreceived ? 0 : 2); finish_up = 1; } +#endif /* __rtems__ */ /* * pinger -- @@ -1392,6 +1389,7 @@ tvsub(out, in) out->tv_sec -= in->tv_sec; } +#ifndef __rtems__ /* * status -- * Print out statistics when SIGINFO is received. @@ -1404,6 +1402,7 @@ status(sig) siginfo_p = 1; } +#endif /* __rtems__ */ static void check_status() @@ -1457,6 +1456,7 @@ finish() "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", tmin, avg, tmax, sqrt(vari)); } + if (nreceived) exit(0); else @@ -1759,6 +1759,7 @@ fill(bp, patp) static void usage() { + (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: ping [-AaDdfnoQqRrv] [-c count] [-G sweepmaxsize] [-g sweepminsize]", " [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl]", |