Downgrade Socket.pm's new inet_ntop and inet_pton to EXPORT_OK rather

[p5sagit/p5-mst-13.2.git] / ext / Socket / Socket.xs

diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs
index d46a6b9..2d469ed 100644 (file)
--- a/ext/Socket/Socket.xs
+++ b/ext/Socket/Socket.xs
@@ -276,7 +276,7 @@ inet_ntoa(ip_address_sv)
                ((addr.s_addr >> 16) & 0xFF),
                ((addr.s_addr >>  8) & 0xFF),
                ( addr.s_addr        & 0xFF));
-       ST(0) = sv_2mortal(newSVpvn(addr_str, strlen(addr_str)));
+       ST(0) = newSVpvn_flags(addr_str, strlen(addr_str), SVs_TEMP);
        Safefree(addr_str);
        }
 
@@ -343,11 +343,11 @@ pack_sockaddr_un(pathname)
                 * character, starting with \0 and possibly including \0s,
                 * therefore the length of the structure must denote the
                 * end of that character array */
-               addr_len = (void *)&sun_ad.sun_path - (void *)&sun_ad + len;
+               addr_len = (char *)&(sun_ad.sun_path) - (char *)&sun_ad + len;
        } else {
                addr_len = sizeof sun_ad;
        }
-       ST(0) = sv_2mortal(newSVpvn((char *)&sun_ad, addr_len));
+       ST(0) = newSVpvn_flags((char *)&sun_ad, addr_len, SVs_TEMP);
 #else
        ST(0) = (SV *) not_here("pack_sockaddr_un");
 #endif
@@ -363,7 +363,7 @@ unpack_sockaddr_un(sun_sv)
        struct sockaddr_un addr;
        STRLEN sockaddrlen;
        char * sun_ad = SvPVbyte(sun_sv,sockaddrlen);
-       char * e;
+       int addr_len;
 #   ifndef __linux__
        /* On Linux sockaddrlen on sockets returned by accept, recvfrom,
           getpeername and getsockname is not equal to sizeof(addr). */
@@ -382,13 +382,17 @@ unpack_sockaddr_un(sun_sv)
                        addr.sun_family,
                        AF_UNIX);
        }
-       e = (char*)addr.sun_path;
-       /* On Linux, the name of abstract unix domain sockets begins
-        * with a '\0', so allow this. */
-       while ((*e || (e == addr.sun_path && e[1] && sockaddrlen > 1))
-               && e < (char*)addr.sun_path + sizeof addr.sun_path)
-           ++e;
-       ST(0) = sv_2mortal(newSVpvn(addr.sun_path, e - (char*)addr.sun_path));
+
+       if (addr.sun_path[0] == '\0') {
+               /* Linux-style abstract socket address begins with a nul
+                * and can contain nuls. */
+               addr_len = (char *)&addr - (char *)&(addr.sun_path) + sockaddrlen;
+       } else {
+               for (addr_len = 0; addr.sun_path[addr_len]
+                    && addr_len < sizeof addr.sun_path; addr_len++);
+       }
+
+       ST(0) = newSVpvn_flags(addr.sun_path, addr_len, SVs_TEMP);
 #else
        ST(0) = (SV *) not_here("unpack_sockaddr_un");
 #endif
@@ -421,7 +425,7 @@ pack_sockaddr_in(port, ip_address_sv)
        sin.sin_family = AF_INET;
        sin.sin_port = htons(port);
        sin.sin_addr.s_addr = htonl(addr.s_addr);
-       ST(0) = sv_2mortal(newSVpvn((char *)&sin, sizeof sin));
+       ST(0) = newSVpvn_flags((char *)&sin, sizeof (sin), SVs_TEMP);
        }
 
 void
@@ -451,7 +455,7 @@ unpack_sockaddr_in(sin_sv)
 
        EXTEND(SP, 2);
        PUSHs(sv_2mortal(newSViv((IV) port)));
-       PUSHs(sv_2mortal(newSVpvn((char *)&ip_address, sizeof ip_address)));
+       PUSHs(newSVpvn_flags((char *)&ip_address, sizeof(ip_address), SVs_TEMP));
        }
 
 void
@@ -477,7 +481,7 @@ inet_ntop(af, ip_address_sv)
        Copy( ip_address, &addr, sizeof addr, char );
        inet_ntop(af, &addr, str, INET6_ADDRSTRLEN);
 
-       ST(0) = sv_2mortal(newSVpv(str, strlen(str)));
+       ST(0) = newSVpvn_flags(str, strlen(str), SVs_TEMP);
 #else
         ST(0) = (SV *)not_here("inet_ntop");
 #endif
@@ -499,7 +503,8 @@ inet_pton(af, host)
 
         ST(0) = sv_newmortal();
         if (ok) {
-                sv_setpvn( ST(0), (char *)&ip_address, sizeof ip_address );
+                sv_setpvn( ST(0), (char *)&ip_address,
+                           af == AF_INET6 ? sizeof(ip_address) : sizeof(struct in_addr) );
         }
 #else
         ST(0) = (SV *)not_here("inet_pton");