2 files changed, 0 insertions, 57 deletions
diff --git a/include/applets.src.h b/include/applets.src.h
index 06b4fff35..131fca504 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -263,8 +263,6 @@ IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
-IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
 IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill))
diff --git a/include/usage.src.h b/include/usage.src.h
index 30fef2440..7de2c6928 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -2859,61 +2859,6 @@ INSERT
        IF_FEATURE_PIDOF_OMIT( \
       "$ pidof /bin/sh -o %PPID\n20351 5950")
-#if !ENABLE_FEATURE_FANCY_PING
-#define ping_trivial_usage \
-       "host"
-#define ping_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#define ping6_trivial_usage \
-       "host"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#else
-#define ping_trivial_usage \
-       "[OPTIONS] HOST"
-#define ping_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-     "\nOptions:" \
-     "\n        -4,-6           Force IP or IPv6 name resolution" \
-     "\n        -c CNT          Send only CNT pings" \
-     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)" \
-     "\n        -I IFACE/IP     Use interface or IP address as source" \
-     "\n        -W SEC          Seconds to wait for the first response (default:10)" \
-     "\n                        (after all -c CNT packets are sent)" \
-     "\n        -w SEC          Seconds until ping exits (default:infinite)" \
-     "\n                        (can exit earlier with -c CNT)" \
-     "\n        -q              Quiet, only displays output at start" \
-     "\n                        and when finished" \
-#define ping6_trivial_usage \
-       "[OPTIONS] HOST"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-     "\nOptions:" \
-     "\n        -c CNT          Send only CNT pings" \
-     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)" \
-     "\n        -I IFACE/IP     Use interface or IP address as source" \
-     "\n        -q              Quiet, only displays output at start" \
-     "\n                        and when finished" \
-#endif
-#define ping_example_usage \
-       "$ ping localhost\n" \
-       "PING slag (127.0.0.1): 56 data bytes\n" \
-       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n" \
-       "\n" \
-       "--- debian ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-#define ping6_example_usage \
-       "$ ping6 ip6-localhost\n" \
-       "PING ip6-localhost (::1): 56 data bytes\n" \
-       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n" \
-       "\n" \
-       "--- ip6-localhost ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
 #define pipe_progress_trivial_usage NOUSAGE_STR
 #define pipe_progress_full_usage ""

diff --git a/include/applets.src.h b/include/applets.src.h index 06b4fff35..131fca504 100644 --- a/include/applets.src.h +++ b/include/applets.src.h
@@ -263,8 +263,6 @@ IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
263	IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))	263	IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
264	IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))	264	IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
265	IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))	265	IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))
266	IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
267	IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
268	IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP))	266	IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP))
269	IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP))	267	IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP))
270	IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill))	268	IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill))


diff --git a/include/usage.src.h b/include/usage.src.h index 30fef2440..7de2c6928 100644 --- a/include/usage.src.h +++ b/include/usage.src.h
@@ -2859,61 +2859,6 @@ INSERT
2859	IF_FEATURE_PIDOF_OMIT( \	2859	IF_FEATURE_PIDOF_OMIT( \
2860	"$ pidof /bin/sh -o %PPID\n20351 5950")	2860	"$ pidof /bin/sh -o %PPID\n20351 5950")
2861		2861
2862	#if !ENABLE_FEATURE_FANCY_PING
2863	#define ping_trivial_usage \
2864	"host"
2865	#define ping_full_usage "\n\n" \
2866	"Send ICMP ECHO_REQUEST packets to network hosts"
2867	#define ping6_trivial_usage \
2868	"host"
2869	#define ping6_full_usage "\n\n" \
2870	"Send ICMP ECHO_REQUEST packets to network hosts"
2871	#else
2872	#define ping_trivial_usage \
2873	"[OPTIONS] HOST"
2874	#define ping_full_usage "\n\n" \
2875	"Send ICMP ECHO_REQUEST packets to network hosts\n" \
2876	"\nOptions:" \
2877	"\n -4,-6 Force IP or IPv6 name resolution" \
2878	"\n -c CNT Send only CNT pings" \
2879	"\n -s SIZE Send SIZE data bytes in packets (default:56)" \
2880	"\n -I IFACE/IP Use interface or IP address as source" \
2881	"\n -W SEC Seconds to wait for the first response (default:10)" \
2882	"\n (after all -c CNT packets are sent)" \
2883	"\n -w SEC Seconds until ping exits (default:infinite)" \
2884	"\n (can exit earlier with -c CNT)" \
2885	"\n -q Quiet, only displays output at start" \
2886	"\n and when finished" \
2887
2888	#define ping6_trivial_usage \
2889	"[OPTIONS] HOST"
2890	#define ping6_full_usage "\n\n" \
2891	"Send ICMP ECHO_REQUEST packets to network hosts\n" \
2892	"\nOptions:" \
2893	"\n -c CNT Send only CNT pings" \
2894	"\n -s SIZE Send SIZE data bytes in packets (default:56)" \
2895	"\n -I IFACE/IP Use interface or IP address as source" \
2896	"\n -q Quiet, only displays output at start" \
2897	"\n and when finished" \
2898
2899	#endif
2900	#define ping_example_usage \
2901	"$ ping localhost\n" \
2902	"PING slag (127.0.0.1): 56 data bytes\n" \
2903	"64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n" \
2904	"\n" \
2905	"--- debian ping statistics ---\n" \
2906	"1 packets transmitted, 1 packets received, 0% packet loss\n" \
2907	"round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
2908	#define ping6_example_usage \
2909	"$ ping6 ip6-localhost\n" \
2910	"PING ip6-localhost (::1): 56 data bytes\n" \
2911	"64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n" \
2912	"\n" \
2913	"--- ip6-localhost ping statistics ---\n" \
2914	"1 packets transmitted, 1 packets received, 0% packet loss\n" \
2915	"round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
2916
2917	#define pipe_progress_trivial_usage NOUSAGE_STR	2862	#define pipe_progress_trivial_usage NOUSAGE_STR
2918	#define pipe_progress_full_usage ""	2863	#define pipe_progress_full_usage ""
2919		2864