bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-23 07:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-end_unlink'

Browse source
This commit is contained in:
Gerhard Rieger 2010-01-09 16:06:11 +01:00
commit 16398a14fb
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xio.h
View file

@ -158,7 +158,6 @@ typedef struct single {
END_NONE, /* no action */ END_NONE, /* no action */
END_CLOSE, /* close() */ END_CLOSE, /* close() */
END_SHUTDOWN, /* shutdown() */ END_SHUTDOWN, /* shutdown() */
END_UNLINK, /* unlink() */
END_KILL, /* has subprocess */ END_KILL, /* has subprocess */
END_CLOSE_KILL, /* first close fd, then kill subprocess */ END_CLOSE_KILL, /* first close fd, then kill subprocess */
END_SHUTDOWN_KILL /* first shutdown fd, then kill subprocess */ END_SHUTDOWN_KILL /* first shutdown fd, then kill subprocess */
@ -171,7 +170,6 @@ typedef struct single {
bool ttyvalid; /* the following struct is valid */ bool ttyvalid; /* the following struct is valid */
struct termios savetty; /* save orig tty settings for later restore */ struct termios savetty; /* save orig tty settings for later restore */
#endif /* WITH_TERMIOS */ #endif /* WITH_TERMIOS */
const char *name; /* only with END_UNLINK */
int (*sigchild)(struct single *); /* callback after sigchild */ int (*sigchild)(struct single *); /* callback after sigchild */
pid_t ppid; /* parent pid, only if we send it signals */ pid_t ppid; /* parent pid, only if we send it signals */
int escape; /* escape character; -1 for no escape */ int escape; /* escape character; -1 for no escape */

5
xioclose.c
View file

@ -1,5 +1,5 @@
/* source: xioclose.c */ /* source: xioclose.c */
/* Copyright Gerhard Rieger 2001-2008 */ /* Copyright Gerhard Rieger 2001-2009 */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
/* this is the source of the extended close function */ /* this is the source of the extended close function */
@ -72,9 +72,6 @@ int xioclose1(struct single *pipe) {
Info3("shutdown(%d, %d): %s", pipe->fd, 2, strerror(errno)); } Info3("shutdown(%d, %d): %s", pipe->fd, 2, strerror(errno)); }
break; break;
#endif /* _WITH_SOCKET */ #endif /* _WITH_SOCKET */
case END_UNLINK: if (Unlink((const char *)pipe->name) < 0) {
Warn2("unlink(\"%s\"): %s", pipe->name, strerror(errno)); }
break;
case END_NONE: default: break; case END_NONE: default: break;
} }
} }