diff -cr foo-tools.orig/Makefile foo-tools/Makefile
*** foo-tools.orig/Makefile	Mon Mar 18 16:58:44 2002
--- foo-tools/Makefile	Tue May  7 13:45:00 2002
***************
*** 10,16 ****
  build:
  	@echo Building ..
  	@for x in $(DIRS); do \
! 		(cd $$x; make) \
  	done
  
  size:
--- 10,16 ----
  build:
  	@echo Building ..
  	@for x in $(DIRS); do \
! 		(cd $$x; gmake) \
  	done
  
  size:
***************
*** 19,23 ****
  
  clean:
  	for x in $(DIRS); do \
! 		(cd $$x; make clean) \
  	done
--- 19,23 ----
  
  clean:
  	for x in $(DIRS); do \
! 		(cd $$x; gmake clean) \
  	done
diff -cr foo-tools.orig/bouncer/Makefile foo-tools/bouncer/Makefile
*** foo-tools.orig/bouncer/Makefile	Mon Mar 18 16:58:45 2002
--- foo-tools/bouncer/Makefile	Tue May  7 15:06:40 2002
***************
*** 12,24 ****
  
  include ../Makefile.config
  
! LIBS = -lpthread -lncurses -lcrypto -lssl
  #LIBS = -pthread -lncurses
  
! GENOBJS = ../lib/sockop.o ../collection/hashtable.o ../collection/strlist.o ../lib/common.o ../lib/stringtokenizer.o ../thread/threadpool.o ../util/linefilereader.o
  ENTRYOBJS = entry_ssl.o entry_datanode.o entry.o datanode_communicate.o $(GENOBJS)
  #SIMPLEENTRYOBJS = simple_entry.o admin_httpd.o $(GENOBJS) ../util/linereaderbuffer.o
! SIMPLEENTRYOBJS = simple_entry.o $(GENOBJS) ../util/linereaderbuffer.o
  DATAOBJS = datanode_handler.o datanode_view.o ../lib/sfv.o $(GENOBJS)
  
  # DEFS = -DADMINPORT
--- 12,24 ----
  
  include ../Makefile.config
  
! LIBS = -pthread -lncurses -lcrypto -lssl
  #LIBS = -pthread -lncurses
  
! GENOBJS = ../lib/sockop.o ../collection/hashtable.o ../collection/strlist.o ../lib/common.o ../lib/stringtokenizer.o  ../thread/threadpool.o ../util/linefilereader.o
  ENTRYOBJS = entry_ssl.o entry_datanode.o entry.o datanode_communicate.o $(GENOBJS)
  #SIMPLEENTRYOBJS = simple_entry.o admin_httpd.o $(GENOBJS) ../util/linereaderbuffer.o
! SIMPLEENTRYOBJS = $(GENOBJS) simple_entry.o ../util/linereaderbuffer.o
  DATAOBJS = datanode_handler.o datanode_view.o ../lib/sfv.o $(GENOBJS)
  
  # DEFS = -DADMINPORT
***************
*** 30,36 ****
  	$(CC) -o $@ $(ENTRYOBJS) $(LIBS) $(DEFS)
  
  simple_entry: $(SIMPLEENTRYOBJS)
! 	$(CC) -o $@ $(SIMPLEENTRYOBJS) -lpthread $(DEFS)
  
  
  datanode: $(DATAOBJS)
--- 30,36 ----
  	$(CC) -o $@ $(ENTRYOBJS) $(LIBS) $(DEFS)
  
  simple_entry: $(SIMPLEENTRYOBJS)
! 	$(CC) -o $@ $(SIMPLEENTRYOBJS) -pthread $(DEFS)
  
  
  datanode: $(DATAOBJS)
Only in foo-tools/bouncer: simple_entry
diff -cr foo-tools.orig/bouncer/simple_entry.c foo-tools/bouncer/simple_entry.c
*** foo-tools.orig/bouncer/simple_entry.c	Mon Mar 18 16:58:45 2002
--- foo-tools/bouncer/simple_entry.c	Tue May  7 14:54:56 2002
***************
*** 6,14 ****
  #include <pthread.h>
  #include <stdio.h>
  #include <stdlib.h>
- #include <signal.h>
- #include <sys/socket.h>
  #include <sys/types.h>
  #include <unistd.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
--- 6,13 ----
  #include <pthread.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <sys/types.h>
+ #include <sys/socket.h>
  #include <unistd.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
