--------------------- PatchSet 2924 Date: 2001/08/31 06:24:33 Author: tolsty Branch: nt-2_3-tolsty Tag: (none) Log: Roworked file descriptor handling. Now even more like on unicies. There still some shortcomings. Members: include/config.h:1.1.2.6.2.1->1.1.2.6.2.2 lib/win32lib.c:1.1.2.4.2.1->1.1.2.4.2.2 src/cachemgr.c:1.1.1.3.4.1.2.3.2.1->1.1.1.3.4.1.2.3.2.2 src/client.c:1.1.1.3.4.1.2.2.2.1->1.1.1.3.4.1.2.2.2.2 src/client_side.c:1.1.1.3.4.6.2.4.2.1->1.1.1.3.4.6.2.4.2.2 src/comm.c:1.1.1.3.4.1.2.5.2.1->1.1.1.3.4.1.2.5.2.2 src/comm_select.c:1.1.1.3.4.2.2.3.2.1->1.1.1.3.4.2.2.3.2.2 src/defines.h:1.1.1.3.4.2.2.2.2.1->1.1.1.3.4.2.2.2.2.2 src/errorpage.c:1.1.1.3.4.3.2.2.2.1->1.1.1.3.4.3.2.2.2.2 src/fd.c:1.1.1.3.4.1.2.2.2.1->1.1.1.3.4.1.2.2.2.2 src/globals.h:1.1.1.3.4.2.2.4.2.1->1.1.1.3.4.2.2.4.2.2 src/http.c:1.1.1.3.4.3.2.2.2.1->1.1.1.3.4.3.2.2.2.2 src/ipc.c:1.1.1.3.4.1.2.1.2.1->1.1.1.3.4.1.2.1.2.2 src/pinger.c:1.1.1.3.4.1.2.1.2.1->1.1.1.3.4.1.2.1.2.2 src/protos.h:1.1.1.3.4.1.2.6.2.1->1.1.1.3.4.1.2.6.2.2 src/stat.c:1.1.1.3.4.1.2.5.2.1->1.1.1.3.4.1.2.5.2.2 src/structs.h:1.1.1.3.4.2.2.3.2.1->1.1.1.3.4.2.2.3.2.2 src/typedefs.h:1.1.1.3.4.1.2.3.2.1->1.1.1.3.4.1.2.3.2.2 src/unlinkd.c:1.1.1.3.4.1.2.1.2.1->1.1.1.3.4.1.2.1.2.2 win/squidnt/squidnt.mak:1.1.2.5.2.1->1.1.2.5.2.2 Index: squid/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/config.h,v retrieving revision 1.1.2.6.2.1 retrieving revision 1.1.2.6.2.2 diff -u -r1.1.2.6.2.1 -r1.1.2.6.2.2 --- squid/include/config.h 27 Aug 2001 21:48:17 -0000 1.1.2.6.2.1 +++ squid/include/config.h 31 Aug 2001 06:24:33 -0000 1.1.2.6.2.2 @@ -172,8 +172,6 @@ #define O_TRUNC _O_TRUNC #define O_CREAT _O_CREAT -#define read _read -#define write _write #define close _close #define fileno _fileno #define fdopen _fdopen @@ -194,6 +192,24 @@ #define geteuid() 100 #define setgid(g) 100 +/* internal to CTRLIB */ +#define FPIPE 0x08 /* file handle refers to a pipe */ +typedef struct { + long osfhnd; /* underlying OS file HANDLE */ + char osfile; /* attributes of file (e.g., open in text mode?) */ + char pipech; /* one char buffer for handles opened on pipes */ +#ifdef _MT + int lockinitflag; + CRITICAL_SECTION lock; +#endif /* _MT */ + } ioinfo; +extern _CRTIMP ioinfo * __pioinfo[]; +#define IOINFO_L2E 5 +#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) +#define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - \ + 1)) ) +#define _osfile(i) ( _pioinfo(i)->osfile ) + struct passwd { uid_t pw_uid; }; @@ -202,6 +218,7 @@ gid_t gr_gid; }; +#if 0 #if defined(CLIENT_SIDE_C) || defined(COMM_C) || defined(COMM_SELECT_C) || \ defined (DNS_INTERNAL_C) || defined (FORWARD_C) || defined(FTP_C) || \ defined (GOPHER_C) || defined (HELPER_C) || defined (HTCP_C) || \ @@ -213,8 +230,9 @@ #define read(x,y,z) recv(x,y,z,0) #define write(x,y,z) send(x,y,z,0) #endif +#endif -#if defined(COMM_C) || defined(SNMP_API_C) || defined(TOOLS_C) +#if 0 && (defined(COMM_C) || defined(SNMP_API_C) || defined(TOOLS_C)) #undef close #define close(fd) closesocket(fd) #endif @@ -229,7 +247,7 @@ /* used also in win32lib.c */ extern void __cdecl _dosmaperr(unsigned long oserrno); -#if defined(COMM_C) +#if defined(COMM_C) && 0 static __declspec(thread) SOCKET tmp_fd; #undef dup2 #define dup2(fd1,fd2) \ @@ -251,92 +269,106 @@ (_dosmaperr(GetLastError()), -1)) #endif -#if defined (COMM_C) || defined (COMM_SELECT_C) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define fd_note(x,y) sd_note(x,y) -#define fd_open(x,y,z) sd_open(x,y,z) -#define fd_close(x) sd_close(x) -#endif - -#if defined (ICP_V2_C) -#define fd_note(x,y) sd_note(x,y) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined (SNMP_CORE_C) -#define fd_note(x,y) sd_note(x,y) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined(WHOIS_C) || defined(WAIS_C) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined (SSL_C) || defined (PCONN_C) || defined (PUMP_C) || \ - defined (HTTP_C) || defined (HTCP_C) || defined (HELPER_C) || defined (CLIENT_SIDE_C) \ - || defined (FTP_C) || defined (GOPHER_C) || defined(IDENT_C) || \ - defined (ICMP_C) || defined (FORWARD_C) || defined (DNS_INTERNAL_C) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define fd_note(x,y) sd_note(x,y) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - #define _PATH_RESOLV_CONF Config.pidFilename #undef h_errno #define h_errno errno /* we'll set it ourselves */ +#undef FD_CLR +#define FD_CLR(fd, set) do { \ + u_int __i; \ + SOCKET _sock = _get_osfhandle(fd); \ + for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \ + if (((fd_set FAR *)(set))->fd_array[__i] == _sock) { \ + while (__i < ((fd_set FAR *)(set))->fd_count-1) { \ + ((fd_set FAR *)(set))->fd_array[__i] = \ + ((fd_set FAR *)(set))->fd_array[__i+1]; \ + __i++; \ + } \ + ((fd_set FAR *)(set))->fd_count--; \ + break; \ + } \ + } \ +} while(0) + +#undef FD_SET +#define FD_SET(fd, set) do { \ + u_int __i; \ + SOCKET _sock = _get_osfhandle(fd); \ + for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \ + if (((fd_set FAR *)(set))->fd_array[__i] == (_sock)) { \ + break; \ + } \ + } \ + if (__i == ((fd_set FAR *)(set))->fd_count) { \ + if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) { \ + ((fd_set FAR *)(set))->fd_array[__i] = (_sock); \ + ((fd_set FAR *)(set))->fd_count++; \ + } \ + } \ +} while(0) + +#undef FD_ISSET +#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)_get_osfhandle(fd), (fd_set FAR *)(set)) + extern __declspec(thread) int ws32_result; #define socket(f,t,p) \ (INVALID_SOCKET == ((SOCKET)ws32_result = socket(f,t,p)) ? \ ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ - (SOCKET)ws32_result) + (SOCKET)_open_osfhandle(ws32_result,0)) #define accept(s,a,l) \ - (INVALID_SOCKET == ((SOCKET)ws32_result = accept(s,a,l)) ? \ + (INVALID_SOCKET == ((SOCKET)ws32_result = accept(_get_osfhandle(s),a,l)) ? \ ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ - (SOCKET)ws32_result) + (SOCKET)_open_osfhandle(ws32_result,0)) #define bind(s,n,l) \ - (SOCKET_ERROR == bind(s,n,l) ? \ + (SOCKET_ERROR == bind(_get_osfhandle(s),n,l) ? \ (errno = WSAGetLastError()), -1 : 0) #define connect(s,n,l) \ - (SOCKET_ERROR == connect(s,n,l) ? \ + (SOCKET_ERROR == connect(_get_osfhandle(s),n,l) ? \ (WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1, -1) : 0) #define listen(s,b) \ - (SOCKET_ERROR == listen(s,b) ? \ + (SOCKET_ERROR == listen(_get_osfhandle(s),b) ? \ (WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1, -1) : 0) #define shutdown(s,h) \ - (SOCKET_ERROR == shutdown(s,h) ? \ + (SOCKET_ERROR == shutdown(_get_osfhandle(s),h) ? \ (errno = WSAGetLastError()), -1 : 0) +/* don't want to use it - cause an error */ #define closesocket(s) \ - (SOCKET_ERROR == closesocket(s) ? \ - (errno = WSAGetLastError()), -1 : 0) + use_close_instead +// (SOCKET_ERROR == closesocket(_get_osfhandle(s)) ? \ +// (errno = WSAGetLastError()), -1 : lkshgfkdfjg0) +#if defined(COMM_SELECT_C) +#define select(n,r,w,e,t) \ + (SOCKET_ERROR == (ws32_result = select(n,r,w,&errfds,t)) ? \ + ((errno = WSAGetLastError()), -1) : ws32_result) +#else #define select(n,r,w,e,t) \ (SOCKET_ERROR == (ws32_result = select(n,r,w,e,t)) ? \ ((errno = WSAGetLastError()), -1) : ws32_result) +#endif #define recv(s,b,l,f) \ - (SOCKET_ERROR == (ws32_result = recv(s,b,l,f)) ? \ + (SOCKET_ERROR == (ws32_result = recv(_get_osfhandle(s),b,l,f)) ? \ ((errno = WSAGetLastError()), -1) : ws32_result) #define recvfrom(s,b,l,f,fr,frl) \ - (SOCKET_ERROR == (ws32_result = recvfrom(s,b,l,f,fr,frl)) ? \ + (SOCKET_ERROR == (ws32_result = recvfrom(_get_osfhandle(s),b,l,f,fr,frl)) ? \ ((errno = WSAGetLastError()), -1) : ws32_result) #define send(s,b,l,f) \ - (SOCKET_ERROR == (ws32_result = send(s,b,l,f)) ? \ + (SOCKET_ERROR == (ws32_result = send(_get_osfhandle(s),b,l,f)) ? \ ((errno = WSAGetLastError()), -1) : ws32_result) #define sendto(s,b,l,f,t,tl) \ - (SOCKET_ERROR == (ws32_result = sendto(s,b,l,f,t,tl)) ? \ + (SOCKET_ERROR == (ws32_result = sendto(_get_osfhandle(s),b,l,f,t,tl)) ? \ ((errno = WSAGetLastError()), -1) : ws32_result) #define getsockname(s,n,l) \ - (SOCKET_ERROR == getsockname(s,n,l) ? \ + (SOCKET_ERROR == getsockname(_get_osfhandle(s),n,l) ? \ (errno = WSAGetLastError()), -1 : 0) #define getsockopt(s,l,o,v,n) \ - (Sleep(1), SOCKET_ERROR == getsockopt(s,l,o,v,n) ? \ + (Sleep(1), SOCKET_ERROR == getsockopt(_get_osfhandle(s),l,o,v,n) ? \ (errno = WSAGetLastError()), -1 : 0) #define setsockopt(s,l,o,v,n) \ - (SOCKET_ERROR == setsockopt(s,l,o,v,n) ? \ + (SOCKET_ERROR == setsockopt(_get_osfhandle(s),l,o,v,n) ? \ (errno = WSAGetLastError()), -1 : 0) #define ioctlsocket(s,c,a) \ - (SOCKET_ERROR == ioctlsocket(s,c,a) ? \ + (SOCKET_ERROR == ioctlsocket(_get_osfhandle(s),c,a) ? \ (errno = WSAGetLastError()), -1 : 0) #define gethostname(n,l) \ (SOCKET_ERROR == gethostname(n,l) ? \ @@ -351,6 +383,26 @@ (NULL == ((HOSTENT FAR*)ws32_result = gethostbyaddr(a,l,t)) ? \ (errno = WSAGetLastError()), NULL : (HOSTENT FAR*)ws32_result) +#if defined(STORE_IO_C) || defined(STORE_DIR_C) +#define read _read +#define write _write +#else +extern __declspec(thread) int _so_err; +extern __declspec(thread) int _so_err_siz; +#define read(fd,buf,siz) \ + (_so_err_siz = sizeof(_so_err), \ + getsockopt((fd),SOL_SOCKET,SO_ERROR,(char*)&_so_err,&_so_err_siz) \ + == 0 ? recv((fd),(buf),(siz),0) : _read((fd),(buf),(siz))) +#define write(fd,buf,siz) \ + (_so_err_siz = sizeof(_so_err), \ + getsockopt((fd),SOL_SOCKET,SO_ERROR,(char*)&_so_err,&_so_err_siz) \ + == 0 ? send((fd),(buf),(siz),0) : _write((fd),(buf),(siz))) +//#define read(fd,y,z) (_osfile(fd) & FPIPE ? \ +// recv((fd),(y),(z),0) : _read((fd),(y),(z))) +//#define write(fd,y,z) (_osfile(fd) & FPIPE ? \ +// send((fd),(y),(z),0) : _write((fd),(y),(z))) +#endif + #elif defined(__APPLE__) #define _SQUID_APPLE_ Index: squid/lib/win32lib.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/win32lib.c,v retrieving revision 1.1.2.4.2.1 retrieving revision 1.1.2.4.2.2 diff -u -r1.1.2.4.2.1 -r1.1.2.4.2.2 --- squid/lib/win32lib.c 27 Aug 2001 21:48:18 -0000 1.1.2.4.2.1 +++ squid/lib/win32lib.c 31 Aug 2001 06:24:34 -0000 1.1.2.4.2.2 @@ -1,5 +1,5 @@ /* - * $Id: win32lib.c,v 1.1.2.4.2.1 2001/08/27 21:48:18 tolsty Exp $ + * $Id: win32lib.c,v 1.1.2.4.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * * * * * * * Legal stuff * * * * * * * * @@ -40,6 +40,8 @@ #define OPTERRARG (3) __declspec(thread) int ws32_result; +__declspec(thread) int _so_err; +__declspec(thread) int _so_err_siz; char *optarg; int optreset = 0; Index: squid/src/cachemgr.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/cachemgr.c,v retrieving revision 1.1.1.3.4.1.2.3.2.1 retrieving revision 1.1.1.3.4.1.2.3.2.2 diff -u -r1.1.1.3.4.1.2.3.2.1 -r1.1.1.3.4.1.2.3.2.2 --- squid/src/cachemgr.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.1.2.3.2.1 +++ squid/src/cachemgr.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.3.2.2 @@ -1,5 +1,5 @@ /* - * $Id: cachemgr.c,v 1.1.1.3.4.1.2.3.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: cachemgr.c,v 1.1.1.3.4.1.2.3.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 0 CGI Cache Manager * AUTHOR: Duane Wessels @@ -631,7 +631,7 @@ debug(1) fprintf(stderr, "wrote request: '%s'\n", buf); #ifdef _SQUID_MSWIN_ answer = read_reply(s, req); - closesocket(s); + close(s); return answer; #else return read_reply(s, req); Index: squid/src/client.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/client.c,v retrieving revision 1.1.1.3.4.1.2.2.2.1 retrieving revision 1.1.1.3.4.1.2.2.2.2 diff -u -r1.1.1.3.4.1.2.2.2.1 -r1.1.1.3.4.1.2.2.2.2 --- squid/src/client.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.1.2.2.2.1 +++ squid/src/client.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: client.c,v 1.1.1.3.4.1.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: client.c,v 1.1.1.3.4.1.2.2.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived @@ -321,11 +321,9 @@ fwrite(buf, len, 1, stdout); } #ifdef _SQUID_MSWIN_ - (void) closesocket(conn); /* done with socket */ setmode(1, O_TEXT); -#else - (void) close(conn); /* done with socket */ #endif + (void) close(conn); /* done with socket */ if (interrupted) break; Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.1.1.3.4.6.2.4.2.1 retrieving revision 1.1.1.3.4.6.2.4.2.2 diff -u -r1.1.1.3.4.6.2.4.2.1 -r1.1.1.3.4.6.2.4.2.2 --- squid/src/client_side.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.6.2.4.2.1 +++ squid/src/client_side.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.6.2.4.2.2 @@ -1,5 +1,5 @@ /* - * $Id: client_side.c,v 1.1.1.3.4.6.2.4.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: client_side.c,v 1.1.1.3.4.6.2.4.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -2374,11 +2374,7 @@ clientHttpRequest **H = NULL; char *prefix = NULL; ErrorState *err = NULL; -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[fd]; -#else fde *F = &fd_table[fd]; -#endif int len = conn->in.size - conn->in.offset - 1; debug(33, 4) ("clientReadRequest: FD %d: reading request...\n", fd); Counter.syscalls.sock.reads++; Index: squid/src/comm.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/comm.c,v retrieving revision 1.1.1.3.4.1.2.5.2.1 retrieving revision 1.1.1.3.4.1.2.5.2.2 diff -u -r1.1.1.3.4.1.2.5.2.1 -r1.1.1.3.4.1.2.5.2.2 --- squid/src/comm.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.1.2.5.2.1 +++ squid/src/comm.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.5.2.2 @@ -1,5 +1,5 @@ /* - * $Id: comm.c,v 1.1.1.3.4.1.2.5.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: comm.c,v 1.1.1.3.4.1.2.5.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 5 Socket Functions * AUTHOR: Harvest Derived @@ -72,45 +72,13 @@ static int commResetFD(ConnectStateData * cs); static int commRetryConnect(ConnectStateData * cs); -#ifdef _SQUID_MSWIN_ -void -commSetSelectS(int sd, unsigned int type, PF * handler, void *client_data, - time_t timeout) -{ - sde *F = &sd_table[sd]; - assert(sd >= 0); - assert(F->flags.open); - debug(5, 5) ("commSetSelect: SD %d type %d\n", sd, type); - if (type & COMM_SELECT_READ) { - F->read_handler = handler; - F->read_data = client_data; - commUpdateReadBitsS(sd, handler); - } - if (type & COMM_SELECT_WRITE) { - F->write_handler = handler; - F->write_data = client_data; - commUpdateWriteBitsS(sd, handler); - } - if (timeout) - F->timeout = squid_curtime + timeout; -} -#endif - static void CommWriteStateCallbackAndFree(int fd, int code) { -#ifdef _SQUID_MSWIN_ - CommWriteStateData *CommWriteState = sd_table[fd].rwstate; -#else CommWriteStateData *CommWriteState = fd_table[fd].rwstate; -#endif CWCB *callback = NULL; void *data; -#ifdef _SQUID_MSWIN_ - sd_table[fd].rwstate = NULL; -#else fd_table[fd].rwstate = NULL; -#endif if (CommWriteState == NULL) return; if (CommWriteState->free_func) { @@ -131,11 +99,7 @@ { struct sockaddr_in addr; socklen_t addr_len = 0; -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[fd]; -#else fde *F = &fd_table[fd]; -#endif /* If the fd is closed already, just return */ if (!F->flags.open) { @@ -183,11 +147,7 @@ int proto, struct in_addr addr, u_short port, int flags, const char *note) { int new_socket; -#ifdef _SQUID_MSWIN_ - sde *F = NULL; -#else fde *F = NULL; -#endif /* Create socket for accepting new connections. */ Counter.syscalls.sock.sockets++; @@ -209,11 +169,7 @@ /* update fdstat */ debug(5, 5) ("comm_open: FD %d is a new socket\n", new_socket); fd_open(new_socket, FD_SOCKET, note); -#ifdef _SQUID_MSWIN_ - F = &sd_table[new_socket]; -#else F = &fd_table[new_socket]; -#endif if (!(flags & COMM_NOCLOEXEC)) commSetCloseOnExec(new_socket); if ((flags & COMM_REUSEADDR)) @@ -359,11 +315,7 @@ return 0; } close(fd2); -#ifdef _SQUID_MSWIN_ - sd_table[cs->fd].flags.called_connect = 0; -#else fd_table[cs->fd].flags.called_connect = 0; -#endif /* * yuck, this has assumptions about comm_open() arguments for * the original socket @@ -386,7 +338,6 @@ static int commRetryConnect(ConnectStateData * cs) { -//#error What's with tries & timeout? assert(cs->addrcount > 0); if (cs->addrcount == 1) { if (cs->tries >= Config.retry.maxtries) @@ -415,11 +366,7 @@ switch (comm_connect_addr(fd, &cs->S)) { case COMM_INPROGRESS: debug(5, 5) ("commConnectHandle: FD %d: COMM_INPROGRESS\n", fd); -#ifdef _SQUID_MSWIN_ - commSetSelectS(fd, COMM_SELECT_WRITE, commConnectHandle, cs, 0); -#else commSetSelect(fd, COMM_SELECT_WRITE, commConnectHandle, cs, 0); -#endif break; case COMM_OK: ipcacheMarkGoodAddr(cs->host, cs->S.sin_addr); @@ -443,19 +390,11 @@ int commSetTimeout(int fd, int timeout, PF * handler, void *data) { -#ifdef _SQUID_MSWIN_ - sde *F; -#else fde *F; -#endif debug(5, 3) ("commSetTimeout: FD %d timeout %d\n", fd, timeout); assert(fd >= 0); assert(fd < Squid_MaxFD); -#ifdef _SQUID_MSWIN_ - F = &sd_table[fd]; -#else F = &fd_table[fd]; -#endif assert(F->flags.open); if (timeout < 0) { F->timeout_handler = NULL; @@ -474,11 +413,7 @@ comm_connect_addr(int sock, const struct sockaddr_in *address) { int status = COMM_OK; -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[sock]; -#else fde *F = &fd_table[sock]; -#endif int x; int err = 0; socklen_t errlen; @@ -544,11 +479,7 @@ struct sockaddr_in P; struct sockaddr_in M; socklen_t Slen; -#ifdef _SQUID_MSWIN_ - sde *F = NULL; -#else fde *F = NULL; -#endif Slen = sizeof(P); Counter.syscalls.sock.accepts++; if ((sock = accept(fd, (struct sockaddr *) &P, &Slen)) < 0) { @@ -573,11 +504,7 @@ commSetCloseOnExec(sock); /* fdstat update */ fd_open(sock, FD_SOCKET, "HTTP Request"); -#ifdef _SQUID_MSWIN_ - F = &sd_table[sock]; -#else F = &fd_table[sock]; -#endif xstrncpy(F->ipaddr, inet_ntoa(P.sin_addr), 16); F->remote_port = htons(P.sin_port); F->local_port = htons(M.sin_port); @@ -588,11 +515,7 @@ void commCallCloseHandlers(int fd) { -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[fd]; -#else fde *F = &fd_table[fd]; -#endif close_handler *ch; debug(5, 5) ("commCallCloseHandlers: FD %d\n", fd); while ((ch = F->close_handler) != NULL) { @@ -636,30 +559,18 @@ } fd_note(fd, "lingering close"); commSetTimeout(fd, 10, commLingerTimeout, NULL); -#ifdef _SQUID_MSWIN_ - commSetSelectS(fd, COMM_SELECT_READ, commLingerClose, NULL, 0); -#else commSetSelect(fd, COMM_SELECT_READ, commLingerClose, NULL, 0); -#endif } #endif void comm_close(int fd) { -#ifdef _SQUID_MSWIN_ - sde *F = NULL; -#else fde *F = NULL; -#endif debug(5, 5) ("comm_close: FD %d\n", fd); assert(fd >= 0); assert(fd < Squid_MaxFD); -#ifdef _SQUID_MSWIN_ - F = &sd_table[fd]; -#else F = &fd_table[fd]; -#endif if (F->flags.closing) return; if (shutting_down && (!F->flags.open || F->type == FD_FILE)) @@ -699,11 +610,7 @@ void commSetDefer(int fd, DEFER * func, void *data) { -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[fd]; -#else fde *F = &fd_table[fd]; -#endif F->defer_check = func; F->defer_data = data; } @@ -737,21 +644,12 @@ close_handler *c; debug(5, 5) ("comm_add_close_handler: FD %d, handler=%p, data=%p\n", fd, handler, data); -#ifdef _SQUID_MSWIN_ - for (c = sd_table[fd].close_handler; c; c = c->next) - assert(c->handler != handler || c->data != data); - new->handler = handler; - new->data = data; - new->next = sd_table[fd].close_handler; - sd_table[fd].close_handler = new; -#else for (c = fd_table[fd].close_handler; c; c = c->next) assert(c->handler != handler || c->data != data); new->handler = handler; new->data = data; new->next = fd_table[fd].close_handler; fd_table[fd].close_handler = new; -#endif cbdataLock(data); } @@ -763,11 +661,7 @@ /* Find handler in list */ debug(5, 5) ("comm_remove_close_handler: FD %d, handler=%p, data=%p\n", fd, handler, data); -#ifdef _SQUID_MSWIN_ - for (p = sd_table[fd].close_handler; p != NULL; last = p, p = p->next) -#else for (p = fd_table[fd].close_handler; p != NULL; last = p, p = p->next) -#endif if (p->handler == handler && p->data == data) break; /* This is our handler */ assert(p != NULL); @@ -775,11 +669,7 @@ if (last) last->next = p->next; else -#ifdef _SQUID_MSWIN_ - sd_table[fd].close_handler = p->next; -#else fd_table[fd].close_handler = p->next; -#endif cbdataUnlock(p->data); safe_free(p); } @@ -792,11 +682,7 @@ L.l_linger = 0; if (setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *) &L, sizeof(L)) < 0) debug(50, 0) ("commSetNoLinger: FD %d: %s\n", fd, xstrerror()); -#ifdef _SQUID_MSWIN_ - sd_table[fd].flags.nolinger = 1; -#else fd_table[fd].flags.nolinger = 1; -#endif } static void @@ -823,21 +709,17 @@ #ifdef _SQUID_MSWIN_ int nonblocking = 1; if (ioctlsocket(fd, FIONBIO, (unsigned long *) &nonblocking) < 0) { - debug(50, 0) ("commSetNonBlocking: FD %d: %s\n", fd, xstrerror()); - return COMM_ERROR; - } - sd_table[fd].flags.nonblocking = 1; #else if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) { debug(50, 0) ("FD %d: fcntl F_GETFL: %s\n", fd, xstrerror()); return COMM_ERROR; } if (fcntl(fd, F_SETFL, flags | SQUID_NONBLOCK) < 0) { +#endif debug(50, 0) ("commSetNonBlocking: FD %d: %s\n", fd, xstrerror()); return COMM_ERROR; } fd_table[fd].flags.nonblocking = 1; -#endif return 0; } @@ -849,21 +731,17 @@ #ifdef _SQUID_MSWIN_ int nonblocking = 0; if (ioctlsocket(fd, FIONBIO, (unsigned long *) &nonblocking) < 0) { - debug(50, 0) ("commSetNonBlocking: FD %d: %s\n", fd, xstrerror()); - return COMM_ERROR; - } - sd_table[fd].flags.nonblocking = 0; #else if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) { debug(50, 0) ("FD %d: fcntl F_GETFL: %s\n", fd, xstrerror()); return COMM_ERROR; } if (fcntl(fd, F_SETFL, flags & (~SQUID_NONBLOCK)) < 0) { +#endif debug(50, 0) ("commUnsetNonBlocking: FD %d: %s\n", fd, xstrerror()); return COMM_ERROR; } fd_table[fd].flags.nonblocking = 0; -#endif return 0; } @@ -895,9 +773,6 @@ void comm_init(void) { -#ifdef _SQUID_MSWIN_ - sd_table = (sde *) xcalloc(Squid_MaxFD, sizeof(sde)); -#endif fd_table = xcalloc(Squid_MaxFD, sizeof(fde)); /* XXX account fd_table */ /* Keep a few file descriptors free so that we don't run out of FD's @@ -934,24 +809,14 @@ CommWriteStateCallbackAndFree(fd, nleft ? COMM_ERROR : COMM_OK); } else if (len < 0) { /* An error */ -#ifdef _SQUID_MSWIN_ - if (sd_table[fd].flags.socket_eof) { -#else if (fd_table[fd].flags.socket_eof) { -#endif debug(50, 2) ("commHandleWrite: FD %d: write failure: %s.\n", fd, xstrerror()); CommWriteStateCallbackAndFree(fd, COMM_ERROR); } else if (ignoreErrno(errno)) { -#ifdef _SQUID_MSWIN_ - debug(50, 2) ("commHandleWrite: FD %d: write failure: %s.\n", - fd, xstrerror()); - commSetSelectS(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#else debug(50, 10) ("commHandleWrite: FD %d: write failure: %s.\n", fd, xstrerror()); commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#endif } else { debug(50, 2) ("commHandleWrite: FD %d: write failure: %s.\n", fd, xstrerror()); @@ -962,11 +827,7 @@ state->offset += len; if (state->offset < state->size) { /* Not done, reinstall the write handler and write some more */ -#ifdef _SQUID_MSWIN_ - commSetSelectS(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#else commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#endif } else { CommWriteStateCallbackAndFree(fd, COMM_OK); } @@ -981,28 +842,16 @@ comm_write(int fd, char *buf, int size, CWCB * handler, void *handler_data, FREE * free_func) { -#ifdef _SQUID_MSWIN_ - CommWriteStateData *state = sd_table[fd].rwstate; -#else CommWriteStateData *state = fd_table[fd].rwstate; -#endif debug(5, 5) ("comm_write: FD %d: sz %d: hndl %p: data %p.\n", fd, size, handler, handler_data); if (NULL != state) { debug(5, 1) ("comm_write: fd_table[%d].rwstate != NULL\n", fd); safe_free(state); -#ifdef _SQUID_MSWIN_ - sd_table[fd].rwstate = NULL; -#else fd_table[fd].rwstate = NULL; -#endif } assert(state == NULL); -#ifdef _SQUID_MSWIN_ - sd_table[fd].rwstate = state = xcalloc(1, sizeof(CommWriteStateData)); -#else fd_table[fd].rwstate = state = xcalloc(1, sizeof(CommWriteStateData)); -#endif state->buf = buf; state->size = size; state->offset = 0; @@ -1010,11 +859,7 @@ state->handler_data = handler_data; state->free_func = free_func; cbdataLock(handler_data); -#ifdef _SQUID_MSWIN_ - commSetSelectS(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#else commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0); -#endif } /* a wrapper around comm_write to allow for MemBuf to be comm_written in a snap */ @@ -1053,19 +898,10 @@ commCloseAllSockets(void) { int fd; -#ifdef _SQUID_MSWIN_ - sde *F = NULL; -#else fde *F = NULL; -#endif PF *callback; -#ifdef _SQUID_MSWIN_ - for (fd = 0; fd <= Biggest_SD; fd++) { - F = &sd_table[fd]; -#else for (fd = 0; fd <= Biggest_FD; fd++) { F = &fd_table[fd]; -#endif if (!F->flags.open) continue; if (F->type != FD_SOCKET) Index: squid/src/comm_select.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/comm_select.c,v retrieving revision 1.1.1.3.4.2.2.3.2.1 retrieving revision 1.1.1.3.4.2.2.3.2.2 diff -u -r1.1.1.3.4.2.2.3.2.1 -r1.1.1.3.4.2.2.3.2.2 --- squid/src/comm_select.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.2.2.3.2.1 +++ squid/src/comm_select.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.2.2.3.2.2 @@ -1,5 +1,5 @@ /* - * $Id: comm_select.c,v 1.1.1.3.4.2.2.3.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: comm_select.c,v 1.1.1.3.4.2.2.3.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 5 Socket Functions * @@ -69,15 +69,6 @@ static struct timeval zero_tv; -#ifdef _SQUID_MSWIN_ -static fd_set global_readsds; -static fd_set global_writesds; -static fd_set readsds; -static fd_set writesds; -static fd_set errsds; -static int nreadsds; -static int nwritesds; -#endif static fd_set global_readfds; static fd_set global_writefds; static int nreadfds; @@ -147,11 +138,7 @@ static int commDeferRead(int fd) { -#ifdef _SQUID_MSWIN_ - sde *F = &sd_table[fd]; -#else fde *F = &fd_table[fd]; -#endif if (F->defer_check == NULL) return 0; return F->defer_check(fd, F->defer_data); @@ -542,24 +529,20 @@ PF *hdl = NULL; fd_set read_mask; fd_set write_mask; +#ifdef _SQUID_MSWIN_ + fd_set errfds; + FD_ZERO(&errfds); +#endif FD_ZERO(&read_mask); FD_ZERO(&write_mask); for (i = 0; i < nfds; i++) { fd = fds[i]; -#ifdef _SQUID_MSWIN_ - if (sd_table[fd].read_handler) { -#else if (fd_table[fd].read_handler) { -#endif FD_SET(fd, &read_mask); if (fd > maxfd) maxfd = fd; } -#ifdef _SQUID_MSWIN_ - if (sd_table[fd].write_handler) { -#else if (fd_table[fd].write_handler) { -#endif FD_SET(fd, &write_mask); if (fd > maxfd) maxfd = fd; @@ -576,15 +559,9 @@ for (i = 0; i < nfds; i++) { fd = fds[i]; if (FD_ISSET(fd, &read_mask)) { -#ifdef _SQUID_MSWIN_ - if ((hdl = sd_table[fd].read_handler) != NULL) { - sd_table[fd].read_handler = NULL; - commUpdateReadBitsS(fd, NULL); -#else if ((hdl = fd_table[fd].read_handler) != NULL) { fd_table[fd].read_handler = NULL; commUpdateReadBits(fd, NULL); -#endif hdl(fd, &incame); } else { debug(5, 1) ("comm_select_incoming: FD %d NULL read handler\n", @@ -592,15 +569,9 @@ } } if (FD_ISSET(fd, &write_mask)) { -#ifdef _SQUID_MSWIN_ - if ((hdl = sd_table[fd].write_handler) != NULL) { - sd_table[fd].write_handler = NULL; - commUpdateWriteBitsS(fd, NULL); -#else if ((hdl = fd_table[fd].write_handler) != NULL) { fd_table[fd].write_handler = NULL; commUpdateWriteBits(fd, NULL); -#endif hdl(fd, &incame); } else { debug(5, 1) ("comm_select_incoming: FD %d NULL write handler\n", @@ -683,9 +654,6 @@ static time_t last_timeout = 0; struct timeval poll_time; double timeout = current_dtime + (msec / 1000.0); -#ifdef _SQUID_MSWIN_ - sde *F; -#else fde *F; fd_set readfds; fd_set writefds; @@ -693,6 +661,9 @@ fd_mask *fdsp; fd_mask tmask; int maxindex; +#ifdef _SQUID_MSWIN_ + fd_set errfds; + FD_ZERO(&errfds); #endif do { #if !ALARM_UPDATES_TIME @@ -713,19 +684,19 @@ callicp = calldns = callhttp = 0; maxfd = Biggest_FD + 1; #ifdef _SQUID_MSWIN_ - FD_ZERO(&readsds); - FD_ZERO(&writesds); - FD_ZERO(&errsds); - xmemcpy(&readsds, &global_readsds, sizeof(global_readsds)); - xmemcpy(&writesds, &global_writesds, sizeof(global_writesds)); - xmemcpy(&errsds, &global_writesds, sizeof(global_writesds)); - for (j = 0; j < (int) readsds.fd_count; j++) { - fd = readsds.fd_array[j]; + xmemcpy(&readfds, &global_readfds, sizeof(global_readfds)); + xmemcpy(&writefds, &global_writefds, sizeof(global_writefds)); + for (j = 0; j < (int) readfds.fd_count; j++) { + for ( fd = Biggest_FD; fd; fd-- ) { + if ( _get_osfhandle(fd) == readfds.fd_array[j] ) + break; + } + assert(fd); switch (commDeferRead(fd)) { case 0: break; case 1: - FD_CLR((SOCKET) fd, &readsds); + FD_CLR(fd, &readfds); break; #if DELAY_POOLS case -1: @@ -784,11 +755,7 @@ } } #endif -#ifdef _SQUID_MSWIN_ - if (nreadsds + nwritesds == 0) { -#else if (nreadfds + nwritefds == 0) { -#endif assert(shutting_down); return COMM_SHUTDOWN; } @@ -802,22 +769,14 @@ poll_time.tv_sec = msec / 1000; poll_time.tv_usec = (msec % 1000) * 1000; Counter.syscalls.selects++; -#ifdef _SQUID_MSWIN_ - num = select(maxfd, &readsds, &writesds, &errsds, &poll_time); -#else num = select(maxfd, &readfds, &writefds, NULL, &poll_time); -#endif Counter.select_loops++; if (num >= 0) break; if (ignoreErrno(errno)) break; debug(50, 0) ("comm_select: select failure: %s\n", xstrerror()); -#ifdef _SQUID_MSWIN_ - examine_select(&readsds, &writesds); -#else examine_select(&readfds, &writefds); -#endif return COMM_ERROR; /* NOTREACHED */ } @@ -836,8 +795,13 @@ continue; /* Scan return fd masks for ready descriptors */ #ifdef _SQUID_MSWIN_ - for (j = 0; j < (int) readsds.fd_count; j++) { - fd = readsds.fd_array[j]; + assert(readfds.fd_count <= Biggest_FD); + for (j = 0; j < (int) readfds.fd_count; j++) { + for ( fd = Biggest_FD; fd; fd-- ) { + if ( _get_osfhandle(fd) == readfds.fd_array[j] ) + break; + } + assert(fd); #else fdsp = (fd_mask *) & readfds; maxindex = howmany(maxfd, FD_MASK_BITS); @@ -869,11 +833,7 @@ callhttp = 1; continue; } -#ifdef _SQUID_MSWIN_ - F = &sd_table[fd]; -#else F = &fd_table[fd]; -#endif debug(5, 6) ("comm_select: FD %d ready for reading\n", fd); if (NULL == (hdl = F->read_handler)) (void) 0; @@ -883,11 +843,7 @@ #endif else { F->read_handler = NULL; -#ifdef _SQUID_MSWIN_ - commUpdateReadBitsS(fd, NULL); -#else commUpdateReadBits(fd, NULL); -#endif hdl(fd, F->read_data); Counter.select_fds++; if (commCheckICPIncoming) @@ -899,18 +855,30 @@ } } #ifdef _SQUID_MSWIN_ - for (j = 0; j < (int) errsds.fd_count; j++) { - fd = errsds.fd_array[j]; - F = &sd_table[fd]; +#if 1 + assert(errfds.fd_count <= Biggest_FD); + for (j = 0; j < (int) errfds.fd_count; j++) { + for ( fd = Biggest_FD; fd; fd-- ) { + if ( _get_osfhandle(fd) == errfds.fd_array[j] ) + break; + } + assert(fd); + F = &fd_table[fd]; if ((hdl = F->write_handler)) { F->write_handler = NULL; - commUpdateWriteBitsS(fd, NULL); + commUpdateWriteBits(fd, NULL); hdl(fd, F->write_data); Counter.select_fds++; } } - for (j = 0; j < (int) writesds.fd_count; j++) { - fd = writesds.fd_array[j]; +#endif + assert(writefds.fd_count <= Biggest_FD); + for (j = 0; j < (int) writefds.fd_count; j++) { + for ( fd = Biggest_FD; fd; fd-- ) { + if ( _get_osfhandle(fd) == writefds.fd_array[j] ) + break; + } + assert(fd); #else } fdsp = (fd_mask *) & writefds; @@ -942,19 +910,11 @@ callhttp = 1; continue; } -#ifdef _SQUID_MSWIN_ - F = &sd_table[fd]; -#else F = &fd_table[fd]; -#endif debug(5, 5) ("comm_select: FD %d ready for writing\n", fd); if ((hdl = F->write_handler)) { F->write_handler = NULL; -#ifdef _SQUID_MSWIN_ - commUpdateWriteBitsS(fd, NULL); -#else commUpdateWriteBits(fd, NULL); -#endif hdl(fd, F->write_data); Counter.select_fds++; if (commCheckICPIncoming) @@ -976,11 +936,7 @@ comm_select_http_incoming(); #if DELAY_POOLS while ((fd = commGetSlowFd()) != -1) { -#ifdef _SQUID_MSWIN_ - F = &sd_table[fd]; -#else F = &fd_table[fd]; -#endif debug(5, 6) ("comm_select: slow FD %d selected for reading\n", fd); if ((hdl = F->read_handler)) { F->read_handler = NULL; @@ -1115,21 +1071,10 @@ checkTimeouts(void) { int fd; -#ifdef _SQUID_MSWIN_ - sde *F = NULL; - int j; -#else fde *F = NULL; -#endif PF *callback; -#ifdef _SQUID_MSWIN_ - for (j = 0; j < (int) readsds.fd_count; j++) { - fd = readsds.fd_array[j]; - F = &sd_table[fd]; -#else for (fd = 0; fd <= Biggest_FD; fd++) { F = &fd_table[fd]; -#endif if (!F->flags.open) continue; if (F->timeout == 0) @@ -1147,28 +1092,6 @@ comm_close(fd); } } -#ifdef _SQUID_MSWIN_ - for (j = 0; j < (int) writesds.fd_count; j++) { - fd = writesds.fd_array[j]; - F = &sd_table[fd]; - if (!F->flags.open) - continue; - if (F->timeout == 0) - continue; - if (F->timeout > squid_curtime) - continue; - debug(5, 5) ("checkTimeouts: FD %d Expired\n", fd); - if (F->timeout_handler) { - debug(5, 5) ("checkTimeouts: FD %d: Call timeout handler\n", fd); - callback = F->timeout_handler; - F->timeout_handler = NULL; - callback(fd, F->timeout_data); - } else { - debug(5, 5) ("checkTimeouts: FD %d: Forcing comm_close()\n", fd); - comm_close(fd); - } - } -#endif } static void @@ -1209,31 +1132,6 @@ statHistDump(&f->comm_http_incoming, sentry, statHistIntDumper); } -#ifdef _SQUID_MSWIN_ -void -commUpdateReadBitsS(int sd, PF * handler) -{ - if (handler && !FD_ISSET(sd, &global_readsds)) { - FD_SET((SOCKET) sd, &global_readsds); - nreadsds++; - } else if (!handler && FD_ISSET(sd, &global_readsds)) { - FD_CLR((SOCKET) sd, &global_readsds); - nreadsds--; - } -} - -void -commUpdateWriteBitsS(int sd, PF * handler) -{ - if (handler && !FD_ISSET(sd, &global_writesds)) { - FD_SET((SOCKET) sd, &global_writesds); - nwritesds++; - } else if (!handler && FD_ISSET(sd, &global_writesds)) { - FD_CLR((SOCKET) sd, &global_writesds); - nwritesds--; - } -} -#endif void commUpdateReadBits(int fd, PF * handler) Index: squid/src/defines.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/defines.h,v retrieving revision 1.1.1.3.4.2.2.2.2.1 retrieving revision 1.1.1.3.4.2.2.2.2.2 diff -u -r1.1.1.3.4.2.2.2.2.1 -r1.1.1.3.4.2.2.2.2.2 --- squid/src/defines.h 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.2.2.2.2.1 +++ squid/src/defines.h 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.2.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: defines.h,v 1.1.1.3.4.2.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: defines.h,v 1.1.1.3.4.2.2.2.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -218,7 +218,7 @@ #define N_COUNT_HOUR_HIST (86400 * 3) / (60 * COUNT_INTERVAL) /* were to look for errors if config path fails */ -#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" +#define DEFAULT_SQUID_ERROR_DIR "c:/squid/etc/errors" /* gb_type operations */ #define gb_flush_limit (0x3FFFFFFF) Index: squid/src/errorpage.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/errorpage.c,v retrieving revision 1.1.1.3.4.3.2.2.2.1 retrieving revision 1.1.1.3.4.3.2.2.2.2 diff -u -r1.1.1.3.4.3.2.2.2.1 -r1.1.1.3.4.3.2.2.2.2 --- squid/src/errorpage.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.3.2.2.2.1 +++ squid/src/errorpage.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.3.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: errorpage.c,v 1.1.1.3.4.3.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: errorpage.c,v 1.1.1.3.4.3.2.2.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels @@ -190,7 +190,7 @@ text = NULL; } file_close(fd); - if (strstr(text, "%s") == NULL) + if (text && strstr(text, "%s") == NULL) strcat(text, "%S"); /* add signature */ return text; } Index: squid/src/fd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fd.c,v retrieving revision 1.1.1.3.4.1.2.2.2.1 retrieving revision 1.1.1.3.4.1.2.2.2.2 diff -u -r1.1.1.3.4.1.2.2.2.1 -r1.1.1.3.4.1.2.2.2.2 --- squid/src/fd.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.1.2.2.2.1 +++ squid/src/fd.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: fd.c,v 1.1.1.3.4.1.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: fd.c,v 1.1.1.3.4.1.2.2.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 51 Filedescriptor Functions * AUTHOR: Duane Wessels @@ -43,98 +43,6 @@ "Unknown" }; -#ifdef _SQUID_MSWIN_ -static void -sdUpdateBiggest(int fd, int opening) -{ - if (fd < Biggest_SD) - return; - assert(fd < Squid_MaxFD); - if (fd > Biggest_SD) { - /* - * assert that we are not closing a FD bigger than - * our known biggest FD - */ - assert(opening); - Biggest_SD = fd; - return; - } - /* if we are here, then fd == Biggest_FD */ - /* - * assert that we are closing the biggest FD; we can't be - * re-opening it - */ - assert(!opening); - while (!sd_table[Biggest_SD].flags.open && Biggest_SD) - Biggest_SD--; - debug(51, 2) ("sdUpdateBiggest: %d\n", Biggest_SD); -} - -void -sd_close(int fd) -{ - sde *F = &sd_table[fd]; - if (F->type == FD_FILE) { - assert(F->read_handler == NULL); - assert(F->write_handler == NULL); - } - debug(51, 3) ("sd_close FD %d %s\n", fd, F->desc); - F->flags.open = 0; - sdUpdateBiggest(fd, 0); - Number_SD--; - commUpdateReadBitsS(fd, NULL); - commUpdateWriteBitsS(fd, NULL); - memset(F, '\0', sizeof(sde)); - F->timeout = 0; -} - -void -sd_open(int fd, unsigned int type, const char *desc) -{ - sde *F = &sd_table[fd]; - assert(fd >= 0); -#if USE_ASYNC_IO - if (F->flags.closing) { - /* Reuse of a closed FD before we have noticed it is closed */ - sd_close(fd); - } -#endif - if (F->flags.open) { - debug(51, 1) ("WARNING: Closing open SD %4d\n", fd); - sd_close(fd); - } - assert(!F->flags.open); - debug(51, 3) ("sd_open SD %d %s\n", fd, desc); - F->type = type; - F->flags.open = 1; - sdUpdateBiggest(fd, 1); - if (desc) - xstrncpy(F->desc, desc, FD_DESC_SZ); - Number_SD++; -} - -void -sd_note(int fd, const char *s) -{ - sde *F = &sd_table[fd]; - xstrncpy(F->desc, s, FD_DESC_SZ); -} - -void -sd_bytes(int fd, int len, unsigned int type) -{ - sde *F = &sd_table[fd]; - if (len < 0) - return; - assert(type == FD_READ || type == FD_WRITE); - if (type == FD_READ) - F->bytes_read += len; - else - F->bytes_written += len; -} - -#endif - static void fdUpdateBiggest(int fd, int); static void @@ -158,11 +66,7 @@ * re-opening it */ assert(!opening); -#ifdef _SQUID_MSWIN_ - while (!fd_table[Biggest_FD].flags.open && Biggest_FD) -#else while (!fd_table[Biggest_FD].flags.open) -#endif Biggest_FD--; } @@ -233,9 +137,6 @@ fdFreeMemory(void) { safe_free(fd_table); -#ifdef _SQUID_MSWIN_ - safe_free(sd_table); -#endif } void Index: squid/src/globals.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/globals.h,v retrieving revision 1.1.1.3.4.2.2.4.2.1 retrieving revision 1.1.1.3.4.2.2.4.2.2 diff -u -r1.1.1.3.4.2.2.4.2.1 -r1.1.1.3.4.2.2.4.2.2 --- squid/src/globals.h 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.2.2.4.2.1 +++ squid/src/globals.h 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.2.2.4.2.2 @@ -1,5 +1,5 @@ /* - * $Id: globals.h,v 1.1.1.3.4.2.2.4.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: globals.h,v 1.1.1.3.4.2.2.4.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -62,11 +62,6 @@ extern const char *storeStatusStr[]; extern const char *swapStatusStr[]; extern dnsStatData DnsStats; -#ifdef _SQUID_MSWIN_ -extern sde *sd_table; /* NULL */ -extern int Biggest_SD; /* -1 */ -extern int Number_SD; /* 0 */ -#endif extern fde *fd_table; /* NULL */ extern int Biggest_FD; /* -1 */ extern int Number_FD; /* 0 */ Index: squid/src/http.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/http.c,v retrieving revision 1.1.1.3.4.3.2.2.2.1 retrieving revision 1.1.1.3.4.3.2.2.2.2 diff -u -r1.1.1.3.4.3.2.2.2.1 -r1.1.1.3.4.3.2.2.2.2 --- squid/src/http.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.3.2.2.2.1 +++ squid/src/http.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.3.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: http.c,v 1.1.1.3.4.3.2.2.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: http.c,v 1.1.1.3.4.3.2.2.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -853,11 +853,7 @@ cfd = -1; else cfd = entry->mem_obj->fd; -#ifdef _SQUID_MSWIN_ - assert(-1 == cfd || FD_SOCKET == sd_table[cfd].type); -#else assert(-1 == cfd || FD_SOCKET == fd_table[cfd].type); -#endif if (p != NULL) httpState->flags.proxying = 1; /* Index: squid/src/ipc.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ipc.c,v retrieving revision 1.1.1.3.4.1.2.1.2.1 retrieving revision 1.1.1.3.4.1.2.1.2.2 diff -u -r1.1.1.3.4.1.2.1.2.1 -r1.1.1.3.4.1.2.1.2.2 --- squid/src/ipc.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.1.2.1 +++ squid/src/ipc.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.1.2.2 @@ -1,5 +1,5 @@ /* - * $Id: ipc.c,v 1.1.1.3.4.1.2.1.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: ipc.c,v 1.1.1.3.4.1.2.1.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 54 Interprocess Communication * AUTHOR: Duane Wessels @@ -37,13 +37,6 @@ #ifdef _SQUID_MSWIN_ #include -extern void sd_open(int fd, unsigned int type, const char *desc); -extern void sd_note(int fd, const char *s); -//extern void commSetNoLinger(int fd); - -/* internal to CRTLIB */ -extern void __cdecl _dosmaperr(unsigned long oserrno); - struct ipc_params { int type; @@ -296,10 +289,10 @@ if (wfd) *wfd = pwfd; #ifdef _SQUID_MSWIN_ - sd_table[prfd].flags.ipc = 1; - sd_table[pwfd].flags.ipc = 1; - sd_table[crfd].flags.ipc = 1; - sd_table[cwfd].flags.ipc = 1; + fd_table[prfd].flags.ipc = 1; + fd_table[pwfd].flags.ipc = 1; + fd_table[crfd].flags.ipc = 1; + fd_table[cwfd].flags.ipc = 1; { DWORD ecode = 0; if (GetExitCodeThread((HANDLE) thread, &ecode) && ecode == STILL_ACTIVE) { @@ -395,8 +388,8 @@ comm_close(crfd); snprintf(buf1, 8191, "%s CHILD socket", prog); - sd_open(fd, FD_SOCKET, buf1); - sd_table[fd].flags.ipc = 1; + fd_open(fd, FD_SOCKET, buf1); + fd_table[fd].flags.ipc = 1; #else close(crfd); #endif @@ -668,12 +661,12 @@ && !strncmp(ok_string, buf1 + 200, strlen(ok_string))); } /* IPC_UDP_SOCKET */ snprintf(buf1, 8191, "%s(%ld) CHILD socket", prog, pid); - sd_note(fd, buf1); + fd_note(fd, buf1); if (prfd_ipc != -1) { snprintf(buf1, 8191, "%s(%ld) <-> ipc CHILD socket", prog, pid); - sd_note(crfd_ipc, buf1); + fd_note(crfd_ipc, buf1); snprintf(buf1, 8191, "%s(%ld) <-> ipc PARENT socket", prog, pid); - sd_note(prfd_ipc, buf1); + fd_note(prfd_ipc, buf1); } /* else { // IPC_TCP_SOCKET * commSetNoLinger(fd); * } @@ -734,7 +727,7 @@ cleanup: if (c2p[1] != -1) close(c2p[1]); - if (sd_table[crfd].flags.open) + if (fd_table[crfd].flags.open) ipcCloseAllFD(-1, -1, crfd, cwfd); if (prfd_ipc != -1) { send(crfd_ipc, shutdown_string, strlen(shutdown_string), 0); Index: squid/src/pinger.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/pinger.c,v retrieving revision 1.1.1.3.4.1.2.1.2.1 retrieving revision 1.1.1.3.4.1.2.1.2.2 diff -u -r1.1.1.3.4.1.2.1.2.1 -r1.1.1.3.4.1.2.1.2.2 --- squid/src/pinger.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.1.2.1 +++ squid/src/pinger.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.1.2.2 @@ -1,5 +1,5 @@ /* - * $Id: pinger.c,v 1.1.1.3.4.1.2.1.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: pinger.c,v 1.1.1.3.4.1.2.1.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels @@ -257,13 +257,11 @@ void pingerClose(void) { + close(icmp_sock); #ifdef _SQUID_MSWIN_ - closesocket(icmp_sock); shutdown(squid_sock, SD_BOTH); - closesocket(squid_sock); + close(squid_sock); squid_sock = -1; -#else - close(icmp_sock); #endif icmp_sock = -1; icmp_ident = 0; Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/protos.h,v retrieving revision 1.1.1.3.4.1.2.6.2.1 retrieving revision 1.1.1.3.4.1.2.6.2.2 diff -u -r1.1.1.3.4.1.2.6.2.1 -r1.1.1.3.4.1.2.6.2.2 --- squid/src/protos.h 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.6.2.1 +++ squid/src/protos.h 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.6.2.2 @@ -1,5 +1,5 @@ /* - * $Id: protos.h,v 1.1.1.3.4.1.2.6.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: protos.h,v 1.1.1.3.4.1.2.6.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -182,10 +182,6 @@ #else extern int comm_select(int); #endif -#ifdef _SQUID_MSWIN_ -extern void commUpdateReadBitsS(int, PF *); -extern void commUpdateWriteBitsS(int, PF *); -#endif extern void commUpdateReadBits(int, PF *); extern void commUpdateWriteBits(int, PF *); Index: squid/src/stat.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/stat.c,v retrieving revision 1.1.1.3.4.1.2.5.2.1 retrieving revision 1.1.1.3.4.1.2.5.2.2 diff -u -r1.1.1.3.4.1.2.5.2.1 -r1.1.1.3.4.1.2.5.2.2 --- squid/src/stat.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.5.2.1 +++ squid/src/stat.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.5.2.2 @@ -1,5 +1,5 @@ /* - * $Id: stat.c,v 1.1.1.3.4.1.2.5.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: stat.c,v 1.1.1.3.4.1.2.5.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -395,18 +395,6 @@ return buf; } -#ifdef _SQUID_MSWIN_ -static const char * -sdRemoteAddr(const sde * f) -{ - LOCAL_ARRAY(char, buf, 32); - if (f->type != FD_SOCKET) - return null_string; - snprintf(buf, 32, "%s.%d", f->ipaddr, (int) f->remote_port); - return buf; -} -#endif - static void statFiledescriptors(StoreEntry * sentry) { @@ -431,23 +419,6 @@ f->bytes_written, f->write_handler ? '*' : ' ', fdRemoteAddr(f), f->desc); } -#ifdef _SQUID_MSWIN_ - { - sde *f; - for (i = 0; i < Squid_MaxFD; i++) { - f = &sd_table[i]; - if (!f->flags.open) - continue; - storeAppendPrintf(sentry, "%4d %-6.6s %4d %7d%c %7d%c %-21s %s\n", - i, - fdTypeStr[f->type], - f->timeout_handler ? (int) (f->timeout - -squid_curtime) / 60 : 0, f->bytes_read, f->read_handler ? '*' : ' ', - f->bytes_written, f->write_handler ? '*' : ' ', sdRemoteAddr(f), - f->desc); - } - } -#endif } static void @@ -605,15 +576,8 @@ storeAppendPrintf(sentry, "\tMaximum number of file descriptors: %4d\n", Squid_MaxFD); storeAppendPrintf(sentry, "\tLargest file desc currently in use: %4d\n", -#ifdef _SQUID_MSWIN_ - XMAX(Biggest_FD, Biggest_SD)); -#else Biggest_FD); -#endif storeAppendPrintf(sentry, "\tNumber of file desc currently in use: %4d\n", -#ifdef _SQUID_MSWIN_ - Number_SD + -#endif Number_FD); storeAppendPrintf(sentry, "\tFiles queued for open: %4d\n", Opening_FD); Index: squid/src/structs.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/structs.h,v retrieving revision 1.1.1.3.4.2.2.3.2.1 retrieving revision 1.1.1.3.4.2.2.3.2.2 diff -u -r1.1.1.3.4.2.2.3.2.1 -r1.1.1.3.4.2.2.3.2.2 --- squid/src/structs.h 27 Aug 2001 21:48:22 -0000 1.1.1.3.4.2.2.3.2.1 +++ squid/src/structs.h 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.2.2.3.2.2 @@ -1,5 +1,5 @@ /* - * $Id: structs.h,v 1.1.1.3.4.2.2.3.2.1 2001/08/27 21:48:22 tolsty Exp $ + * $Id: structs.h,v 1.1.1.3.4.2.2.3.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -654,47 +654,8 @@ const char *str; /* quoted-string */ int weak; /* true if it is a weak validator */ }; -#ifdef _SQUID_MSWIN_ -struct _sde -{ - unsigned int type; - u_short local_port; - u_short remote_port; - char ipaddr[16]; /* dotted decimal address of peer */ - char desc[FD_DESC_SZ]; - struct - { - unsigned int open:1; - unsigned int close_request:1; - unsigned int write_daemon:1; - unsigned int closing:1; - unsigned int socket_eof:1; - unsigned int nolinger:1; - unsigned int nonblocking:1; - unsigned int ipc:1; - unsigned int called_connect:1; -#ifdef OPTIMISTIC_IO - unsigned int calling_io_handler:1; -#endif - } - flags; - int bytes_read; - int bytes_written; - int uses; /* ie # req's over persistent conn */ - PF *read_handler; - void *read_data; - PF *write_handler; - void *write_data; - PF *timeout_handler; - time_t timeout; - void *timeout_data; - void *lifetime_data; - close_handler *close_handler; /* linked list */ - DEFER *defer_check; /* check if we should defer read */ - void *defer_data; - CommWriteStateData *rwstate; /* State data for comm_write */ -}; +#ifdef _SQUID_MSWIN_ struct statfs { long f_type; /* type of filesystem (see below) */ @@ -710,7 +671,6 @@ }; #endif - struct _fde { unsigned int type; Index: squid/src/typedefs.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v retrieving revision 1.1.1.3.4.1.2.3.2.1 retrieving revision 1.1.1.3.4.1.2.3.2.2 diff -u -r1.1.1.3.4.1.2.3.2.1 -r1.1.1.3.4.1.2.3.2.2 --- squid/src/typedefs.h 27 Aug 2001 21:48:22 -0000 1.1.1.3.4.1.2.3.2.1 +++ squid/src/typedefs.h 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.3.2.2 @@ -1,5 +1,5 @@ /* - * $Id: typedefs.h,v 1.1.1.3.4.1.2.3.2.1 2001/08/27 21:48:22 tolsty Exp $ + * $Id: typedefs.h,v 1.1.1.3.4.1.2.3.2.2 2001/08/31 06:24:34 tolsty Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -84,9 +84,6 @@ typedef struct _dwrite_q dwrite_q; typedef struct _ETag ETag; typedef struct _fde fde; -#ifdef _SQUID_MSWIN_ -typedef struct _sde sde; -#endif typedef struct _fileMap fileMap; typedef struct _fqdncache_entry fqdncache_entry; typedef struct _fqdn_pending fqdn_pending; Index: squid/src/unlinkd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v retrieving revision 1.1.1.3.4.1.2.1.2.1 retrieving revision 1.1.1.3.4.1.2.1.2.2 diff -u -r1.1.1.3.4.1.2.1.2.1 -r1.1.1.3.4.1.2.1.2.2 --- squid/src/unlinkd.c 27 Aug 2001 21:48:22 -0000 1.1.1.3.4.1.2.1.2.1 +++ squid/src/unlinkd.c 31 Aug 2001 06:24:34 -0000 1.1.1.3.4.1.2.1.2.2 @@ -1,5 +1,5 @@ /* - * $Id: unlinkd.c,v 1.1.1.3.4.1.2.1.2.1 2001/08/27 21:48:22 tolsty Exp $ + * $Id: unlinkd.c,v 1.1.1.3.4.1.2.1.2.2 2001/08/31 06:24:34 tolsty Exp $ * * DEBUG: section 12 Unlink Daemon * AUTHOR: Duane Wessels @@ -76,7 +76,6 @@ #endif #ifdef _SQUID_MSWIN_ -extern void sd_note(int fd, const char *s); static HANDLE hIpc; static pid_t pid; @@ -256,12 +255,8 @@ slp.tv_sec = 0; slp.tv_usec = 250000; select(0, NULL, NULL, NULL, &slp); -#ifdef _SQUID_MSWIN_ - sd_note(unlinkd_wfd, "squid <-> unlinkd"); -#else fd_note(unlinkd_wfd, "squid -> unlinkd"); fd_note(unlinkd_rfd, "unlinkd -> squid"); -#endif commSetTimeout(unlinkd_rfd, -1, NULL, NULL); commSetTimeout(unlinkd_wfd, -1, NULL, NULL); /* @@ -271,13 +266,8 @@ * code to retry if we get EWOULDBLOCK. Unfortunately, we can * do this only for the IPC_FIFO case. */ -#ifdef _SQUID_MSWIN_ - assert(sd_table[unlinkd_rfd].flags.nonblocking); - if (FD_PIPE == sd_table[unlinkd_wfd].type) -#else assert(fd_table[unlinkd_rfd].flags.nonblocking); if (FD_PIPE == fd_table[unlinkd_wfd].type) -#endif commUnsetNonBlocking(unlinkd_wfd); debug(12, 1) ("Unlinkd pipe opened on FD %d\n", unlinkd_wfd); cachemgrRegister("unlinkd", "Unlink Daemon Stats", unlinkdStats, 0, 1); Index: squid/win/squidnt/squidnt.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/win/squidnt/Attic/squidnt.mak,v retrieving revision 1.1.2.5.2.1 retrieving revision 1.1.2.5.2.2 diff -u -r1.1.2.5.2.1 -r1.1.2.5.2.2 --- squid/win/squidnt/squidnt.mak 27 Aug 2001 21:48:23 -0000 1.1.2.5.2.1 +++ squid/win/squidnt/squidnt.mak 31 Aug 2001 06:24:34 -0000 1.1.2.5.2.2 @@ -2557,14 +2557,14 @@ "$(INTDIR)\squid.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\work\squidnt23\win" /d "NDEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\Users\tolsty\nt-2.3-tolsty\win" /d "NDEBUG" $(SOURCE) !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "$(INTDIR)\squid.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\work\squidnt23\win" /d "_DEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\Users\tolsty\nt-2.3-tolsty\win" /d "_DEBUG" $(SOURCE) !ENDIF @@ -2572,25 +2572,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "miscutil - Win32 Release" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" cd "..\squidnt" "miscutil - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "miscutil - Win32 Debug" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" cd "..\squidnt" "miscutil - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2604,25 +2604,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "NT_auth - Win32 Release" : - cd "\work\squidnt23\auth_modules\NT" - $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NT" + $(MAKE) /$(MAKEFLAGS) /F ".\NT_auth.mak" CFG="NT_auth - Win32 Release" cd "..\..\win\squidnt" "NT_auth - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\auth_modules\NT" - $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NT" + $(MAKE) /$(MAKEFLAGS) /F ".\NT_auth.mak" CFG="NT_auth - Win32 Release" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "NT_auth - Win32 Debug" : - cd "\work\squidnt23\auth_modules\NT" - $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NT" + $(MAKE) /$(MAKEFLAGS) /F ".\NT_auth.mak" CFG="NT_auth - Win32 Debug" cd "..\..\win\squidnt" "NT_auth - Win32 DebugCLEAN" : - cd "\work\squidnt23\auth_modules\NT" - $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NT" + $(MAKE) /$(MAKEFLAGS) /F ".\NT_auth.mak" CFG="NT_auth - Win32 Debug" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ENDIF @@ -2630,25 +2630,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "NCSA_auth - Win32 Release" : - cd "\work\squidnt23\auth_modules\NCSA" - $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NCSA" + $(MAKE) /$(MAKEFLAGS) /F ".\NCSA_auth.mak" CFG="NCSA_auth - Win32 Release" cd "..\..\win\squidnt" "NCSA_auth - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\auth_modules\NCSA" - $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NCSA" + $(MAKE) /$(MAKEFLAGS) /F ".\NCSA_auth.mak" CFG="NCSA_auth - Win32 Release" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "NCSA_auth - Win32 Debug" : - cd "\work\squidnt23\auth_modules\NCSA" - $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NCSA" + $(MAKE) /$(MAKEFLAGS) /F ".\NCSA_auth.mak" CFG="NCSA_auth - Win32 Debug" cd "..\..\win\squidnt" "NCSA_auth - Win32 DebugCLEAN" : - cd "\work\squidnt23\auth_modules\NCSA" - $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\NCSA" + $(MAKE) /$(MAKEFLAGS) /F ".\NCSA_auth.mak" CFG="NCSA_auth - Win32 Debug" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ENDIF @@ -2656,25 +2656,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "cachemgr - Win32 Release" : - cd "\work\squidnt23\win\cachemgr" - $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\cachemgr" + $(MAKE) /$(MAKEFLAGS) /F ".\cachemgr.mak" CFG="cachemgr - Win32 Release" cd "..\squidnt" "cachemgr - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\cachemgr" - $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\cachemgr" + $(MAKE) /$(MAKEFLAGS) /F ".\cachemgr.mak" CFG="cachemgr - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "cachemgr - Win32 Debug" : - cd "\work\squidnt23\win\cachemgr" - $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\cachemgr" + $(MAKE) /$(MAKEFLAGS) /F ".\cachemgr.mak" CFG="cachemgr - Win32 Debug" cd "..\squidnt" "cachemgr - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\cachemgr" - $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\cachemgr" + $(MAKE) /$(MAKEFLAGS) /F ".\cachemgr.mak" CFG="cachemgr - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2682,25 +2682,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "LDAP_auth - Win32 Release" : - cd "\work\squidnt23\auth_modules\LDAP" - $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\LDAP" + $(MAKE) /$(MAKEFLAGS) /F ".\LDAP_auth.mak" CFG="LDAP_auth - Win32 Release" cd "..\..\win\squidnt" "LDAP_auth - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\auth_modules\LDAP" - $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\LDAP" + $(MAKE) /$(MAKEFLAGS) /F ".\LDAP_auth.mak" CFG="LDAP_auth - Win32 Release" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "LDAP_auth - Win32 Debug" : - cd "\work\squidnt23\auth_modules\LDAP" - $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\LDAP" + $(MAKE) /$(MAKEFLAGS) /F ".\LDAP_auth.mak" CFG="LDAP_auth - Win32 Debug" cd "..\..\win\squidnt" "LDAP_auth - Win32 DebugCLEAN" : - cd "\work\squidnt23\auth_modules\LDAP" - $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\auth_modules\LDAP" + $(MAKE) /$(MAKEFLAGS) /F ".\LDAP_auth.mak" CFG="LDAP_auth - Win32 Debug" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ENDIF @@ -2708,24 +2708,24 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "Perl Preprocessing - Win32 Release" : - cd "\work\squidnt23\win" + cd "\Users\tolsty\nt-2.3-tolsty\win" $(MAKE) /$(MAKEFLAGS) /F ".\Perl Preprocessing.mak" CFG="Perl Preprocessing - Win32 Release" cd ".\squidnt" "Perl Preprocessing - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win" + cd "\Users\tolsty\nt-2.3-tolsty\win" $(MAKE) /$(MAKEFLAGS) /F ".\Perl Preprocessing.mak" CFG="Perl Preprocessing - Win32 Release" RECURSE=1 CLEAN cd ".\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "Perl Preprocessing - Win32 Debug" : - cd "\work\squidnt23\win" + cd "\Users\tolsty\nt-2.3-tolsty\win" $(MAKE) /$(MAKEFLAGS) /F ".\Perl Preprocessing.mak" CFG="Perl Preprocessing - Win32 Debug" cd ".\squidnt" "Perl Preprocessing - Win32 DebugCLEAN" : - cd "\work\squidnt23\win" + cd "\Users\tolsty\nt-2.3-tolsty\win" $(MAKE) /$(MAKEFLAGS) /F ".\Perl Preprocessing.mak" CFG="Perl Preprocessing - Win32 Debug" RECURSE=1 CLEAN cd ".\squidnt" @@ -2734,25 +2734,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "squid_conf - Win32 Release" : - cd "\work\squidnt23\win" - $(MAKE) /$(MAKEFLAGS) /F .\squid_conf.mak CFG="squid_conf - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win" + $(MAKE) /$(MAKEFLAGS) /F ".\squid_conf.mak" CFG="squid_conf - Win32 Release" cd ".\squidnt" "squid_conf - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win" - $(MAKE) /$(MAKEFLAGS) /F .\squid_conf.mak CFG="squid_conf - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win" + $(MAKE) /$(MAKEFLAGS) /F ".\squid_conf.mak" CFG="squid_conf - Win32 Release" RECURSE=1 CLEAN cd ".\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "squid_conf - Win32 Debug" : - cd "\work\squidnt23\win" - $(MAKE) /$(MAKEFLAGS) /F .\squid_conf.mak CFG="squid_conf - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win" + $(MAKE) /$(MAKEFLAGS) /F ".\squid_conf.mak" CFG="squid_conf - Win32 Debug" cd ".\squidnt" "squid_conf - Win32 DebugCLEAN" : - cd "\work\squidnt23\win" - $(MAKE) /$(MAKEFLAGS) /F .\squid_conf.mak CFG="squid_conf - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win" + $(MAKE) /$(MAKEFLAGS) /F ".\squid_conf.mak" CFG="squid_conf - Win32 Debug" RECURSE=1 CLEAN cd ".\squidnt" !ENDIF @@ -2760,25 +2760,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "dnsserver - Win32 Release" : - cd "\work\squidnt23\win\dnsserver" - $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\dnsserver" + $(MAKE) /$(MAKEFLAGS) /F ".\dnsserver.mak" CFG="dnsserver - Win32 Release" cd "..\squidnt" "dnsserver - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\dnsserver" - $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\dnsserver" + $(MAKE) /$(MAKEFLAGS) /F ".\dnsserver.mak" CFG="dnsserver - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "dnsserver - Win32 Debug" : - cd "\work\squidnt23\win\dnsserver" - $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\dnsserver" + $(MAKE) /$(MAKEFLAGS) /F ".\dnsserver.mak" CFG="dnsserver - Win32 Debug" cd "..\squidnt" "dnsserver - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\dnsserver" - $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\dnsserver" + $(MAKE) /$(MAKEFLAGS) /F ".\dnsserver.mak" CFG="dnsserver - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2786,25 +2786,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "unlinkd - Win32 Release" : - cd "\work\squidnt23\win\unlinkd" - $(MAKE) /$(MAKEFLAGS) /F .\unlinkd.mak CFG="unlinkd - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\unlinkd" + $(MAKE) /$(MAKEFLAGS) /F ".\unlinkd.mak" CFG="unlinkd - Win32 Release" cd "..\squidnt" "unlinkd - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\unlinkd" - $(MAKE) /$(MAKEFLAGS) /F .\unlinkd.mak CFG="unlinkd - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\unlinkd" + $(MAKE) /$(MAKEFLAGS) /F ".\unlinkd.mak" CFG="unlinkd - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "unlinkd - Win32 Debug" : - cd "\work\squidnt23\win\unlinkd" - $(MAKE) /$(MAKEFLAGS) /F .\unlinkd.mak CFG="unlinkd - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\unlinkd" + $(MAKE) /$(MAKEFLAGS) /F ".\unlinkd.mak" CFG="unlinkd - Win32 Debug" cd "..\squidnt" "unlinkd - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\unlinkd" - $(MAKE) /$(MAKEFLAGS) /F .\unlinkd.mak CFG="unlinkd - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\unlinkd" + $(MAKE) /$(MAKEFLAGS) /F ".\unlinkd.mak" CFG="unlinkd - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2812,25 +2812,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "client - Win32 Release" : - cd "\work\squidnt23\win\client" - $(MAKE) /$(MAKEFLAGS) /F .\client.mak CFG="client - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\client" + $(MAKE) /$(MAKEFLAGS) /F ".\client.mak" CFG="client - Win32 Release" cd "..\squidnt" "client - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\client" - $(MAKE) /$(MAKEFLAGS) /F .\client.mak CFG="client - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\client" + $(MAKE) /$(MAKEFLAGS) /F ".\client.mak" CFG="client - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "client - Win32 Debug" : - cd "\work\squidnt23\win\client" - $(MAKE) /$(MAKEFLAGS) /F .\client.mak CFG="client - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\client" + $(MAKE) /$(MAKEFLAGS) /F ".\client.mak" CFG="client - Win32 Debug" cd "..\squidnt" "client - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\client" - $(MAKE) /$(MAKEFLAGS) /F .\client.mak CFG="client - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\client" + $(MAKE) /$(MAKEFLAGS) /F ".\client.mak" CFG="client - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2838,25 +2838,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "pinger - Win32 Release" : - cd "\work\squidnt23\win\pinger" - $(MAKE) /$(MAKEFLAGS) /F .\pinger.mak CFG="pinger - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\pinger" + $(MAKE) /$(MAKEFLAGS) /F ".\pinger.mak" CFG="pinger - Win32 Release" cd "..\squidnt" "pinger - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\pinger" - $(MAKE) /$(MAKEFLAGS) /F .\pinger.mak CFG="pinger - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\pinger" + $(MAKE) /$(MAKEFLAGS) /F ".\pinger.mak" CFG="pinger - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "pinger - Win32 Debug" : - cd "\work\squidnt23\win\pinger" - $(MAKE) /$(MAKEFLAGS) /F .\pinger.mak CFG="pinger - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\pinger" + $(MAKE) /$(MAKEFLAGS) /F ".\pinger.mak" CFG="pinger - Win32 Debug" cd "..\squidnt" "pinger - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\pinger" - $(MAKE) /$(MAKEFLAGS) /F .\pinger.mak CFG="pinger - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\pinger" + $(MAKE) /$(MAKEFLAGS) /F ".\pinger.mak" CFG="pinger - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF @@ -2864,25 +2864,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "chpasswd - Win32 Release" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Release" cd "..\..\win\squidnt" "chpasswd - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Release" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "chpasswd - Win32 Debug" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Debug" cd "..\..\win\squidnt" "chpasswd - Win32 DebugCLEAN" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Debug" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ENDIF @@ -2890,25 +2890,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "htpasswd - Win32 Release" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Release" cd "..\..\win\squidnt" "htpasswd - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Release" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "htpasswd - Win32 Debug" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Debug" cd "..\..\win\squidnt" "htpasswd - Win32 DebugCLEAN" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Debug" RECURSE=1 CLEAN cd "..\..\win\squidnt" !ENDIF @@ -2916,25 +2916,25 @@ !IF "$(CFG)" == "squidnt - Win32 Release" "libsnmp - Win32 Release" : - cd "\work\squidnt23\win\libsnmp" - $(MAKE) /$(MAKEFLAGS) /F .\libsnmp.mak CFG="libsnmp - Win32 Release" + cd "\Users\tolsty\nt-2.3-tolsty\win\libsnmp" + $(MAKE) /$(MAKEFLAGS) /F ".\libsnmp.mak" CFG="libsnmp - Win32 Release" cd "..\squidnt" "libsnmp - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\libsnmp" - $(MAKE) /$(MAKEFLAGS) /F .\libsnmp.mak CFG="libsnmp - Win32 Release" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\libsnmp" + $(MAKE) /$(MAKEFLAGS) /F ".\libsnmp.mak" CFG="libsnmp - Win32 Release" RECURSE=1 CLEAN cd "..\squidnt" !ELSEIF "$(CFG)" == "squidnt - Win32 Debug" "libsnmp - Win32 Debug" : - cd "\work\squidnt23\win\libsnmp" - $(MAKE) /$(MAKEFLAGS) /F .\libsnmp.mak CFG="libsnmp - Win32 Debug" + cd "\Users\tolsty\nt-2.3-tolsty\win\libsnmp" + $(MAKE) /$(MAKEFLAGS) /F ".\libsnmp.mak" CFG="libsnmp - Win32 Debug" cd "..\squidnt" "libsnmp - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\libsnmp" - $(MAKE) /$(MAKEFLAGS) /F .\libsnmp.mak CFG="libsnmp - Win32 Debug" RECURSE=1 CLEAN + cd "\Users\tolsty\nt-2.3-tolsty\win\libsnmp" + $(MAKE) /$(MAKEFLAGS) /F ".\libsnmp.mak" CFG="libsnmp - Win32 Debug" RECURSE=1 CLEAN cd "..\squidnt" !ENDIF