17 files changed, 93 insertions(+), 45 deletions(-)

M configure.ac
M extras/Makefile.am
M extras/htpasswd.c
M extras/makeweb.c
M src/Makefile.am
M src/fdwatch.c
M src/libhttpd.c
M src/match.c
M src/mmc.c
M src/strerror.c
M src/tdate_parse.c
M src/thttpd.c
M src/timers.c
M www/cgi-bin/Makefile.am
M www/cgi-bin/phf.c
M www/cgi-bin/redirect.c
M www/cgi-bin/ssi.c

@@ 16,6 16,7 @@ AC_CHECK_LIB(rt, clock_gettime)
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h grp.h memory.h netdb.h netinet/in.h osreldate.h paths.h poll.h stdlib.h string.h sys/devpoll.h sys/event.h sys/param.h sys/poll.h sys/socket.h sys/time.h syslog.h unistd.h])
 AC_HEADER_TIME
 AC_HEADER_DIRENT
+AC_PROG_RANLIB
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T

@@ 1,5 1,8 @@
+AM_CPPFLAGS = -DWEBDIR='"$(docdir)/www"'
+
 sbin_PROGRAMS = makeweb htpasswd
-makeweb_SOURCES = makeweb.c ../config.h
-htpasswd_SOURCES = htpasswd.c ../config.h
+makeweb_SOURCES = makeweb.c
+htpasswd_SOURCES = htpasswd.c
+
 dist_sbin_SCRIPTS = syslogtocern
 EXTRA_DIST = syslogtocern

@@ 8,11 8,14 @@
 ** if stdin is a pipe or file.  This is necessary for use from CGI.
 */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
+#include <config.h>
+
+//system headers
 #include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 

@@ 32,16 32,17 @@
 */
 
 
-#include "../config.h"
+#include <config.h>
 
-#include <stdlib.h>
-#include <unistd.h>
+//system headers
+#include <errno.h>
+#include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 
 #define LINK "public_html"

@@ 2,8 2,11 @@ bin_PROGRAMS = thttpd
 thttpd_SOURCES = thttpd.c thttpd.h \
 	fdwatch.c fdwatch.h \
 	libhttpd.c libhttpd.h \
-	match.c match.h \
 	mmc.c mmc.h \
 	timers.c timers.h \
 	tdate_parse.c tdate_parse.h \
-	mime_encodings.h mime_types.h
+	mime_encodings.h mime_types.h version.h
+thttpd_LDADD = libmatch.a
+
+noinst_LIBRARIES = libmatch.a
+libmatch_a_SOURCES = match.c match.h

@@ 27,6 27,7 @@
 
 #include <config.h>
 
+//system headers
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>


@@ 59,7 60,8 @@
 #include <sys/event.h>
 #endif /* HAVE_SYS_EVENT_H */
 
-#include "fdwatch.h"
+//local headers
+#include <fdwatch.h>
 
 #ifdef HAVE_SELECT
 #ifndef FD_SET

@@ 27,7 27,6 @@
 
 
 #include <config.h>
-#include "version.h"
 
 #ifdef SHOW_SERVER_VERSION
 #define EXPOSED_SERVER_SOFTWARE SERVER_SOFTWARE


@@ 35,6 34,7 @@
 #define EXPOSED_SERVER_SOFTWARE "thttpd"
 #endif /* SHOW_SERVER_VERSION */
 
+//system headers
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>


@@ 78,12 78,14 @@
 
 extern char* crypt( const char* key, const char* setting );
 
-#include "libhttpd.h"
-#include "thttpd.h"
-#include "mmc.h"
-#include "timers.h"
-#include "match.h"
-#include "tdate_parse.h"
+//local headers
+#include <libhttpd.h>
+#include <match.h>
+#include <mmc.h>
+#include <tdate_parse.h>
+#include <thttpd.h>
+#include <timers.h>
+#include <version.h>
 
 #ifndef STDIN_FILENO
 #define STDIN_FILENO 0