***************
*** 510,524 ****
  
  void entry_debug_handler(int sig) {
      char addr[20], cmd[160], line[160], src_line[160];
!     struct sigcontext_struct *sc;
      FILE *fp;
      char *p;
  
!     sc = (struct sigcontext_struct *)(&sig + 1);
  
!     sprintf(addr, "%lx", sc->eip);
  
!     sprintf(cmd, OBJDUMP_CMD, sc->eip, sc->eip + 0x10, prog_name);
      fp = popen(cmd, "r");
  
      while(fgets(line, sizeof(line), fp) != NULL) {
--- 509,523 ----
  
  void entry_debug_handler(int sig) {
      char addr[20], cmd[160], line[160], src_line[160];
!     struct sigcontext *sc;
      FILE *fp;
      char *p;
  
!     sc = (struct sigcontext*)(&sig + 1);
  
!     sprintf(addr, "%lx", sc->sc_eip);
  
!     sprintf(cmd, OBJDUMP_CMD, sc->sc_eip, sc->sc_eip + 0x10, prog_name);
      fp = popen(cmd, "r");
  
      while(fgets(line, sizeof(line), fp) != NULL) {
diff -cr foo-tools.orig/bouncer/simple_entry.h foo-tools/bouncer/simple_entry.h
*** foo-tools.orig/bouncer/simple_entry.h	Mon Mar 18 16:58:45 2002
--- foo-tools/bouncer/simple_entry.h	Tue May  7 14:46:00 2002
***************
*** 7,12 ****
--- 7,14 ----
  #include <thread/threadpool.h>
  #include <netinet/in.h>
  
+ #include <sys/signal.h>
+ 
  #define DEFAULT_TIMEOUT 30
  
  #define DEFAULT_ERRORTMPL "421 Error: %s\n"
***************
*** 24,30 ****
  };
  
  typedef struct cycleip cycleip_t;
! 
  
  struct bouncer_arg {
  	int client_fd;
--- 26,32 ----
  };
  
  typedef struct cycleip cycleip_t;
! //typedef struct sigcontext sigcontext_struct;
  
  struct bouncer_arg {
  	int client_fd;
diff -cr foo-tools.orig/lib/cookie.c foo-tools/lib/cookie.c
*** foo-tools.orig/lib/cookie.c	Mon Mar 18 16:58:44 2002
--- foo-tools/lib/cookie.c	Tue May  7 13:49:48 2002
***************
*** 3,9 ****
   * $Id: cookie.c,v 1.1.1.1 2001/04/30 10:49:37 sd Exp $
   */
  #include <stdio.h>
! #include <malloc.h>
  #include <string.h>
  #include "cookie.h"
  
--- 3,9 ----
   * $Id: cookie.c,v 1.1.1.1 2001/04/30 10:49:37 sd Exp $
   */
  #include <stdio.h>
! #include <stdlib.h>
  #include <string.h>
  #include "cookie.h"
  
diff -cr foo-tools.orig/lib/macro.c foo-tools/lib/macro.c
*** foo-tools.orig/lib/macro.c	Mon Mar 18 16:58:44 2002
--- foo-tools/lib/macro.c	Tue May  7 13:55:06 2002
***************
*** 9,15 ****
   */
  #include <stdio.h>
  #include <string.h>
! #include <regex.h>
  #include "macro.h"
  
  struct macro_donelist *ml_adddone(struct macro_donelist *l, char *s) {
--- 9,16 ----
   */
  #include <stdio.h>
  #include <string.h>
! //#include <regex.h>
! #include <gnuregex.h>
  #include "macro.h"
  
  struct macro_donelist *ml_adddone(struct macro_donelist *l, char *s) {
diff -cr foo-tools.orig/lib/security.c foo-tools/lib/security.c
*** foo-tools.orig/lib/security.c	Mon Mar 18 16:58:44 2002
--- foo-tools/lib/security.c	Tue May  7 15:08:53 2002
***************
*** 6,14 ****
--- 6,17 ----
  
  #include <stdio.h>
  #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
  #include <unistd.h>
  #include <string.h>
  #include <sys/ioctl.h>
+ #include  <netinet/in.h>
  #include <net/if.h>
  #include <arpa/inet.h>
  #include "security.h"
diff -cr foo-tools.orig/lib/who.h foo-tools/lib/who.h
*** foo-tools.orig/lib/who.h	Mon Mar 18 16:58:44 2002
--- foo-tools/lib/who.h	Tue May  7 15:09:46 2002
***************
*** 9,20 ****
  #ifndef _who_h
  #define _who_h
  
- #include <sys/ipc.h>
- #include <sys/shm.h>
  #include <sys/time.h>
  #include <time.h>
  #include <unistd.h>
  #include <sys/types.h>
  
  #define TRANS_NONE 0
  #define TRANS_UP 1
--- 9,20 ----
  #ifndef _who_h
  #define _who_h
  
  #include <sys/time.h>
  #include <time.h>
  #include <unistd.h>
  #include <sys/types.h>
+ #include <sys/shm.h>
+ #include <sys/ipc.h>
  
  #define TRANS_NONE 0
  #define TRANS_UP 1