JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (DLL_OFILES): Add rexec.o.

Browse Source 
* autoload.cc (inet_network): Drop definition.
	(rexec): Ditto.
	* net.cc (rexec): Drop extern declaration.
	(inet_network): Ditto.
	(cygwin_inet_network): Implement using inet_addr.
	(cygwin_rexec): Remove.
	* libc/rexec.cc: New file.
This commit is contained in:
Corinna Vinschen
2006-07-04 20:24:27 +00:00
parent c2ab308c81
commit fa48cf5325
5 changed files with 430 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
winsup/cygwin/net.cc
View File

@ -47,8 +47,6 @@ extern "C"
int __stdcall rcmd (char **ahost, unsigned short inport, char *locuser,
char *remuser, char *cmd, SOCKET * fd2p);
int __stdcall rexec (char **ahost, unsigned short inport, char *locuser,
char *password, char *cmd, SOCKET * fd2p);
int sscanf (const char *, const char *, ...);
} /* End of "C" section */
@ -147,18 +145,13 @@ cygwin_inet_aton (const char *cp, struct in_addr *inp)
return 1;
}
/* undocumented in wsock32.dll */
extern "C" unsigned int WINAPI inet_network (const char *);
extern "C" unsigned int
cygwin_inet_network (const char *cp)
{
myfault efault;
if (efault.faulted (EFAULT))
return INADDR_NONE;
unsigned int res = inet_network (cp);
return res;
return ntohl (inet_addr (cp));
}
/* inet_netof is in the standard BSD sockets library. It is useless
@ -2002,58 +1995,6 @@ cygwin_rresvport (int *port)
return res;
}
/* exported as rexec: standards? */
extern "C" int
cygwin_rexec (char **ahost, unsigned short inport, char *locuser,
char *password, char *cmd, int *fd2p)
{
int res = -1;
SOCKET fd2s;
sig_dispatch_pending ();
myfault efault;
if (efault.faulted (EFAULT))
return (int) INVALID_SOCKET;
res = rexec (ahost, inport, locuser, password, cmd, fd2p ? &fd2s : NULL);
if (res != (int) INVALID_SOCKET)
{
cygheap_fdnew res_fd;
if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res))
{
((fhandler_socket *) res_fd)->connect_state (connected);
res = res_fd;
}
else
{
closesocket (res);
res = -1;
}
if (res >= 0 && fd2p)
{
cygheap_fdnew newfd (res_fd, false);
cygheap_fdget fd (*fd2p);
if (newfd >= 0 && fdsock (newfd, tcp_dev, fd2s))
{
((fhandler_socket *) fd2p)->connect_state (connected);
*fd2p = newfd;
}
else
{
closesocket (res);
closesocket (fd2s);
res = -1;
}
}
}
syscall_printf ("%d = rexec (...)", res);
return res;
}
/* socketpair: standards? */
/* Win32 supports AF_INET only, so ignore domain and protocol arguments */
extern "C" int