Imported Upstream version 3.2.0

[debian/amanda] / gnulib / inet_ntop.c

diff --git a/gnulib/inet_ntop.c b/gnulib/inet_ntop.c
index 16eb109210e2e59658073c9576096eb9eb8d659a..baaa23f85655a6eab253a96fc05db261ce7a05ea 100644 (file)
--- a/gnulib/inet_ntop.c
+++ b/gnulib/inet_ntop.c
@@ -1,10 +1,10 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
 
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
 

-   Copyright (C) 2005, 2006, 2008  Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2010 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -42,10 +42,6 @@
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 

-#ifndef EAFNOSUPPORT
-# define EAFNOSUPPORT EINVAL
-#endif
-

 #define NS_IN6ADDRSZ 16
 #define NS_INT16SZ 2
 
 #define NS_IN6ADDRSZ 16
 #define NS_INT16SZ 2
 


@@ -63,15 +59,15 @@ static const char *inet_ntop6 (const unsigned char *src, char *dst, socklen_t si
 
 /* char *
  * inet_ntop(af, src, dst, size)
 
 /* char *
  * inet_ntop(af, src, dst, size)

- *     convert a network format address to presentation format.
+ *      convert a network format address to presentation format.

  * return:
  * return:

- *     pointer to presentation format address (`dst'), or NULL (see errno).
+ *      pointer to presentation format address (`dst'), or NULL (see errno).

  * author:
  * author:

- *     Paul Vixie, 1996.
+ *      Paul Vixie, 1996.

  */
 const char *
 inet_ntop (int af, const void *restrict src,
  */
 const char *
 inet_ntop (int af, const void *restrict src,

-          char *restrict dst, socklen_t cnt)
+           char *restrict dst, socklen_t cnt)

 {
   switch (af)
     {
 {
   switch (af)
     {


@@ -94,14 +90,14 @@ inet_ntop (int af, const void *restrict src,
 
 /* const char *
  * inet_ntop4(src, dst, size)
 
 /* const char *
  * inet_ntop4(src, dst, size)

- *     format an IPv4 address
+ *      format an IPv4 address

  * return:
  * return:

- *     `dst' (as a const)
+ *      `dst' (as a const)

  * notes:
  * notes:

- *     (1) uses no statics
- *     (2) takes a u_char* not an in_addr as input
+ *      (1) uses no statics
+ *      (2) takes a u_char* not an in_addr as input

  * author:
  * author:

- *     Paul Vixie, 1996.
+ *      Paul Vixie, 1996.

  */
 static const char *
 inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)
  */
 static const char *
 inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)


@@ -126,9 +122,9 @@ inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)
 
 /* const char *
  * inet_ntop6(src, dst, size)
 
 /* const char *
  * inet_ntop6(src, dst, size)

- *     convert IPv6 binary address into presentation (printable) format
+ *      convert IPv6 binary address into presentation (printable) format

  * author:
  * author:

- *     Paul Vixie, 1996.
+ *      Paul Vixie, 1996.

  */
 static const char *
 inet_ntop6 (const unsigned char *src, char *dst, socklen_t size)
  */
 static const char *
 inet_ntop6 (const unsigned char *src, char *dst, socklen_t size)


@@ -161,26 +157,26 @@ inet_ntop6 (const unsigned char *src, char *dst, socklen_t size)
   for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
     {
       if (words[i] == 0)
   for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
     {
       if (words[i] == 0)

-       {
-         if (cur.base == -1)
-           cur.base = i, cur.len = 1;
-         else
-           cur.len++;
-       }
+        {
+          if (cur.base == -1)
+            cur.base = i, cur.len = 1;
+          else
+            cur.len++;
+        }

       else
       else

-       {
-         if (cur.base != -1)
-           {
-             if (best.base == -1 || cur.len > best.len)
-               best = cur;
-             cur.base = -1;
-           }
-       }
+        {
+          if (cur.base != -1)
+            {
+              if (best.base == -1 || cur.len > best.len)
+                best = cur;
+              cur.base = -1;
+            }
+        }

     }
   if (cur.base != -1)
     {
       if (best.base == -1 || cur.len > best.len)
     }
   if (cur.base != -1)
     {
       if (best.base == -1 || cur.len > best.len)

-       best = cur;
+        best = cur;

     }
   if (best.base != -1 && best.len < 2)
     best.base = -1;
     }
   if (best.base != -1 && best.len < 2)
     best.base = -1;


@@ -193,28 +189,28 @@ inet_ntop6 (const unsigned char *src, char *dst, socklen_t size)
     {
       /* Are we inside the best run of 0x00's? */
       if (best.base != -1 && i >= best.base && i < (best.base + best.len))
     {
       /* Are we inside the best run of 0x00's? */
       if (best.base != -1 && i >= best.base && i < (best.base + best.len))

-       {
-         if (i == best.base)
-           *tp++ = ':';
-         continue;
-       }
+        {
+          if (i == best.base)
+            *tp++ = ':';
+          continue;
+        }

       /* Are we following an initial run of 0x00s or any real hex? */
       if (i != 0)
       /* Are we following an initial run of 0x00s or any real hex? */
       if (i != 0)

-       *tp++ = ':';
+        *tp++ = ':';

       /* Is this address an encapsulated IPv4? */
       if (i == 6 && best.base == 0 &&
       /* Is this address an encapsulated IPv4? */
       if (i == 6 && best.base == 0 &&

-         (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
-       {
-         if (!inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp)))
-           return (NULL);
-         tp += strlen (tp);
-         break;
-       }
+          (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
+        {
+          if (!inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp)))
+            return (NULL);
+          tp += strlen (tp);
+          break;
+        }

       {
       {

-       int len = sprintf (tp, "%x", words[i]);
-       if (len < 0)
-         return NULL;
-       tp += len;
+        int len = sprintf (tp, "%x", words[i]);
+        if (len < 0)
+          return NULL;
+        tp += len;

       }
     }
   /* Was it a trailing run of 0x00's? */
       }
     }
   /* Was it a trailing run of 0x00's? */