Changeset 1039
- Timestamp:
- 07/10/07 01:44:12 (1 year ago)
- Files:
-
- 1.8.3/trunk/Makefile.in (modified) (1 diff)
- 1.8.3/trunk/src/bsd.c (modified) (5 diffs)
- 1.8.3/trunk/src/mymalloc.c (modified) (2 diffs)
- 1.8.3/trunk/src/services.c (modified) (2 diffs)
- 1.8.3/trunk/win32/funs.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.8.3/trunk/Makefile.in
r1032 r1039 4 4 5 5 VERSION=1.8.3 6 PATCHLEVEL= 36 PATCHLEVEL=4 7 7 8 8 # 1.8.3/trunk/src/bsd.c
r1032 r1039 25 25 #include <winsock.h> 26 26 #include <io.h> 27 #include <process.h> 27 28 #define EINTR WSAEINTR 28 29 #define EWOULDBLOCK WSAEWOULDBLOCK … … 278 279 #ifdef WIN32SERVICES 279 280 void shutdown_checkpoint(void); 280 voidmainthread(int argc, char **argv);281 int mainthread(int argc, char **argv); 281 282 #else 282 283 int main(int argc, char **argv); … … 387 388 * The real "main" is in win32/services.c 388 389 */ 389 void 390 int 390 391 mainthread(int argc, char **argv) 391 392 #else … … 411 412 fputs("Please run the server as another user.\n", stderr); 412 413 fputs("PennMUSH will not run as root as a security measure.\n", stderr); 413 return 1;414 return EXIT_FAILURE; 414 415 } 415 416 /* Add suid-root checks here. */ … … 2568 2569 { 2569 2570 DESC *d, *dnext; 2571 const char *shutmsg; 2572 int shutlen; 2573 2574 shutmsg = T(shutdown_message); 2575 shutlen = strlen(shutmsg); 2570 2576 2571 2577 for (d = descriptor_list; d; d = dnext) { 2572 2578 dnext = d->next; 2579 #ifdef HAS_OPENSSL 2573 2580 if (!d->ssl) { 2581 #endif 2574 2582 #ifdef HAVE_WRITEV 2575 2583 struct iovec byebye[2]; 2576 byebye[0].iov_base = (char *) T(shutdown_message);2577 byebye[0].iov_len = s trlen(byebye[0].iov_base);2584 byebye[0].iov_base = (char *)shutmsg; 2585 byebye[0].iov_len = shutlen; 2578 2586 byebye[1].iov_base = "\r\n"; 2579 2587 byebye[1].iov_len = 2; 2580 2588 writev(d->descriptor, byebye, 2); 2581 2589 #else 2582 const char *shutmsg = T(shutdown_message); 2583 send(d->descriptor, shutmsg, strlen(shutmsg), 0); 2590 send(d->descriptor, shutmsg, shutlen, 0); 2584 2591 send(d->descriptor, "\r\n", 2, 0); 2585 2592 #endif 2586 }2587 2593 #ifdef HAS_OPENSSL 2588 if (d->ssl){2594 } else { 2589 2595 int offset; 2590 const char *shutmsg = T(shutdown_message);2591 2596 offset = 0; 2592 2597 ssl_write(d->ssl, d->ssl_state, 0, 1, (uint8_t *) shutmsg, 2593 s trlen(shutmsg), &offset);2598 shutlen, &offset); 2594 2599 offset = 0; 2595 2600 ssl_write(d->ssl, d->ssl_state, 0, 1, (uint8_t *) "\r\n", 2, &offset); 1.8.3/trunk/src/mymalloc.c
r1032 r1039 36 36 #include <unistd.h> 37 37 #endif 38 #ifdef WIN3 3238 #ifdef WIN32 39 39 #include <windows.h> 40 40 #endif … … 413 413 414 414 /* If objects are too big to fit in a single page, use plain free */ 415 if (sl->items_per_page == 0) 415 if (sl->items_per_page == 0) { 416 416 free(obj); 417 return; 418 } 417 419 418 420 /* Find the page the object is on and push it into that page's free list */ 1.8.3/trunk/src/services.c
r1032 r1039 31 31 32 32 int WIN32_CDECL main(int argc, char **argv); 33 voidmainthread(int argc, char **argv);33 int mainthread(int argc, char **argv); 34 34 35 35 … … 432 432 /* start up the main MUSH code */ 433 433 434 mainthread(argc, argv);434 exit(mainthread(argc, argv)); 435 435 436 436 } /* end of worker_thread */ 1.8.3/trunk/win32/funs.h
r1032 r1039 67 67 FUNCTION_PROTO(fun_dbwalker); 68 68 FUNCTION_PROTO(fun_dec); 69 FUNCTION_PROTO(fun_decode64); 69 70 FUNCTION_PROTO(fun_decompose); 70 71 FUNCTION_PROTO(fun_decrypt); … … 85 86 FUNCTION_PROTO(fun_elock); 86 87 FUNCTION_PROTO(fun_emit); 88 FUNCTION_PROTO(fun_encode64); 87 89 FUNCTION_PROTO(fun_encrypt); 88 90 FUNCTION_PROTO(fun_endtag);
