0.2 (19991223)

- Decoupled core file prevention from daemon_init()
  into its own function, daemon_prevent_core()
- Decoupled signal handling from daemon_init()
- Cached daemon_started_by_init() and daemon_started_by_inetd() results
- Fixed bug when formatting --help message
- Added some modules to libprog: conf, list, hsort, map, prop
- Added timestamps to msg_out_file()
- Included source to GNU getopt_long_only() (if necessary)
- Added hdr.h to allow non-ANSI compilers to parse libprog's headers
- Moved libprog to a subdirectory using a "Whole Project" Makefile
- Converted "Whole Project" Makefile into "Scalable" Makefiles
- Added verbosity functions to libprog(prog)
- Added -core option to allow core file generation
- Added -respawn option to allow client respawn if death not too sudden
- Added -syslog option to redirect client stdout and stderr to syslog
- Added -log option to specify where daemon stdout and stderr are sent
- Fixed bug when constructing data for GNU getopt_long_only()
- Fixed bugs in the options table for libprog(prog)
- Changed help message format: separated option chunks by a blank line
- Fixed bug when obtaining names associated with syslog constants
- Added -Config option and /etc/daemon.conf handling
- Added pathetic conf/linux and conf/solaris scripts
- Revert to real uid/gid if not same as effective uid/gid for safety
- Added manpages

Author: raforg

MANIFEST

@@ -0,0 +1,48 @@
+./Makefile
+./daemon.c
+./macros.mk
+./MANIFEST
+./README
+./prog
+./prog/conf.c
+./prog/conf.h
+./prog/daemon.c
+./prog/daemon.h
+./prog/err.c
+./prog/err.h
+./prog/fifo.c
+./prog/fifo.h
+./prog/getopt.c
+./prog/getopt.h
+./prog/hdr.h
+./prog/hsort.c
+./prog/hsort.h
+./prog/lim.c
+./prog/lim.h
+./prog/list.c
+./prog/list.h
+./prog/log.c
+./prog/log.h
+./prog/mem.c
+./prog/mem.h
+./prog/msg.c
+./prog/msg.h
+./prog/prog.c
+./prog/prog.h
+./prog/sig.c
+./prog/sig.h
+./prog/snprintf.c
+./prog/snprintf.h
+./prog/opt.c
+./prog/opt.h
+./prog/rules.mk
+./prog/macros.mk
+./prog/Makefile
+./prog/map.c
+./prog/map.h
+./prog/prop.c
+./prog/prop.h
+./rules.mk
+./conf
+./conf/linux
+./conf/solaris

Makefile

@@ -1,155 +1,137 @@
 #
 # daemon: http://www.zip.com.au/~raf2/lib/software/daemon
 #
-# Copyright (c) 1999 raf
+# Copyright (C) 1999 raf <raf2@zip.com.au>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# or visit http://www.gnu.org/copyleft/gpl.html
 #
 
