mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 20:04:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

socketmodule.c: added socket.fromfd(fd, family, type, [proto]);

Browse Source 
converted socket() to use of getargs().
This commit is contained in:
Guido van Rossum 1992-12-08 13:38:24 +00:00
parent 6209b97df4
commit 2a7178efe1
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Modules/socketmodule.c
View File

@ -933,16 +933,13 @@ socket_socket(self, args)
object *args;
{
sockobject *s;
int family, type, proto, fd;
if (args != NULL && is_tupleobject(args) && gettuplesize(args) == 3) {
if (!getintintintarg(args, &family, &type, &proto))
int fd, family, type, proto;
proto = 0;
if (!getargs(args, "(ii)", &family, &type)) {
err_clear();
if (!getargs(args, "(iii)", &family, &type, &proto))
return NULL;
}
else {
if (!getintintarg(args, &family, &type))
return NULL;
proto = 0;
}
BGN_SAVE
fd = socket(family, type, proto);
END_SAVE
@ -960,6 +957,32 @@ socket_socket(self, args)
}
/* Create a socket object from a numeric file description.
Useful e.g. if stdin is a socket.
Additional arguments as for socket(). */
/*ARGSUSED*/
static object *
socket_fromfd(self, args)
object *self;
object *args;
{
sockobject *s;
int fd, family, type, proto;
proto = 0;
if (!getargs(args, "(iii)", &fd, &family, &type)) {
err_clear();
if (!getargs(args, "(iiii)", &fd, &family, &type, &proto))
return NULL;
}
s = newsockobject(fd, family, type, proto);
/* From now on, ignore SIGPIPE and let the error checking
do the work. */
(void) signal(SIGPIPE, SIG_IGN);
return (object *) s;
}
/* List of functions exported by this module. */
static struct methodlist socket_methods[] = {
@ -967,6 +990,7 @@ static struct methodlist socket_methods[] = {
{"gethostname", socket_gethostname},
{"getservbyname", socket_getservbyname},
{"socket", socket_socket},
{"fromfd", socket_fromfd},
{NULL, NULL} /* Sentinel */
};