BSD 4_4 release

[unix-history] / usr / src / lib / libc / net / herror.c

diff --git a/usr/src/lib/libc/net/herror.c b/usr/src/lib/libc/net/herror.c
index ccc2596..0366b04 100644 (file)
--- a/usr/src/lib/libc/net/herror.c
+++ b/usr/src/lib/libc/net/herror.c
@@ -1,21 +1,66 @@
-/*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
+/*-
+ * Copyright (c) 1987, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)herror.c   6.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)herror.c   8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$Id: herror.c,v 4.9.1.1 1993/05/02 23:14:35 vixie Rel $";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <sys/uio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <sys/uio.h>

+#include <netdb.h>
+#include <unistd.h>
+#include <string.h>

 
 char   *h_errlist[] = {
        "Error 0",
 
 char   *h_errlist[] = {
        "Error 0",


@@ -32,24 +77,33 @@ extern int  h_errno;
  * herror --
  *     print the error indicated by the h_errno value.
  */
  * herror --
  *     print the error indicated by the h_errno value.
  */

+void

 herror(s)
 herror(s)

-       char *s;
+       const char *s;

 {
        struct iovec iov[4];
        register struct iovec *v = iov;
 
        if (s && *s) {
 {
        struct iovec iov[4];
        register struct iovec *v = iov;
 
        if (s && *s) {

-               v->iov_base = s;
+               v->iov_base = (char *)s;

                v->iov_len = strlen(s);
                v++;
                v->iov_base = ": ";
                v->iov_len = 2;
                v++;
        }
                v->iov_len = strlen(s);
                v++;
                v->iov_base = ": ";
                v->iov_len = 2;
                v++;
        }

-       v->iov_base = h_errno < h_nerr ? h_errlist[h_errno] : "Unknown error";
+       v->iov_base = (u_int)h_errno < h_nerr ?
+           h_errlist[h_errno] : "Unknown error";

        v->iov_len = strlen(v->iov_base);
        v++;
        v->iov_base = "\n";
        v->iov_len = 1;
        v->iov_len = strlen(v->iov_base);
        v++;
        v->iov_base = "\n";
        v->iov_len = 1;

-       writev(2, iov, (v - iov) + 1);
+       writev(STDERR_FILENO, iov, (v - iov) + 1);
+}
+
+char *
+hstrerror(err)
+       int err;
+{
+       return (u_int)err < h_nerr ? h_errlist[err] : "Unknown resolver error";

 }
 }