summaryrefslogtreecommitdiff
path: root/usr/src/lib/libsocket
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libsocket')
-rw-r--r--usr/src/lib/libsocket/inet/ether_addr.c9
-rw-r--r--usr/src/lib/libsocket/inet/getaddrinfo.c11
-rw-r--r--usr/src/lib/libsocket/inet/rcmd.c64
-rw-r--r--usr/src/lib/libsocket/inet/rexec.c9
-rw-r--r--usr/src/lib/libsocket/inet/ruserpass.c21
-rw-r--r--usr/src/lib/libsocket/socket/_soutil.c25
6 files changed, 65 insertions, 74 deletions
diff --git a/usr/src/lib/libsocket/inet/ether_addr.c b/usr/src/lib/libsocket/inet/ether_addr.c
index 12c7a06f70..37105bb302 100644
--- a/usr/src/lib/libsocket/inet/ether_addr.c
+++ b/usr/src/lib/libsocket/inet/ether_addr.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -47,7 +47,6 @@
* bytes are always in network order.
*/
-#include "c_synonyms.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
@@ -92,7 +91,7 @@ ether_hostton(
NSS_XbyY_INIT(&arg, e, NULL, 0, str2ether);
arg.key.name = host;
res = nss_search(&db_root, _nss_initf_ethers,
- NSS_DBOP_ETHERS_HOSTTON, &arg);
+ NSS_DBOP_ETHERS_HOSTTON, &arg);
(void) NSS_XbyY_FINI(&arg);
return (arg.status = res);
}
@@ -117,7 +116,7 @@ ether_ntohost(
NSS_XbyY_INIT(&arg, NULL, host, 0, str2ether);
arg.key.ether = (void *)e;
res = nss_search(&db_root, _nss_initf_ethers,
- NSS_DBOP_ETHERS_NTOHOST, &arg);
+ NSS_DBOP_ETHERS_NTOHOST, &arg);
/* memcpy(host, ether_res.host, strlen(ether_res.host)); */
(void) NSS_XbyY_FINI(&arg);
return (arg.status = res);
@@ -294,7 +293,7 @@ ether_aton(const char *s)
i = sscanf(s, " %x:%x:%x:%x:%x:%x",
&t[0], &t[1], &t[2], &t[3], &t[4], &t[5]);
if (i != 6)
- return (NULL);
+ return (NULL);
for (i = 0; i < 6; i++)
e->ether_addr_octet[i] = (uchar_t)t[i];
return (e);
diff --git a/usr/src/lib/libsocket/inet/getaddrinfo.c b/usr/src/lib/libsocket/inet/getaddrinfo.c
index f3f93acbe1..30b1860eb6 100644
--- a/usr/src/lib/libsocket/inet/getaddrinfo.c
+++ b/usr/src/lib/libsocket/inet/getaddrinfo.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -38,10 +38,9 @@
#include <ctype.h>
#include <sys/types.h>
#include <stdlib.h>
+#include <libintl.h>
#include <net/if.h>
-extern char *_dgettext(const char *, const char *);
-
#define ai2sin(x) ((struct sockaddr_in *)((x)->ai_addr))
#define ai2sin6(x) ((struct sockaddr_in6 *)((x)->ai_addr))
@@ -837,9 +836,9 @@ const char *
gai_strerror(int ecode)
{
if (ecode < 0)
- return (_dgettext(TEXT_DOMAIN,
+ return (dgettext(TEXT_DOMAIN,
"name translation internal error"));
else if (ecode < gai_nerr)
- return (_dgettext(TEXT_DOMAIN, gai_errlist[ecode]));
- return (_dgettext(TEXT_DOMAIN, "unknown name translation error"));
+ return (dgettext(TEXT_DOMAIN, gai_errlist[ecode]));
+ return (dgettext(TEXT_DOMAIN, "unknown name translation error"));
}
diff --git a/usr/src/lib/libsocket/inet/rcmd.c b/usr/src/lib/libsocket/inet/rcmd.c
index 5cb0fb674f..6a0edcac5b 100644
--- a/usr/src/lib/libsocket/inet/rcmd.c
+++ b/usr/src/lib/libsocket/inet/rcmd.c
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -74,11 +75,6 @@ char *strchr();
char *index();
#endif /* SYSV */
-extern char *_dgettext();
-extern int _sigaction();
-extern int _sigaddset();
-extern int _sigprocmask();
-extern int _fcntl();
extern int usingypmap();
static int _validuser(FILE *hostf, char *rhost, const char *luser,
@@ -151,7 +147,7 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
rc = getaddrinfo(*ahost, aport, &hints, &res);
if (rc != 0) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN, "%s: unknown host%s\n"),
+ dgettext(TEXT_DOMAIN, "%s: unknown host%s\n"),
*ahost, rc == EAI_AGAIN ? " (try again later)" : "");
return (-1);
}
@@ -162,12 +158,12 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
/* ignore SIGPIPE */
bzero((char *)&newaction, sizeof (newaction));
newaction.sa_handler = SIG_IGN;
- (void) _sigaction(SIGPIPE, &newaction, &oldaction);
+ (void) sigaction(SIGPIPE, &newaction, &oldaction);
/* block SIGURG */
bzero((char *)&newmask, sizeof (newmask));
- (void) _sigaddset(&newmask, SIGURG);
- (void) _sigprocmask(SIG_BLOCK, &newmask, &oldmask);
+ (void) sigaddset(&newmask, SIGURG);
+ (void) sigprocmask(SIG_BLOCK, &newmask, &oldmask);
#else
oldmask = _sigblock(sigmask(SIGURG));
#endif /* SYSV */
@@ -188,17 +184,17 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
if (errno == EAGAIN)
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"socket: All ports in use\n"));
else
perror("rcmd: socket");
#ifdef SYSV
/* restore original SIGPIPE handler */
- (void) _sigaction(SIGPIPE, &oldaction,
+ (void) sigaction(SIGPIPE, &oldaction,
(struct sigaction *)0);
/* restore original signal mask */
- (void) _sigprocmask(SIG_SETMASK, &oldmask,
+ (void) sigprocmask(SIG_SETMASK, &oldmask,
(sigset_t *)0);
#else
sigsetmask(oldmask);
@@ -219,7 +215,7 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
in6addr->sin6_family = AF_INET6;
addrlen = sizeof (struct sockaddr_in6);
}
- (void) _fcntl(s, F_SETOWN, pid);
+ (void) fcntl(s, F_SETOWN, pid);
if (connect(s, (struct sockaddr *)&caddr, addrlen) >= 0)
break;
(void) close(s);
@@ -241,7 +237,7 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
addr = (char *)&((struct sockaddr_in *)
res->ai_addr)->sin_addr;
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN, "connect to address %s: "),
+ dgettext(TEXT_DOMAIN, "connect to address %s: "),
inet_ntop(res->ai_addr->sa_family, addr,
abuf, sizeof (abuf)));
errno = oerrno;
@@ -254,7 +250,7 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
addr = (char *)&((struct sockaddr_in *)
res->ai_addr)->sin_addr;
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN, "Trying %s...\n"),
+ dgettext(TEXT_DOMAIN, "Trying %s...\n"),
inet_ntop(res->ai_addr->sa_family, addr,
abuf, sizeof (abuf)));
continue;
@@ -263,11 +259,11 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
freeaddrinfo(resp);
#ifdef SYSV
/* restore original SIGPIPE handler */
- (void) _sigaction(SIGPIPE, &oldaction,
+ (void) sigaction(SIGPIPE, &oldaction,
(struct sigaction *)0);
/* restore original signal mask */
- (void) _sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
+ (void) sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
#else
sigsetmask(oldmask);
#endif /* SYSV */
@@ -286,7 +282,7 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
(void) listen(s2, 1);
(void) snprintf(aport, MAX_SHORTSTRLEN, "%d", lport);
if (write(s, aport, strlen(aport)+1) != strlen(aport)+1) {
- perror(_dgettext(TEXT_DOMAIN,
+ perror(dgettext(TEXT_DOMAIN,
"write: setting up stderr"));
(void) close(s2);
goto bad;
@@ -339,9 +335,9 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
sin = (struct sockaddr_in *)&faddr;
if (ntohs(sin->sin_port) >= IPPORT_RESERVED) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
- "socket: protocol failure in circuit "
- "setup.\n"));
+ dgettext(TEXT_DOMAIN,
+ "socket: protocol failure in circuit "
+ "setup.\n"));
goto bad2;
}
break;
@@ -349,15 +345,15 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
sin6 = (struct sockaddr_in6 *)&faddr;
if (ntohs(sin6->sin6_port) >= IPPORT_RESERVED) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
- "socket: protocol failure in circuit "
- "setup.\n"));
+ dgettext(TEXT_DOMAIN,
+ "socket: protocol failure in circuit "
+ "setup.\n"));
goto bad2;
}
break;
default:
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"socket: protocol failure in circuit setup.\n"));
goto bad2;
}
@@ -369,14 +365,14 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
if (retval != 1) {
if (retval == 0) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"Protocol error, %s closed connection\n"),
*ahost);
} else if (retval < 0) {
perror(*ahost);
} else {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"Protocol error, %s sent %d bytes\n"),
*ahost, retval);
}
@@ -392,10 +388,10 @@ int rcmd_af(char **ahost, unsigned short rport, const char *locuser,
}
#ifdef SYSV
/* restore original SIGPIPE handler */
- (void) _sigaction(SIGPIPE, &oldaction, (struct sigaction *)0);
+ (void) sigaction(SIGPIPE, &oldaction, (struct sigaction *)0);
/* restore original signal mask */
- (void) _sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
+ (void) sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
#else
sigsetmask(oldmask);
#endif /* SYSV */
@@ -408,10 +404,10 @@ bad:
(void) close(s);
#ifdef SYSV
/* restore original SIGPIPE handler */
- (void) _sigaction(SIGPIPE, &oldaction, (struct sigaction *)0);
+ (void) sigaction(SIGPIPE, &oldaction, (struct sigaction *)0);
/* restore original signal mask */
- (void) _sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
+ (void) sigprocmask(SIG_SETMASK, &oldmask, (sigset_t *)0);
#else
sigsetmask(oldmask);
#endif /* SYSV */
@@ -707,7 +703,7 @@ _validuser(FILE *hostf, char *rhost, const char *luser,
p++;
user = p;
while (*p != '\n' && *p != ' ' && *p != '\t' &&
- *p != '\0')
+ *p != '\0')
p++;
} else
user = p;
@@ -744,7 +740,7 @@ _validuser(FILE *hostf, char *rhost, const char *luser,
#ifdef NIS
else if (user[0] == '+' && user[1] == '@')
usermatch = innetgr(user+2, NULL,
- ruser, domain);
+ ruser, domain);
else if (user[0] == '-' && user[1] == '@') {
if (hostmatch &&
innetgr(user+2, NULL, ruser, domain))
diff --git a/usr/src/lib/libsocket/inet/rexec.c b/usr/src/lib/libsocket/inet/rexec.c
index 09ce6fe49d..63f8180219 100644
--- a/usr/src/lib/libsocket/inet/rexec.c
+++ b/usr/src/lib/libsocket/inet/rexec.c
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -57,8 +58,6 @@
#define MAX_SHORTSTRLEN 6
-extern char *_dgettext();
-
void _ruserpass(const char *host, char **aname, char **apass);
int rexec(char **ahost, unsigned short rport, const char *name,
@@ -81,7 +80,7 @@ int rexec_af(char **ahost, unsigned short rport, const char *name,
if (!(af == AF_INET || af == AF_INET6 || af == AF_UNSPEC)) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN, "%d: Address family not "
+ dgettext(TEXT_DOMAIN, "%d: Address family not "
"supported\n"), af);
errno = EAFNOSUPPORT;
return (-1);
@@ -95,7 +94,7 @@ int rexec_af(char **ahost, unsigned short rport, const char *name,
if (rc != 0) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN, "%s: unknown host\n"),
+ dgettext(TEXT_DOMAIN, "%s: unknown host\n"),
*ahost);
return (-1);
}
diff --git a/usr/src/lib/libsocket/inet/ruserpass.c b/usr/src/lib/libsocket/inet/ruserpass.c
index 4d9780f2af..17d59439a9 100644
--- a/usr/src/lib/libsocket/inet/ruserpass.c
+++ b/usr/src/lib/libsocket/inet/ruserpass.c
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -48,8 +49,6 @@
#include <stdlib.h>
#include <libintl.h>
-extern char *_dgettext();
-
#ifdef SYSV
#define index strchr
#endif /* SYSV */
@@ -126,7 +125,7 @@ _ruserpass(const char *host, char **aname, char **apass)
*aname = malloc(MAXANAME + 1);
(void) cuserid(myname);
- (void) printf(_dgettext(TEXT_DOMAIN, "Name (%s:%s): "),
+ (void) printf(dgettext(TEXT_DOMAIN, "Name (%s:%s): "),
host, myname);
(void) fflush(stdout);
if (read(2, *aname, MAXANAME) <= 0)
@@ -139,8 +138,8 @@ _ruserpass(const char *host, char **aname, char **apass)
*index(*aname, '\n') = 0;
}
if (*aname && *apass == 0) {
- (void) printf(_dgettext(TEXT_DOMAIN, "Password (%s:%s): "),
- host, *aname);
+ (void) printf(dgettext(TEXT_DOMAIN, "Password (%s:%s): "),
+ host, *aname);
(void) fflush(stdout);
*apass = getpass("");
}
@@ -194,12 +193,12 @@ next:
break;
case PASSWD:
if (fstat64(fileno(d->cfile), &stb) >= 0 &&
- (stb.st_mode & 077) != 0) {
+ (stb.st_mode & 077) != 0) {
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"Error - .netrc file not correct mode.\n"));
(void) fprintf(stderr,
- _dgettext(TEXT_DOMAIN,
+ dgettext(TEXT_DOMAIN,
"Remove password or correct mode.\n"));
exit(1);
}
@@ -215,7 +214,7 @@ next:
(void) token();
break;
default:
- (void) fprintf(stderr, _dgettext(TEXT_DOMAIN,
+ (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
"Unknown .netrc option %s\n"), d->tokval);
break;
}
@@ -253,7 +252,7 @@ token()
} else {
*cp++ = (char)c;
while ((c = getc(d->cfile)) != EOF &&
- c != '\n' && c != '\t' && c != ' ' && c != ',') {
+ c != '\n' && c != '\t' && c != ' ' && c != ',') {
if (c == '\\')
c = getc(d->cfile);
*cp++ = (char)c;
diff --git a/usr/src/lib/libsocket/socket/_soutil.c b/usr/src/lib/libsocket/socket/_soutil.c
index 732b544ac6..d91e549cff 100644
--- a/usr/src/lib/libsocket/socket/_soutil.c
+++ b/usr/src/lib/libsocket/socket/_soutil.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 1989 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -43,8 +43,6 @@
#include <stdlib.h>
#include <string.h>
-extern int _stat();
-
/*
* XXX The functions in this file are only needed to support transport
* providers that have not yet been converted to use /etc/sock2path.
@@ -144,7 +142,7 @@ retry:
#if defined(i386)
if (_xstat(_STAT_VER, net->nc_device, &stats) < 0) {
#else
- if (_stat(net->nc_device, &stats) < 0) {
+ if (stat(net->nc_device, &stats) < 0) {
#endif
switch (errno) {
case EINTR:
@@ -189,15 +187,16 @@ _s_match_netconf(int family, int type, int proto, void **nethandle)
char *oproto;
if (family < 0 ||
- family >= (int)sizeof (family_sw) / (int)sizeof (char *) ||
- proto < 0 || proto >= IPPROTO_MAX) {
- errno = EPROTONOSUPPORT;
- return (NULL);
+ family >= (int)sizeof (family_sw) / (int)sizeof (char *) ||
+ proto < 0 || proto >= IPPROTO_MAX) {
+ errno = EPROTONOSUPPORT;
+ return (NULL);
}
if (proto) {
if (proto >= (int)sizeof (proto_sw) / (int)sizeof (char *))
oproto = "";
- else oproto = proto_sw[proto];
+ else
+ oproto = proto_sw[proto];
}
/*
@@ -236,7 +235,7 @@ _s_match_netconf(int family, int type, int proto, void **nethandle)
continue;
} else {
if (strcmp(net->nc_protofmly, family_sw[family]) == 0 &&
- semantics == type) {
+ semantics == type) {
break;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-23 09:38:53 +0000