BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / ping / ping.c

diff --git a/usr/src/sbin/ping/ping.c b/usr/src/sbin/ping/ping.c
index f7fd9f5..bfa1447 100644 (file)
--- a/usr/src/sbin/ping/ping.c
+++ b/usr/src/sbin/ping/ping.c
@@ -5,7 +5,33 @@
  * This code is derived from software contributed to Berkeley by
  * Mike Muuss.
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Muuss.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -15,7 +41,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ping.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)ping.c     5.9 (Berkeley) 5/12/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -149,7 +175,7 @@ main(argc, argv)
                case 'f':
                        if (getuid()) {
                                (void)fprintf(stderr,
                case 'f':
                        if (getuid()) {
                                (void)fprintf(stderr,

-                                   "ping: you must be root to use the -f option.\n");
+                                   "ping: %s\n", strerror(EPERM));

                                exit(1);
                        }
                        options |= F_FLOOD;
                                exit(1);
                        }
                        options |= F_FLOOD;


@@ -414,7 +440,7 @@ pinger()
                (void)printf("ping: wrote %s %d chars, ret=%d\n",
                    hostname, cc, i);
        }
                (void)printf("ping: wrote %s %d chars, ret=%d\n",
                    hostname, cc, i);
        }

-       if (options & F_FLOOD)
+       if (!(options & F_QUIET) && options & F_FLOOD)

                (void)write(STDOUT_FILENO, &DOT, 1);
 }
 
                (void)write(STDOUT_FILENO, &DOT, 1);
 }