-# Uncomment these to override the defines in main.h
-# PATH_SEP = /
-# ROOT_DIR = /
-# PID_DIR = /var/run
-# ETC_DIR = /etc
-# APP = $(TARGETAPP)
-# DEFINES += -DPATH_SEP=\"$(PATH_SEP)\" -DROOT_DIR=\"$(ROOT_DIR)\" -DPID_DIR=\"$(PID_DIR)\" -DETC_DIR=\"$(ETC_DIR)\" -DAPP=\"$(APP)\"
-
-# Uncomment these if your system doesn't have snprintf()
-# SNPRINTF = snprintf
-# DEFINES += -DNEEDS_SNPRINTF=1
-
-# Uncomment this under SVR4 if not predefined
-# DEFINES += -DSVR4
-
-PROJECT = daemon
-VERSION = 0.1
-TARGETAPP = daemon
-TARGETLIBNAME = prog
-INSTALLIBNAME = $(TARGETLIBNAME)-$(VERSION)
-TARGETLIB = lib$(TARGETLIBNAME).a
-INSTALLIB = lib$(INSTALLIBNAME).a
-TARGETDIST = $(PROJECT)-$(VERSION).tar.gz
-
-PREFIX = /usr/local
-APPINSDIR = $(PREFIX)/bin
-LIBINSDIR = $(PREFIX)/lib
-MANINSDIR = $(PREFIX)/man
-HDRINSDIR = $(PREFIX)/include/$(TARGETLIBNAME)
-APPMANSECT = 1
-LIBMANSECT = 3
-
-APPFILES = main
-APPCFILES = $(patsubst %,%.c,$(APPFILES))
-APPOFILES = $(patsubst %,%.o,$(APPFILES))
-APPHFILES = # $(patsubst %,%.h,$(APPFILES))
-APPMFILES = $(TARGETAPP).$(APPMANSECT)
-APPMANDIR = $(MANINSDIR)/man$(APPMANSECT)
-APPCATDIR = $(MANINSDIR)/cat$(APPMANSECT)
-
-LIBFILES = daemon prog opt mem msg err sig lim slog fifo $(SNPRINTF)
-LIBCFILES = $(patsubst %,%.c,$(LIBFILES))
-LIBOFILES = $(patsubst %,%.o,$(LIBFILES))
-LIBHFILES = $(patsubst %,%.h,$(LIBFILES))
-LIBMFILES = $(patsubst %,%.$(LIBMANSECT),$(LIBFILES)) lib$(TARGETLIBNAME).$(LIBMANSECT)
-LIBMANDIR = $(MANINSDIR)/man$(LIBMANSECT)
-LIBTESTS = $(patsubst %,%.test,$(LIBFILES))
-
-DEFINES += -DBUILD_PROG
-
-CFLAGS = -g -O2 $(DEFINES) -Wall -pedantic
-LDFLAGS = -L. -l$(TARGETLIBNAME)
-ARFLAGS = cr
-
-$(TARGETAPP): $(APPOFILES) $(TARGETLIB)
-	$(CC) $(CFLAGS) -o $(TARGETAPP) $(APPOFILES) $(LDFLAGS)
-
-$(TARGETLIB): $(LIBOFILES)
-	$(AR) $(ARFLAGS) $(TARGETLIB) $(LIBOFILES)
-
-$(LIBTESTS): $(TARGETLIB)
-%.test: %.c
-	$(CC) $(CFLAGS) -DTEST -o $@ $< $(LDFLAGS)
-
-test: $(LIBTESTS)
-	@for i in $(LIBTESTS); do ./$$i; echo; done
-
-tags:
-	@ctags $(APPCFILES) $(APPHFILES) $(LIBCFILES) $(LIBHFILES)
-
-depend dep: $(APPCFILES) $(APPHFILES) $(LIBCFILES) $(LIBHFILES)
-	@makedepend $(DEFINES) $(APPCFILES) $(LIBCFILES)
-
-clean:
-	@rm -f $(APPOFILES) $(LIBOFILES) tags core Makefile.bak .makefile.bak
-
-clobber: clean
-	@rm -f $(TARGETAPP) $(TARGETLIB) $(LIBTESTS)
-
-dist-clobber: clobber
-	@perl -pi -e 'last if /[D]O NOT DELETE/;' Makefile
-
-dist: dist-clobber
-	@srcdir=`basename \`pwd\``; cd ..; tar czf $(TARGETDIST) $$srcdir
-
-install: install-app install-lib
-install-app: install-app-bin # install-app-man
-install-lib: install-lib-bin install-lib-h # install-lib-man
-
-install-app-bin:
-	install -m 555 $(TARGETAPP) $(APPINSDIR)
-#install-app-man:
-#	install -m 444 $(APPMFILES) $(APPMANDIR)
-install-lib-bin:
-	install -m 555 $(TARGETLIB) $(LIBINSDIR)/$(INSTALLIB)
-	rm -f $(LIBINSDIR)/$(TARGETLIB)
-	ln -s $(INSTALLIB) $(LIBINSDIR)/$(TARGETLIB)
-install-lib-h:
-	-[ ! -d $(HDRINSDIR) ] && mkdir -p $(HDRINSDIR)
-	install -m 444 $(LIBHFILES) $(HDRINSDIR)
-#install-lib-man:
-#	install -m 444 $(LIBMFILES) $(LIBMANDIR)
-
-uninstall: uninstall-app uninstall-lib
-uninstall-app: uninstall-app-bin # uninstall-app-man
-uninstall-lib: uninstall-lib-bin uninstall-lib-h # uninstall-lib-man
-
-uninstall-app-bin:
-	-cd $(APPINSDIR) && rm -f $(TARGETAPP)
-#uninstall-app-man:
-#	-cd $(APPMANDIR) && rm -f $(APPMFILES) && cd $(APPCATDIR) && rm -f $(APPMFILES)
-uninstall-lib-bin:
-	-cd $(LIBINSDIR) && rm -f $(TARGETLIB) $(INSTALLIB)
-uninstall-lib-h:
-	-cd $(HDRINSDIR) && rm -f $(LIBHFILES) && cd .. && rmdir $(HDRINSDIR)
-#uninstall-lib-man:
-#	cd $(LIBMANDIR) && rm -f $(LIBMFILES)
-
-help:
+CC := gcc
+TEST := /usr/bin/test
+PREFIX := /usr/local
+APP_INSDIR := $(PREFIX)/bin
+LIB_INSDIR := $(PREFIX)/lib
+MAN_INSDIR := $(PREFIX)/man
+HDR_INSDIR := $(PREFIX)/include
+APP_MANSECT := 1
+LIB_MANSECT := 3
+APP_MANDIR := $(MAN_INSDIR)/man$(APP_MANSECT)
+APP_CATDIR := $(MAN_INSDIR)/cat$(APP_MANSECT)
+LIB_MANDIR := $(MAN_INSDIR)/man$(LIB_MANSECT)
+LIB_CATDIR := $(MAN_INSDIR)/cat$(LIB_MANSECT)
+APP_MANSECTNAME := User Commands
+LIB_MANSECTNAME := C Library Functions - libprog
+
+CCFLAGS += -O2 # -Wall -pedantic
+
+CLEAN_FILES += tags core Makefile.bak .makefile.bak MANIFEST pod2html-*
+
+DAEMON_SRCDIR := .
+DAEMON_INCDIRS := prog
+DAEMON_LIBDIRS := prog
+include $(DAEMON_SRCDIR)/macros.mk
+
+.PHONY: all ready test man html install uninstall
+
+all: ready $(ALL_TARGETS)
+ready: $(READY_TARGETS)
+test: ready $(TEST_TARGETS)
+man: $(MAN_TARGETS)
+html: $(HTML_TARGETS)
+install: $(INSTALL_TARGETS)
+uninstall: $(UNINSTALL_TARGETS)
+
+.PHONY: help help-macros depend dep clean clobber distclean dist
+
+help::
 	@echo "This makefile provides the following targets."
 	@echo
