--------------------- PatchSet 1055 Date: 2001/01/04 00:00:31 Author: rbcollins Branch: cygwin Tag: (none) Log: missed one Members: src/logfile.c:1.2.30.2->1.2.30.3 src/main.c:1.12.2.2->1.12.2.3 Index: squid/src/logfile.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/logfile.c,v retrieving revision 1.2.30.2 retrieving revision 1.2.30.3 diff -u -r1.2.30.2 -r1.2.30.3 --- squid/src/logfile.c 3 Jan 2001 23:52:41 -0000 1.2.30.2 +++ squid/src/logfile.c 4 Jan 2001 00:00:31 -0000 1.2.30.3 @@ -108,11 +108,7 @@ xrename(lf->path, to); } /* Reopen the log. It may have been renamed "manually" */ -#if defined (_SQUID_CYGWIN_) lf->fd = file_open(lf->path, O_WRONLY | O_CREAT | O_TEXT); -#else - lf->fd = file_open(lf->path, O_WRONLY | O_CREAT); -#endif if (DISK_ERROR == lf->fd && lf->flags.fatal) { debug(50, 1) ("logfileRotate: %s: %s\n", lf->path, xstrerror()); fatalf("Cannot open %s: %s", lf->path, xstrerror()); Index: squid/src/main.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/main.c,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -u -r1.12.2.2 -r1.12.2.3 --- squid/src/main.c 3 Jan 2001 23:52:41 -0000 1.12.2.2 +++ squid/src/main.c 4 Jan 2001 00:00:31 -0000 1.12.2.3 @@ -1,6 +1,6 @@ /* - * $Id: main.c,v 1.12.2.2 2001/01/03 23:52:41 rbcollins Exp $ + * $Id: main.c,v 1.12.2.3 2001/01/04 00:00:31 rbcollins Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -859,7 +859,6 @@ */ /* Connect stdio to /dev/null in daemon mode */ nullfd = open("/dev/null", O_RDWR | O_TEXT); - dup2(nullfd, 0); if (opt_debug_stderr < 0) { dup2(nullfd, 1);