From 57456cdf52f2dd420aed9a5653a0beef51d3bdaa Mon Sep 17 00:00:00 2001
From: in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 28 Apr 2002 14:29:26 +0000
Subject: DEBUG

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@129 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/Makefile | 26 +++++++++++++++++++-------
 mbbsd/mbbsd.c  | 14 +++++++++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'mbbsd')

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 4169ccb6..531488a4 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -1,22 +1,34 @@
-# $Id: Makefile,v 1.5 2002/04/10 10:51:24 in2 Exp $
+# $Id: Makefile,v 1.6 2002/04/28 14:29:26 in2 Exp $
 
 BBSHOME?=$(HOME)
 OSTYPE=FreeBSD
 
 # FreeBSD
-CFLAGS_FreeBSD=	-pipe -Wall -g -O -DHAVE_SETPROCTITLE -DBBSHOME='"$(BBSHOME)"' -DFreeBSD -I../include
-LDFLAGS_FreeBSD=-pipe -Wall -g -O
+CFLAGS_FreeBSD=	-pipe -Wall -DHAVE_SETPROCTITLE -DBBSHOME='"$(BBSHOME)"' -DFreeBSD -I../include
+LDFLAGS_FreeBSD=-pipe -Wall 
 LIBS_FreeBSD=	-lutil -lkvm
 
 # Linux
-CFLAGS_linux=	-pipe -Wall -g -O -DHAVE_DES_CRYPT -DBBSHOME='"$(BBSHOME)"' -DLinux -I../include -s
-LDFLAGS_linux=	-pipe -Wall -g -O
+CFLAGS_linux=	-pipe -Wall -DHAVE_DES_CRYPT -DBBSHOME='"$(BBSHOME)"' -DLinux -I../include -s
+LDFLAGS_linux=	-pipe -Wall 
 LIBS_linux=	-lcrypt
 
 CFLAGS=	$(CFLAGS_$(OSTYPE))
 LDFLAGS=$(LDFLAGS_$(OSTYPE))
 LIBS=	$(LIBS_$(OSTYPE))
 
+.if defined(DEBUG)
+CFLAGS+= -g -DDEBUG
+LDFLAGS+= -g -DDEBUG
+.else
+CFLAGS+= -O
+LDFLAGS+= -O
+.endif
+
+.if defined(NO_FORK)
+CFLAGS+= -DNO_FORK
+.endif
+
 CC=	gcc
 PROG=	mbbsd
 OBJS=	admin.o announce.o args.o bbcall.o bbs.o board.o cache.o cal.o card.o\
@@ -30,12 +42,12 @@ OBJS=	admin.o announce.o args.o bbcall.o bbs.o board.o cache.o cal.o card.o\
 
 .SUFFIXES: .c .o
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(ADDFLAGS) $(CFLAGS) -c $*.c
 
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+	$(CC) $(ADDFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
 
 test: $(PROG)
 	killall -9 testmbbsd || true
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 49915683..e7a2f84d 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1,4 +1,4 @@
-/* $Id: mbbsd.c,v 1.22 2002/04/27 15:50:17 in2 Exp $ */
+/* $Id: mbbsd.c,v 1.23 2002/04/28 14:29:26 in2 Exp $ */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -88,10 +88,12 @@ start_daemon ()
     struct tm *dummy_time = localtime (&dummy);
     
     strftime (buf, 80, "%d/%b/%Y:%H:%M:%S", dummy_time);
-    
+
+#ifndef NO_FORK    
     if ((n = fork ())){
 	exit (0);
     }
+#endif
     
     /* rocker.011018: it's a good idea to close all unexcept fd!! */
     n = getdtablesize ();
@@ -103,9 +105,11 @@ start_daemon ()
     
     /* rocker.011018: after new session, 
        we should insure the process is clean daemon */
+#ifndef NO_FORK
     if ((n = fork ())){
 	exit (0);
     }
+#endif
 }
 
 static void
@@ -1363,11 +1367,15 @@ daemon_login (int argc, char *argv[], char *envp[])
 	    close(csock);
 	    continue;
 	}
-	
+
+#ifdef NO_FORK
+	break;
+#else
 	if(fork()==0)
 	    break;
 	else
 	    close(csock);
+#endif
 
     }	
     /* here is only child running */
-- 
cgit v1.2.3