diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-10-16 07:41:55 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-10-16 07:41:55 +0000 |
commit | 40a3261d1a6e2617f6afde0cd6d762a7e211af7a (patch) | |
tree | d70bbf882801af3a4e58dde3ed6a1da1849479d4 /editors/emacs22/files/patch-src:process.c | |
parent | Fix the string format vulnerability desribed at (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_0_0'.release/6.0.0
Diffstat (limited to 'editors/emacs22/files/patch-src:process.c')
-rw-r--r-- | editors/emacs22/files/patch-src:process.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/editors/emacs22/files/patch-src:process.c b/editors/emacs22/files/patch-src:process.c deleted file mode 100644 index 884d06d9a1c6..000000000000 --- a/editors/emacs22/files/patch-src:process.c +++ /dev/null @@ -1,72 +0,0 @@ ---- src/process.c.orig Mon Mar 17 07:06:56 2003 -+++ src/process.c Fri Apr 23 19:28:58 2004 -@@ -1891,10 +1891,34 @@ - Likewise for immediate_quit. */ - break; - -+#if 1 -+ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ -+ fd_set fds; -+ int e; -+ struct timeval tv; -+ tv.tv_sec =60; -+ tv.tv_usec = 0; -+ FD_ZERO(&fds); -+ FD_SET(s, &fds); -+ resel: -+ QUIT; -+ e = select(s+1, NULL, &fds, NULL, &tv); -+ -+ if( e == -1){ -+ if(errno == EINTR) -+ goto resel; -+ else -+ xerrno = ETIMEDOUT; -+ } -+ else { -+ xerrno = 0; -+ break; -+ } -+ } -+#endif -+ - immediate_quit = 0; - -- if (xerrno == EINTR) -- goto loop; - if (xerrno == EADDRINUSE && retry < 20) - { - /* A delay here is needed on some FreeBSD systems, -@@ -2001,10 +2025,30 @@ - { - int xerrno = errno; - -+#if 1 -+ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ -+ fd_set fds; -+ int e; -+ struct timeval tv; -+ tv.tv_sec =60; -+ tv_tv_usec = 0; -+ FD_CLEAR(&fds); -+ FD_SET(s, &fds); -+ resel: -+ QUIT; -+ e = select(s+1, NULL, fds, NULL, &tv); -+ if( e != 0){ -+ if(errno == EINTR) -+ goto resel; -+ else -+ xerrno = ETIMEDOUT; -+ } -+ else -+ xerrno = 0; -+ } -+#endif - immediate_quit = 0; - -- if (errno == EINTR) -- goto loop; - if (errno == EADDRINUSE && retry < 20) - { - /* A delay here is needed on some FreeBSD systems, |