-	@echo "make $(TARGETAPP)            -- makes $(TARGETAPP) and $(TARGETLIB) (default)"
-	@echo "make $(TARGETLIB)       -- just makes $(TARGETLIB)"
-	@echo "make tags              -- generates a tags file using ctags"
-	@echo "make depend            -- generates source dependencies using makedepend"
-	@echo "make dep               -- same as depend"
-	@echo "make clean             -- removes object files, tags, core and Makefile.bak"
-	@echo "make clobber           -- same as clean but also removes $(TARGETAPP) and $(TARGETLIB)"
-	@echo "make dist-clobber      -- same as clobber but also removes source dependencies"
-	@echo "make dist              -- creates the distribution: ../$(TARGETDIST)"
-	@echo "make install           -- installs everything under $(PREFIX)"
-	@echo "make install-app       -- installs $(TARGETAPP) and its man page"
-	@echo "make install-app-bin   -- installs $(TARGETAPP) in $(APPINSDIR)"
-	@echo "make install-app-man   -- installs the $(TARGETAPP) man page in $(APPMANDIR)"
-	@echo "make install-lib       -- installs $(TARGETLIB), its headers and man pages"
-	@echo "make install-lib-bin   -- installs $(TARGETLIB) in $(LIBINSDIR)"
-	@echo "make install-lib-h     -- installs $(TARGETLIB) headers in $(HDRINSDIR)"
-	@echo "make install-lib-man   -- installs $(TARGETLIB) man pages in $(LIBMANDIR)"
-	@echo "make uninstall         -- uninstalls everything"
-	@echo "make uninstall-app     -- uninstalls $(TARGETAPP) and its man page"
-	@echo "make uninstall-app-bin -- uninstalls $(TARGETAPP) from $(APPINSDIR)"
-	@echo "make uninstall-app-man -- uninstalls the $(TARGETAPP) man page from $(APPMANDIR)"
-	@echo "make uninstall-lib     -- uninstalls $(TARGETLIB), its headers and man pages"
-	@echo "make uninstall-lib-bin -- uninstalls $(TARGETLIB) from $(LIBINSDIR)"
-	@echo "make uninstall-lib-h   -- uninstalls $(TARGETLIB) headers from $(HDRINSDIR)"
-	@echo "make uninstall-lib-man -- uninstalls $(TARGETLIB) man pages from $(LIBMANDIR)"
-	@echo "make help              -- shows this list of targets"
+	@echo "make help                  -- shows this list of targets"
+	@echo "make help-macros           -- shows the values of all make macros"
+	@echo "make ready                 -- prepares the source directory for make"
+	@echo "make all                   -- makes $(DAEMON_TARGET) and $(DAEMON_SUBMODULES) (default)"
+	@echo "make test                  -- generates and performs library unit tests"
+	@echo "make man                   -- generates all manpages"
+	@echo "make html                  -- generates all manpages in html"
+	@echo "make install               -- installs everything under $(PREFIX)"
+	@echo "make uninstall             -- uninstalls everything"
+	@echo "make depend                -- generates source dependencies using makedepend"
+	@echo "make tags                  -- generates a tags file using ctags"
+	@echo "make clean                 -- removes object files, tags, core and Makefile.bak"
+	@echo "make clobber               -- same as clean but also removes $(DAEMON_TARGET), $(DAEMON_SUBMODULES) and tests"
+	@echo "make distclean             -- same as clobber but also removes source dependencies"
+	@echo "make MANIFEST              -- creates the MANIFEST file"
+	@echo "make dist                  -- creates the distribution: ../$(DAEMON_DIST)"
+	@echo
+
+help-macros::
+	@echo "CC = $(CC)"
+	@echo "TEST = $(TEST)"
+	@echo "PREFIX = $(PREFIX)"
+	@echo "APP_INSDIR = $(APP_INSDIR)"
+	@echo "LIB_INSDIR = $(LIB_INSDIR)"
+	@echo "MAN_INSDIR = $(MAN_INSDIR)"
+	@echo "HDR_INSDIR = $(HDR_INSDIR)"
+	@echo "APP_MANSECT = $(APP_MANSECT)"
+	@echo "LIB_MANSECT = $(LIB_MANSECT)"
+	@echo "APP_MANDIR = $(APP_MANDIR)"
+	@echo "APP_CATDIR = $(APP_CATDIR)"
+	@echo "LIB_MANDIR = $(LIB_MANDIR)"
+	@echo "LIB_CATDIR = $(LIB_CATDIR)"
+	@echo "TAG_FILES = $(TAG_FILES)"
+	@echo "DEPEND_CFILES = $(DEPEND_CFILES)"
+	@echo "DEPEND_HFILES = $(DEPEND_HFILES)"
+	@echo "CCFLAGS = $(CCFLAGS)"
+	@echo "READY_TARGETS = $(READY_TARGETS)"
+	@echo "ALL_TARGETS = $(ALL_TARGETS)"
+	@echo "TEST_TARGETS = $(TEST_TARGETS)"
+	@echo "MAN_TARGETS = $(MAN_TARGETS)"
+	@echo "HTML_TARGETS = $(HTML_TARGETS)"
+	@echo "INSTALL_TARGETS = $(INSTALL_TARGETS)"
+	@echo "UNINSTALL_TARGETS = $(UNINSTALL_TARGETS)"
+	@echo "CLEAN_FILES = $(CLEAN_FILES)"
+	@echo "CLOBBER_FILES = $(CLOBBER_FILES)"
 	@echo
 
+MANIFEST:
+	@find . -name \* -print > MANIFEST
+
+tags: $(TAG_FILES)
+	@ctags $(TAG_FILES)
+
+depend: ready $(DEPEND_CFILES) $(DEPEND_HFILES)
+	@makedepend $(DAEMON_CPPFLAGS) $(DEPEND_CFILES)
+
+clean::
+	@rm -rf $(CLEAN_FILES)
+
+clobber::
+	@rm -rf $(CLEAN_FILES) $(CLOBBER_FILES)
+
+distclean:: clobber
+	@perl -pi -e 'last if /[D]O NOT DELETE/;' Makefile
+
+dist: distclean MANIFEST
+	@src=`basename \`pwd\``; \
+	dst=$(DAEMON_ID); \
+	cd ..; \
+	$(TEST) "$$src" != "$$dst" -a ! -e "$$dst" && ln -s $$src $$dst; \
+	tar chzf $(DAEMON_DIST) $$dst; \
+	$(TEST) -L "$$dst" && rm -f $$dst; \
+	rm $$src/MANIFEST
+
+include $(DAEMON_SRCDIR)/rules.mk
+