summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:08 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:08 +0000
commit93641593cafac296b9072288d8ef9e1a526d745b (patch)
tree5dfa5b05a5a082e2d5acd443141d7c9b09d5f037 /apt-pkg/contrib
parent9391a747a8b94474e2d75db82dfb7fcef720e9ef (diff)
Upgraded to eg++ 1.1 and libstdc++2.9
Author: jgg Date: 1998-10-20 04:33:11 GMT Upgraded to eg++ 1.1 and libstdc++2.9
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/fileutl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index cc0363da5..bfc674c62 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: fileutl.cc,v 1.9 1998/10/20 02:39:28 jgg Exp $
+// $Id: fileutl.cc,v 1.10 1998/10/20 04:33:16 jgg Exp $
/* ######################################################################
File Utilities
@@ -137,7 +137,7 @@ void SetCloseExec(int Fd,bool Close)
void SetNonBlock(int Fd,bool Block)
{
int Flags = fcntl(Fd,F_GETFL);
- if (fcntl(Fd,F_SETFL,(Block == false)?0:O_NONBLOCK) != 0)
+ if (fcntl(Fd,F_SETFL,(Flags & ~O_NONBLOCK) | (Block == false)?0:O_NONBLOCK) != 0)
{
cerr << "FATAL -> Could not set non-blocking flag " << strerror(errno) << endl;
exit(100);