@@ 27,10 27,13 @@
 ** SUCH DAMAGE.
 */
 
+#include <config.h>
 
+//system headers
 #include <string.h>
 
-#include "match.h"
+//local headers
+#include <match.h>
 
 static int match_one( const char* pattern, int patternlen, const char* string );
 

@@ 27,6 27,7 @@
 
 #include <config.h>
 
+//system headers
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>


@@ 42,8 43,9 @@
 #include <sys/mman.h>
 #endif /* HAVE_MMAP */
 
-#include "mmc.h"
-#include "libhttpd.h"
+//local hdeaders
+#include <libhttpd.h>
+#include <mmc.h>
 
 
 /* Defines. */

@@ 15,13 15,15 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <config.h>
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strerror.c  5.1 (Berkeley) 4/9/89";
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
-
+//system libraries
 #include <stdio.h>
+#include <sys/types.h>
 
 char *
 strerror(errnum)

@@ 29,8 29,9 @@
 ** http://www.acme.com/software/date_parse/
 */
 
-#include <sys/types.h>
+#include <config.h>
 
+//system headers
 #include <ctype.h>
 #ifdef HAVE_MEMORY_H
 #include <memory.h>


@@ 38,9 39,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
-#include "tdate_parse.h"
+//local headers
+#include <tdate_parse.h>
 
 
 struct strlong {

@@ 27,8 27,8 @@
 
 
 #include <config.h>
-#include "version.h"
 
+//system headers
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>


@@ 54,12 54,14 @@
 #endif
 #include <unistd.h>
 
-#include "fdwatch.h"
-#include "thttpd.h"
-#include "libhttpd.h"
-#include "mmc.h"
-#include "timers.h"
-#include "match.h"
+//local headers
+#include <fdwatch.h>
+#include <libhttpd.h>
+#include <match.h>
+#include <mmc.h>
+#include <thttpd.h>
+#include <timers.h>
+#include <version.h>
 
 #ifndef SHUT_WR
 #define SHUT_WR 1

@@ 25,13 25,16 @@
 ** SUCH DAMAGE.
 */
 
-#include <sys/types.h>
+#include <config.h>
 
+//system headers
 #include <stdlib.h>
 #include <stdio.h>
 #include <syslog.h>
+#include <sys/types.h>
 
-#include "timers.h"
+//local headers
+#include <timers.h>
 
 
 #define HASH_SIZE 67

@@ 1,5 1,13 @@
 bin_PROGRAMS = redirect ssi phf
+
 redirect_SOURCES = redirect.c
-ssi_SOURCES = ssi.c ../match.o
+redirect_CPPFLAGS = -I$(top_srcdir)/src
+
+ssi_SOURCES = ssi.c
+ssi_CPPFLAGS = -I$(top_srcdir)/src
+ssi_LDADD = ../../src/libmatch.a
+
 phf_SOURCES = phf.c
+phf_CPPFLAGS = -I$(top_srcdir)/src
+
 EXTRA_DIST = printenv

@@ 33,12 33,16 @@
 ** SUCH DAMAGE.
 */
 
+#include <config.h>
+
+//system headers
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 
-#include <config.h>
+//local headers
+#include <thttpd.h>
 
 static char* argv0;
 

@@ 57,14 57,16 @@
 ** the binary lives.  Perhaps CGI 1.2 will address this.
 */
 
-#include <sys/types.h>
+#include <config.h>
 
+//system headers
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
-#include <config.h>
-
+//local headers
+#include <thttpd.h>
 
 static char* argv0;
 

@@ 25,15 25,19 @@
 ** SUCH DAMAGE.
 */
 
+#include <config.h>
+
+//system headers
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
-#include <config.h>
-#include <src/match.h>
+//local headers
+#include <thttpd.h>
+#include <match.h>
 
 
 #define ST_GROUND 0