rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-16 04:46:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

PING(8): Do not use signals

Browse Source
This commit is contained in:
Sebastian Huber
2013-10-30 11:49:56 +01:00
parent 486871306b
commit ae3495e0a3
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
freebsd/sbin/ping/ping.c
View File

@@ -212,8 +212,10 @@ static void pr_icmph(struct icmp *);
static void pr_iph(struct ip *); static void pr_iph(struct ip *);
static void pr_pack(char *, int, struct sockaddr_in *, struct timeval *); static void pr_pack(char *, int, struct sockaddr_in *, struct timeval *);
static void pr_retip(struct ip *); static void pr_retip(struct ip *);
#ifndef __rtems__
static void status(int); static void status(int);
static void stopit(int); static void stopit(int);
#endif /* __rtems__ */
static void tvsub(struct timeval *, struct timeval *); static void tvsub(struct timeval *, struct timeval *);
static void usage(void) __dead2; static void usage(void) __dead2;
@@ -533,13 +535,11 @@ main(argc, argv)
break; break;
default: default:
usage(); usage();
} }
} }
if (argc - optind != 1) if (argc - optind != 1)
usage(); usage();
target = argv[optind]; target = argv[optind];
switch (options & (F_MASK|F_TIME)) { switch (options & (F_MASK|F_TIME)) {
@@ -805,6 +805,7 @@ main(argc, argv)
(void)printf("PING %s: %d data bytes\n", hostname, datalen); (void)printf("PING %s: %d data bytes\n", hostname, datalen);
} }
#ifndef __rtems__
/* /*
* Use sigaction() instead of signal() to get unambiguous semantics, * Use sigaction() instead of signal() to get unambiguous semantics,
* in particular with SA_RESTART not set. * in particular with SA_RESTART not set.
@@ -818,18 +819,19 @@ main(argc, argv)
err(EX_OSERR, "sigaction SIGINT"); err(EX_OSERR, "sigaction SIGINT");
} }
#ifdef SIGINFO
si_sa.sa_handler = status; si_sa.sa_handler = status;
if (sigaction(SIGINFO, &si_sa, 0) == -1) { if (sigaction(SIGINFO, &si_sa, 0) == -1) {
err(EX_OSERR, "sigaction"); err(EX_OSERR, "sigaction");
} }
#endif
if (alarmtimeout > 0) { if (alarmtimeout > 0) {
si_sa.sa_handler = stopit; si_sa.sa_handler = stopit;
if (sigaction(SIGALRM, &si_sa, 0) == -1) if (sigaction(SIGALRM, &si_sa, 0) == -1)
err(EX_OSERR, "sigaction SIGALRM"); err(EX_OSERR, "sigaction SIGALRM");
} }
#else /* __rtems__ */
(void) si_sa;
#endif /* __rtems__ */
bzero(&msg, sizeof(msg)); bzero(&msg, sizeof(msg));
msg.msg_name = (caddr_t)&from; msg.msg_name = (caddr_t)&from;
@@ -953,17 +955,11 @@ main(argc, argv)
} }
} }
finish(); finish();
#ifdef __rtems__
/* RTEMS shell programs return -- they do not exit */
if (nreceived)
return(0);
else
return(2);
#endif
/* NOTREACHED */ /* NOTREACHED */
exit(0); /* Make the compiler happy */ exit(0); /* Make the compiler happy */
} }
#ifndef __rtems__
/* /*
* stopit -- * stopit --
* Set the global bit that causes the main loop to quit. * Set the global bit that causes the main loop to quit.
@@ -983,6 +979,7 @@ stopit(sig)
_exit(nreceived ? 0 : 2); _exit(nreceived ? 0 : 2);
finish_up = 1; finish_up = 1;
} }
#endif /* __rtems__ */
/* /*
* pinger -- * pinger --
@@ -1392,6 +1389,7 @@ tvsub(out, in)
out->tv_sec -= in->tv_sec; out->tv_sec -= in->tv_sec;
} }
#ifndef __rtems__
/* /*
* status -- * status --
* Print out statistics when SIGINFO is received. * Print out statistics when SIGINFO is received.
@@ -1404,6 +1402,7 @@ status(sig)
siginfo_p = 1; siginfo_p = 1;
} }
#endif /* __rtems__ */
static void static void
check_status() check_status()
@@ -1457,6 +1456,7 @@ finish()
"round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
tmin, avg, tmax, sqrt(vari)); tmin, avg, tmax, sqrt(vari));
} }
if (nreceived) if (nreceived)
exit(0); exit(0);
else else
@@ -1759,6 +1759,7 @@ fill(bp, patp)
static void static void
usage() usage()
{ {
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", (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]", "usage: ping [-AaDdfnoQqRrv] [-c count] [-G sweepmaxsize] [-g sweepminsize]",
" [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl]", " [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl]",