diff --git a/Makefile.am b/Makefile.am
index f93057acc..e69973152 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS	= --enable-debug \
                                   --disable-root-actions \
 				  --with-noaaport \
 				  --with-retrans \
+				  --with-ingester \
 				  --with-gribinsert \
 				  LDMHOME=`cd ../_inst && pwd`
 #				  @DISTCHECK_CONFIGURE_FLAGS_WITH_MULTICAST@
@@ -65,6 +66,9 @@ SUBDIRS 	+= lib
 if WANT_NOAAPORT
     SUBDIRS	+= noaaport
 endif
+if WANT_INGESTER
+    SUBDIRS	+= fileIngest
+endif
 SUBDIRS 	+= regutil \
                    feedme \
                    hupsyslog \
@@ -196,6 +200,10 @@ install_setuids:
 	    chown root $(DESTDIR)$(bindir)/noaaportIngester; \
 	    chmod 4755 $(DESTDIR)$(bindir)/noaaportIngester; \
 	fi
+	-if test -f $(DESTDIR)$(bindir)/fileIngester; then \
+	    chown root $(DESTDIR)$(bindir)/fileIngester; \
+	    chmod 4755 $(DESTDIR)$(bindir)/fileIngester; \
+	fi
 	-if test -f $(DESTDIR)$(bindir)/dvbs_multicast; then \
 	    chown root $(DESTDIR)$(bindir)/dvbs_multicast; \
 	    chmod 4755 $(DESTDIR)$(bindir)/dvbs_multicast; \
@@ -211,8 +219,8 @@ install_setuids:
 	    echo " \
 ERROR: One or more of the following programs in the \"bin/\" installation \
 directory is not owned by \"root\" or does not have the setuid bit enabled: \
-ldmd, hupsyslog, noaaportIngester, dvbs_multicast. The superuser will have to \
-set these attributes manually."; \
+ldmd, hupsyslog, noaaportIngester, fileIngester, dvbs_multicast. The superuser \
+will have to set these attributes manually."; \
 	    echo; \
 	    exit 1; \
 	fi
diff --git a/configure.ac b/configure.ac
index d045abf9d..97e3e2537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,14 @@ AC_ARG_WITH([noaaport],
     [with_noaaport=no])
 AM_CONDITIONAL([WANT_NOAAPORT], [test "x$with_noaaport" != xno])
 
+AC_ARG_WITH([ingester],
+    AS_HELP_STRING([--with-ingester],
+	[enable support for ingesting files into product queue
+        [default=without]]),
+    [],
+    [with_ingester=no])
+AM_CONDITIONAL([WANT_INGESTER], [test "x$with_ingester" != xno])
+
 AC_ARG_WITH([retrans],
     AS_HELP_STRING([--with-retrans],
         [enable support for retransmission from a NOAAPORT receiver
@@ -625,6 +633,15 @@ AM_COND_IF([WANT_NOAAPORT], [
         [AC_MSG_ERROR([Library not found])])
 ])
 
+AM_COND_IF([WANT_INGESTER],[
+    AC_SEARCH_LIBS([clock_gettime], [rt],,[AC_MSG_ERROR([Could not find required function clock_gettime],[1])])
+    AC_SEARCH_LIBS([timer_create], [rt],,[AC_MSG_ERROR([Could not find required function timer_create],[1])])
+    AC_SEARCH_LIBS([timer_settime], [rt],,[AC_MSG_ERROR([Could not find required function timer_settime],[1])])
+libs=$LIBS
+])
+
+
+
 # Ensure references to the XML2 package, which is used by the LDM registry
 # module.
 AC_CHECK_HEADER([libxml/parser.h], ,
@@ -665,6 +682,7 @@ AC_PROG_LIBTOOL
 AC_CONFIG_FILES([
     fauxPq/Makefile
     feedme/Makefile
+    fileIngest/Makefile
     gempak/Makefile
     gempak/tables/Makefile
     grib2/Makefile
diff --git a/fileIngest/.gitignore b/fileIngest/.gitignore
new file mode 100644
index 000000000..2474a325b
--- /dev/null
+++ b/fileIngest/.gitignore
@@ -0,0 +1,10 @@
+/test
+/fileIngester
+/test.c
+/log_tester
+/Makefile.in
+/stdclib.h
+/mlogger.h
+/datelib.h
+/goesr_lib.h
+
diff --git a/fileIngest/Makefile.am b/fileIngest/Makefile.am
new file mode 100644
index 000000000..cd43a8f26
--- /dev/null
+++ b/fileIngest/Makefile.am
@@ -0,0 +1,141 @@
+# Copyright 2011 University Corporation for Atmospheric Research
+#
+# This file is part of the Unidata LDM package.  See the file COPYRIGHT in the
+# top-level source-directory of the package for copying and redistribution
+# conditions.
+#
+## Process this file with automake(1) to produce file Makefile.in
+
+################################################################################
+
+LDMHOME			= @LDMHOME@
+LDMSRC			= $(top_srcdir)
+SUDO			= @SUDO@
+SU			= @SU@
+
+CLEANFILES		= $(BUILT_SOURCES)
+
+CPPFLAGS		= \
+	-DLDM_SUPPORT \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/noaaport \
+	-I$(top_srcdir)/protocol \
+	-I$(top_srcdir)/protocol2 \
+	-I$(top_srcdir)/pq \
+	-I$(top_srcdir)/ulog \
+	-I$(top_srcdir)/log \
+	-I$(top_srcdir)/misc \
+	-I$(top_srcdir)/registry \
+	@CPPFLAGS@
+
+bin_PROGRAMS		= fileIngester
+
+EXTRA_DIST              = \
+	datelib.hin \
+	stdclib.hin \
+	goesr_lib.hin \
+	mlogger.hin
+
+BUILT_SOURCES		= \
+	datelib.h \
+	stdclib.h \
+	goesr_lib.h \
+	mlogger.h
+
+COMMON_SOURCES		= \
+	stdclib.c stdclib.h \
+	goesr_lib.c goesr_lib.h \
+	mlogger.c mlogger.h \
+	datelib.c datelib.h \
+	ldmProductQueue.c ldmProductQueue.h
+
+fileIngester_SOURCES		= fileIngester.c $(COMMON_SOURCES)
+
+LDADD 			= $(top_builddir)/lib/libldm.la
+
+TAGS_FILES		= \
+	*.c *.h
+
+.c.i:
+	$(COMPILE) -E $< >$@
+
+.hin.h:
+	./extractDecls $*.hin $*.c >$@.tmp
+	mv -f $@.tmp $@
+
+#installcheck-local:
+#	pqcreate -c -s 2m /tmp/readnoaaport-test.pq
+#	$(DESTDIR)$(bindir)/readnoaaport -l- -q /tmp/readnoaaport-test.pq \
+#	    $(srcdir)/nwstgdump.data
+#	rm /tmp/readnoaaport-test.pq
+
+#check-local:		check-readnoaaport
+#check-readnoaaport:	readnoaaport
+#	pqcreate -c -s 2m /tmp/readnoaaport-test.pq
+#	./readnoaaport -nl- -q /tmp/readnoaaport-test.pq \
+#	    $(srcdir)/nwstgdump.data
+#	rm /tmp/readnoaaport-test.pq
+
+#root-ni-ck:
+#	./noaaportIngester -b 3 -q /tmp/noaaportIngester-test.pq \
+#	    <$(srcdir)/nwstgdump.data
+
+#valgrind:		valgrind-readnoaaport
+
+#valgrind-readnoaaport:		readnoaaport
+#	pqcreate -c -s 2m /tmp/readnoaaport-test.pq
+#	$(LIBTOOL) --mode=execute valgrind --leak-check=yes \
+#	    readnoaaport -l- -q /tmp/readnoaaport-test.pq nwstgdump.data
+#	rm /tmp/readnoaaport-test.pq
+
+sudo:
+if HAVE_SUDO
+	$(SUDO) $(MAKE) $(AM_MAKEFLAGS) $(TARGET) 2>/dev/tty
+else
+if HAVE_SU
+	@printf "Enter root's password (or don't): " >/dev/tty
+	@$(SU) root -c 'PATH='$$PATH' $(MAKE) $(AM_MAKEFLAGS) $(TARGET)' \
+	    </dev/tty 2>/dev/tty
+	@echo >/dev/tty
+endif
+endif
+	
+#valgrind-noaaportIngester:	noaaportIngester
+#	pqcreate -c -s 2m /tmp/noaaportIngester-test.pq
+#	$(MAKE) $(AM_MAKEFLAGS) sudo TARGET=root-ni-vg
+#	rm /tmp/noaaportIngester-test.pq
+
+#root-ni-vg:
+#	$(LIBTOOL) --mode=execute valgrind --leak-check=yes \
+#	    noaaportIngester -n -q /tmp/noaaportIngester-test.pq \
+#		<$(srcdir)/nwstgdump.data
+
+#debug-readnoaaport:	readnoaaport
+#	pqcreate -c -s 2m /tmp/readnoaaport-test.pq
+#	echo 'handle SIGCONT pass noprint nostop' >/tmp/readnoaaport.gdb
+#	echo 'b 617' >>/tmp/readnoaaport.gdb
+#	echo 'run -l- -q /tmp/readnoaaport-test.pq nwstgdump.data' \
+#	    >>/tmp/readnoaaport.gdb
+#	$(LIBTOOL) --mode=execute gdb -x /tmp/readnoaaport.gdb readnoaaport
+#	rm /tmp/readnoaaport-test.pq /tmp/readnoaaport.gdb
+
+#debug-noaaportIngester:	noaaportIngester
+#	pqcreate -c -s 2m /tmp/noaaportIngester-test.pq
+#	echo 'handle SIGCONT pass noprint nostop' >/tmp/noaaportIngester.gdb
+#	echo 'handle SIGTERM pass nostop' >>/tmp/noaaportIngester.gdb
+#	echo 'run -q /tmp/noaaportIngester-test.pq -n -m 224.0.1.1' \
+#	    >>/tmp/noaaportIngester.gdb
+#	$(MAKE) $(AM_MAKEFLAGS) sudo TARGET=root-ni-db
+#	rm /tmp/noaaportIngester-test.pq /tmp/noaaportIngester.gdb
+
+#root-ni-db:
+#	$(LIBTOOL) --mode=execute gdb -x /tmp/noaaportIngester.gdb \
+#	      noaaportIngester
+
+.PHONY:	\
+	sudo
+#	install-html \
+#	root-ni-ck \
+#	root-ni-db \
+#	root-ni-vg \
+#	sudo
diff --git a/fileIngest/Makefile.local b/fileIngest/Makefile.local
new file mode 100644
index 000000000..0e9d8b922
--- /dev/null
+++ b/fileIngest/Makefile.local
@@ -0,0 +1,38 @@
+
+COPTS = -g -Wall
+
+BUILT_HEADERS = datelib.h goesr_lib.h mlogger.h stdclib.h
+BUILT_PROGS = fileIngester test read_acq_pipe log_tester
+INGEST_OBJS = fileIngester.o stdclib.o goesr_lib.o mlogger.o
+
+all ::	fileIngester test log_tester read_acq_pipe
+
+clean :: 
+	rm -f $(INGEST_OBJS) $(BUILT_PROGS) read_acq_pipe.o log_tester.o
+	
+%.h : %.hin %.c extractDecls
+	./extractDecls $*.hin $*.c > $@
+
+%.o : %.c
+	cc $(COPTS) -o $@ -c $<
+
+goesr_lib.o :	stdclib.h mlogger.h goesr_lib.h
+stdclib.o :		stdclib.h
+fileIngester.o :	stdclib.h mlogger.h goesr_lib.h
+log_tester.o :	stdclib.h mlogger.h
+
+fileIngester :	$(INGEST_OBJS)
+	cc -g -lrt -o $@ $^
+
+read_acq_pipe :	read_acq_pipe.o stdclib.o
+	cc -g -lrt -o $@ $^
+
+acq_ftp_send :	$(INGEST_OBJS)
+	cc -g -lrt -o $@ $^
+
+test :		test.o
+	cc -g -o $@ $^
+
+log_tester :	log_tester.o mlogger.o stdclib.o
+	cc -g -lrt -o $@ $^
+
diff --git a/fileIngest/datelib.c b/fileIngest/datelib.c
new file mode 100644
index 000000000..462451cdf
--- /dev/null
+++ b/fileIngest/datelib.c
@@ -0,0 +1,186 @@
+/* ------------------------------------------------------------------------------
+ *
+ * File Name:
+ *	datelib.c
+ *
+ * Description:
+ *	This file contains functions for manipulating dates and times.
+ *
+ * Functions defined:
+ * 	format_date_string
+ * 
+ * Author:
+ * 	Brian Rapp		Jun 19, 2012
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+ ------------------------------------------------------------------------------ */
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <libgen.h>
+
+#include "datelib.h"
+
+/* ------------------------------------------------------------------------------
+
+Function Name
+	formatDateString
+Synopsis
+	Creates custom-formatted date strings.
+
+Prototype
+	int formatDateString (char *in_format, char *out_format, long adjustment,
+			      char *in_date, char *out_date)
+
+Arguments
+
+	Name:		in_format
+	Type:		char *
+	Access:		read only
+
+	Character string containing the format specification for the input time.
+	See the man page for strftime for details.  This is only used when an
+	absolute input date is provided.
+
+	Name:		out_format
+	Type:		char *
+	Access:		read only
+
+	Character string containing the Format specification for the output time.
+	See the man page for strftime for details.  This argument is required.
+
+	Name:		adjustment
+	Type:		long
+	Access:		read only
+
+	A long integer containing an adjustment (in seconds) to be applied to
+	the input time.  Negative values adjust the time prior to the input
+	time.  Positive values adjust the time after the input time.  A value of
+	zero indicates no adjustment is to be made to the input time.
+
+	Name:		in_date
+	Type:		char *
+	Access:		read only
+
+	Character string containing the input time.  Can be an absolute time in
+	any format supported by the strftime function, or one of the following
+	relative times:
+
+		NOW		Current date and time
+		TODAY		Today at midnight
+		YESTERDAY	Yesterday at midnight
+		TOMORROW	Tomorrow at midnight
+
+	Name:		out_date
+	Type:		char *
+	Access:		write only
+
+	A character string that is large enough to hold the output date provided
+	in the out_format argument.  The string must be allocated by the caller.
+
+	Name:		max_out_size
+	Type:		int
+	Access:		read only
+
+	An integer containing the maximum size for out_date.  This value must
+	include the trailing nul character.
+
+Description
+	This function creates a formatted date string optionally adjusted by
+	a specified amount. The output format defaults to "YYYY-MM-DD HH:MM:SS",
+	but can be fully specified with the 'out_format' argument.  See the
+	man page for strftime for more information on formatting.
+
+	An input time string is required, which can either be an absolute time
+	of the form "YYYY-MM-DD HH:MM:SS" or one of the relative time strings
+	"NOW", "YESTERDAY", "TODAY", or "TOMORROW".
+
+	Another optional parameter provides the
+	ability to adjust the time string by the specified number of seconds.
+
+Return Values
+	The number of characters placed in out_date, not including the terminating
+	nul terminator, provided the string, including the terminating nul byte,
+	fits.  Otherwise, it returns 0, and the contents of the array is undefined.
+
+------------------------------------------------------------------------------ */
+
+int formatDateString (const char *in_format, const char *out_format, long adjustment,
+		      char *in_date, char *out_date, int max_out_size) {
+
+	struct tm       *tp;
+	struct tm	ts;
+	time_t          the_time;
+	char		*res;
+	size_t		stat;
+	time_t	time_adjust     = 0;
+	char		new_out_format[MAX_DATE_FORMAT_LEN+1];
+
+	if ((out_format == NULL) || (strlen (out_format) == 0)) {
+		strcpy (new_out_format, DEFAULT_OUT_FORMAT);
+	} else {
+		strncpy (new_out_format, out_format, MAX_DATE_FORMAT_LEN);
+	}
+
+	if (!strcmp (in_date, RELT_NOW)) {
+		time (&the_time);
+	} else {
+		if (!strcmp (in_date, RELT_TODAY))	{
+			time (&the_time);
+			tp = localtime (&the_time);
+			tp->tm_hour = tp->tm_min = tp->tm_sec = 0;
+			the_time = mktime (tp);
+		} else {
+			if (!strcmp (in_date, RELT_YESTERDAY)) {
+				time (&the_time);
+				tp = localtime (&the_time);
+				tp->tm_hour = tp->tm_min = tp->tm_sec = 0;
+				the_time = mktime (tp);
+				the_time -= 86400;
+			} else {
+				if (!strcmp (in_date, RELT_TOMORROW)) {
+					time (&the_time);
+					tp = localtime (&the_time);
+					tp->tm_hour = tp->tm_min = tp->tm_sec = 0;
+					the_time = mktime (tp);
+					the_time += 86400;
+				} else {
+					memset (&ts, 0, sizeof (struct tm));
+					res = strptime (in_date, in_format, &ts); /* Convert time string to broken-down time -- dst may be wrong */
+					if ((res == 0) || (*res != 0)) {
+						return 0;
+					}
+
+					/* Convert broken-down time back to calendar time so we have a proper value for tm_isdst */
+					the_time = mktime (&ts);	/* Convert broken-down time to calendar time */
+					localtime_r (&the_time, &ts);	/* Convert calendar time back to broken-down time -- dst will be set properly here */
+
+					res = strptime (in_date, in_format, &ts);
+
+					if ((ts.tm_year == 0) || (ts.tm_mday == 0)) {
+						return 0;
+					}
+					the_time = mktime (&ts);
+				}
+			}
+		}
+	}
+
+	the_time += time_adjust;
+	memset (&ts, 0, sizeof (struct tm));
+	tp = localtime_r (&the_time, &ts);	/* This will set tm_isdst properly for the given time */
+	stat = strftime (out_date, max_out_size, new_out_format, &ts);
+
+	return stat;
+
+}
diff --git a/fileIngest/datelib.hin b/fileIngest/datelib.hin
new file mode 100644
index 000000000..186f78b6a
--- /dev/null
+++ b/fileIngest/datelib.hin
@@ -0,0 +1,32 @@
+/* ------------------------------------------------------------------------------
+ *
+ * File Name:
+ *	datelib.h
+ *
+ * Description:
+ *
+ *
+ * 
+ * Author:
+ * 	brapp		Jun 27, 2012
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+------------------------------------------------------------------------------ */
+
+
+#ifndef DATELIB_H_
+#define DATELIB_H_
+
+#define RELT_NOW		"NOW"
+#define RELT_TODAY		"TODAY"
+#define RELT_YESTERDAY		"YESTERDAY"
+#define RELT_TOMORROW		"TOMORROW"
+#define MAX_DATE_FORMAT_LEN	128
+#define DEFAULT_OUT_FORMAT	"%Y-%m-%d %H:%M:%S"
+
+@FUNCTION_DECLARATIONS@
+
+#endif /* DATELIB_H_ */
diff --git a/fileIngest/extractDecls b/fileIngest/extractDecls
new file mode 100755
index 000000000..2a2053bb3
--- /dev/null
+++ b/fileIngest/extractDecls
@@ -0,0 +1,38 @@
+templateFile=${1:?'header template-file not specified'}
+cFile=${2:?'C source-file not specified'}
+sed '/@FUNCTION_DECLARATIONS@/,$d' $templateFile \
+&& awk '
+    BEGIN { 
+        lineSep = ""; 
+    } 
+    /^\/\* -/ 	{
+        declStarted = 1;
+        lineCount = 0;
+    }
+    
+    /^static/ {
+        lineCount = 0; 
+        declStarted = 0; 
+    }
+ 
+    /[[:print:]]*\{$/	{
+        if (declStarted) { 
+    		lines[++lineCount] = substr($0, 1, length($0)-1);
+    		sub(/[ \t]+$/, "", lines[lineCount]);
+            for (i = 1; i <= lineCount; i++) {
+                printf ("%s%s", lineSep, lines[i]);
+                lineSep = "\n"; 
+            }
+            print ";"; 
+        } 
+        declStarted = 0;
+    } 
+
+    /^struct/ || /^typedef/ || /^}/ {
+        declStarted = 0;
+    }
+
+    declStarted != 0 {
+        lines[++lineCount] = $0;
+    }' $cFile \
+&& sed '1,/@FUNCTION_DECLARATIONS@/d' $templateFile
\ No newline at end of file
diff --git a/fileIngest/fileIngester.c b/fileIngest/fileIngester.c
new file mode 100644
index 000000000..6b48e0c31
--- /dev/null
+++ b/fileIngest/fileIngester.c
@@ -0,0 +1,2958 @@
+/* -----------------------------------------------------------------------------
+ *
+ * File Name:
+ *	fileIngester.c
+ *
+ * Description:
+ * 	This program initiates processing on weather product files using one of several
+ *	possible input methods and performing one of several output actions. It runs as
+ *	either a standalone daemon or as a subprocess of LDM to insert files into a
+ *	product queue. As a standalone daemon, it can either discard files, or write them
+ *	to another directory as a front-end to uplink_send. This latter purpose is now
+ *	largely obsolete since the same input methods are now supported natively by
+ *	uplink_send.
+ *
+ *	On input, fileIngester can either poll a single input directory, or read files
+ *	to process from a named pipe (from uplink_send through acqserver). Polling method
+ *	can be: GOESR, NDE, PDA, or POLL.
+ *
+ *	The GOESR method relies on each file being renamed to a specific extension when
+ *	it's ready to be processed. Full products are broken into smaller tiles to be able
+ *	to meet program latency requirements. For each full product, a Product Activity
+ *	Report (XML file) is transmitted after all related tiles are sent. The PAR must
+ *	be processed by a separate external program. To support PAR processing,
+ *	fileIngester can create individual files in a separate directory containing a hash
+ *	code of each tile. GOES-R product files do not contain the required WMO
+ *	header, which this program will automatically generate from the file name. If
+ *	the output is to an LDM queue, the WMO header will be added automatically. If
+ *	not, then the '-w' option must be provided for the WMO header to be added to
+ *	the output file.
+ *
+ *	NDE and PDA both use a 'marker' file to indicate a matching product file is
+ *	ready for ingest. The NDE and PDA methods are identical: the marker file for each
+ *	product will contain a hash code for the product file that fileIngester can process
+ *	directly and output non-matching results to the error log. Regardless of status,
+ *	each file will be ingested.
+ *
+ *	The POLL method just assumes files are ready whenever they can be opened.
+ *
+ *	To output to an LDM product queue, fileIngester must be specifically built as
+ *	an LDM extension (see build instructions below).
+ *
+ * Dependencies:
+ *	mlogger, ldmProductQueue, stdclib, goesr_lib
+ *
+ * Build Instructions:
+ *	By default, LDM support is not compiled in.  To use LDM, the source must
+ *	be compiled as part of LDM using the Makefile.am automake template.  This
+ *	is part of a branch of v6.13.0 of LDM that includes changes to the LDM
+ *	build system.  To build it for LDM, follow the normal procedure.  When
+ *	ready to build, do the following from the base LDM source directory as
+ *	user ldm:
+ *
+ *		autoreconf -fi
+ *		automake	(if version errors occur, follow instructions provided)
+ *		./configure --with-ingester --prefix=$HOME
+ *		rm -f libtool
+ *		ln -s /usr/bin/libtool
+ *		make
+ *		make install
+ *
+ *	Configuration
+ *	-------------
+ *
+ *	This program can be used with LDM in several ways, or it can be used without
+ *	LDM at all:
+ *
+ *	1. On a standalone server as upstream LDM feeding a downstream LDM
+ *
+ *		In addition to the standalone upstream LDM server that this software will
+ *		be installed on, the downstream LDM instance must be configured to pull
+ *		RaFTR-generated products. If NIS is used, ensure the RaFTR host and the
+ *		machine hosting the downstream LDM are defined. If not using NIS, define
+ *		both in the local /etc/hosts file on each machine. After LDM has been
+ *		successfully built and installed, configure as follows:
+ *
+ *		RaFTR Server
+ *
+ *		Ensure portmapper/rpcbind is running.
+ *
+ *		In /etc/services, add or modify to obtain the following:
+ *
+ *			ldm	388/tcp	ldm
+ *			ldm	388/udp	ldm
+ *
+ *		In /etc/rpc, add the following if not already present:
+ *
+ *			ldm	300029	ldmd
+ *
+ *		In /usr/local/ldm/etc/ldmd.conf, add an entry to allow the downstream
+ *		LDM instance to access it. It should be something like this (with TAB
+ *		characters between each field:
+ *
+ *			ALLOW	ANY	^<host regex>.*$
+ *
+ *		where <host regex> is a regular expression, such as: cpsbn.-tbwo
+ *
+ *		Remove or comment out any lines that begin with "EXEC" and add one like:
+ *
+ *			EXEC	"fileIngester -p<polling dir> -L<log dir> -M<log dir> \
+ *				-iGOESR -oLDM -q<LDM product queue path/name> -a0 -d2 -n2"
+ *
+ *		Update the LDM registry (/usr/local/ldm/etc/registry.xml) with reasonable
+ *		values. Be sure to updated the clock and provide a fully-qualified
+ *		name for the local host.
+ *
+ *		A sample system service file (ldm-raftr) in in /usr/local/ldm/src/ldm/raftr
+ *		if needed.
+ *
+ *
+ *		Downstream LDM Server
+ *
+ *		In /usr/local/ldm/etc/ldmd.conf, add an entry to request data from raftr
+ *		(white space must be tabs). For instance, if the upstream LDM instance
+ *		were raftr-tbwo, this would be used:
+ *
+ *			REQUEST ANY ".*" raftr-tbwo
+ *
+ *		In /usr/local/ldm/etc/pqact.conf, add an entry for the GOES-R WMO headers
+ *		using tabs as field separators.  For instance:
+ *
+ *			ANY 	^(TI[RS]...) (KNES) (..)(..)(..) (...)
+ *			    	FILE	-overwrite -log -close -edex    /data_store/goesr/\1_\2_\3\4\5_\6.nc
+ *
+ *		Start LDM on both the upstream and downstream servers. Check ldmd.log on
+ *		the downstream servers for issues connecting with the upstream servers.
+ *
+ *	2. On the machine hosting RaFTR feeding a downstream LDM
+ *
+ *		The only difference between this scenario and the first one is that RaFTR
+ *		will not be copying products across the network. Instead, RaFTR will be
+ *		writing products locally. Configuration is exactly the same as above, but
+ *		RaFTR must be configured to use some file transfer protocol (such as
+ *		SFTP, SCP, or FTPS) to copy the files to this machine.
+ *
+ *	3. On a CPSBN that is also receiving an SBN stream via noaaportIngester
+ *
+ *	4. Without LDM to generate SBN-ready GOES-R products with WMO headers
+ *
+ *	5. Without LDM to write PDA and NDE products to directories for ingest with
+ *	   uplink_send.
+ *
+ *	6. To exercise and validate RaFTR without additional downstream processing.
+ *
+ *	7. To ingest products into a product queue through uplink_send/acqserver.
+ *
+ *	To compile without LDM support, use the provided Makefile.local file:
+ *
+ *		make -f Makefile.local fileIngester
+ *
+ * Functions defined:
+ *
+ * Author:
+ * 	Brian M Rapp		17-Nov-2013
+ *
+ * Modification History:
+ *	Modified by		Date
+ *      Description
+ *
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Wed Dec 3 15:43:24 2014 -0500
+ *	Added NDE/PDA processing to read_raftr
+ *
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Thu Feb 5 15:44:17 2015 -0500
+ *	Made exit summary message always log
+ *
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Thu Feb 5 15:54:15 2015 -0500
+ *	Modified summary statistics to use product log instead of error log
+ *
+ *	Brian M. Rapp <Brian.Rapp@noaa.gov>	Wed Apr 1 08:52:50 2015 -0400
+ *	Support for new types/cats/codes
+ *
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Thu Apr 23 15:41:34 2015 -0400
+ *	Gave read_raftr.c the ability to generate checksum files for each
+ *	tile file it processes.
+ *
+ *	Brian Rapp <brian.rapp@noaa.gov>	Sun May 17 13:54:34 2015 -0400
+ *	Refactored read_raftr to fileIngester
+ *
+ *	Brian Rapp <brian.rapp@noaa.gov>	Sat May 23 15:57:51 2015 -0400
+ *	Added NDE/PDA processing to fileIngester.c.
+ *
+ *	Brian Rapp <brian.rapp@noaa.gov>	Mon May 25 10:59:17 2015 -0400
+ *	Changed directory creation permissions in fileIngester.c
+ *
+ *	commit 51b37cd3ac498413a363812a2c224c282e3be364
+ *	Brian Rapp <brian.rapp@noaa.gov>	Fri Jun 5 15:36:06 2015 -0400
+ *	Add -h option to fileIngester
+ *
+ *	commit cb55f0d8dbb3156ef2af69155840f921c2091bc8
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Tue Jun 9 15:15:48 2015 -0400
+ *	Fixed bug preventing product files from being deleted for
+ *	OutType==LDM in fileIngester.c
+ *
+ *	commit 25b2f76e3988b50e50b9e99d71d194b6a589438a
+ *	Brian Rapp <Brian.Rapp@noaa.gov>	Thu Jun 18 16:18:31 2015 -0400
+ *	Fixed fileIngester bug that caused a 2nd WMO header to be
+ *	added for PDA products written to an LDM queue.
+ *
+ *	Brian Rapp		25-Jun-2015
+ *	Added support for the POLL input method.
+ *
+ *	Brian Rapp		26-Jun-2015
+ *	Added support for the ACQ_PIPE input method.
+ *
+ * -------------------------------------------------------------------------- */
+#define _GNU_SOURCE
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <ctype.h>
+#include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <poll.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+#include <glob.h>
+#include <locale.h>
+
+#ifdef LDM_SUPPORT
+#       include <log.h>
+#       include <md5.h>
+#       include "ldmProductQueue.h"
+#endif
+
+#include "../fileIngest/stdclib.h"
+#include "../fileIngest/mlogger.h"
+#include "../fileIngest/goesr_lib.h"
+
+#define DIRECTORY_CREATE_PERMS		(S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)
+#define DIRECTORY_FULL_OPEN_PERMS	(S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)
+#define OUTFILE_FINAL_PERMS		(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+#define OUTFILE_CREATE_PERMS		S_IWUSR
+#define DEFAULT_VERBOSITY		V_ERROR
+#define DEFAULT_POLLING_INTERVAL	2		/* Default directory polling interval in seconds */
+#define SLEEP_TIME_SECS			1		/* Time to sleep between loop iterations */
+#define DEFAULT_MAX_QUEUE_SIZE		500
+#define DEFAULT_FILE_SPEC		"*"
+#define DEFAULT_MAX_SAVE_FILES		500
+#define DEFAULT_SAVE_FILE_DIGITS	3
+#define	MAX_FILENAME_LEN		128
+#define MAX_PATH_LEN			256
+#define MAX_ACQ_PATH_LEN		128
+#define MAX_HOST_LEN			64
+#define MAX_HASH_LEN			128
+#define MIN_DISCARD_AGE			60		/* Minimum age for DiscardAge in seconds */
+#define DEFAULT_DISCARD_AGE		3600		/* Default discard age in seconds */
+#define PROD_LOG			"products.log"
+#define PROD_LOG_PATH			"/awips/logs/Products"
+#define MESSAGE_LOG			"messages.log"
+#define MESSAGE_LOG_PATH		"/awips/logs/Messages"
+#define DEF_LDM_QUEUE			"/awips/ldm/data/ldm.pq"
+#define DEF_OUTFILE_PREFIX		"goesr"
+#define DEF_LOG_SIZE			(4 * 1024 * 1024)
+#define TRACE_LOG_SIZE			(100 * 1024 * 1024)
+#define LOG_BUFFER_SIZE			1024
+#define MIN_PROD_SIZE_READ		25
+#define STATUS_FREQUENCY		50
+#define MAX_HOST_NAME_LEN		64		/* max length for host name */
+#define	DEF_STR_LEN			128
+
+#define SIZE_WMO_HDR			24
+#define SIZE_WMO_TERM			3
+#define WMO_TERMINATOR			"\r\r\n"
+#define SIZE_SBN_HDR			11
+#define SIZE_SBN_TLR			4
+#define SBN_HEADER_TEMPLATE		"\001\015\015\012%03d\040\015\015\012"
+#define SBN_TRAILER			"\015\015\012\003"
+#define DEFAULT_FEED_TYPE		OTHER
+
+#define OUT_NONE			0
+#define OUT_DISCARD			1
+#define OUT_FILE			2
+#ifdef LDM_SUPPORT
+#	define OUT_LDM			4
+#endif
+
+#define IN_NONE				0
+#define IN_GOESR			1
+#define IN_NDE				2
+#define IN_PDA				3
+#define IN_POLL				4
+#define	IN_ACQ_PIPE			5
+
+#define PROD_TYPE_NWSTG			5
+#define PROD_CAT_NWSTG			101
+#define SBN_TYPE_ID_GOESR		12
+#define PROD_CAT_IMAGE			3
+#define PC_WMO_SAT_IMAGE_T		52
+
+#define STAT_ERROR			-1
+#define STAT_SUCCESS			0
+#define STAT_MORE_FILES			1
+#define STAT_ALREADY_QUEUED		3
+
+#define MIN(a, b)	((a < b) ? a : b)
+
+typedef  struct	pipe_prod_name_hdr  {				/* prod filename hdr for pipe 	     */
+	int		pipe_insert_time;			/* time product added to pipe	     */
+	int		pipe_prod_NCF_rcv_time;			/* time product received at NCF	     */
+	ushort		pipe_prod_type;				/* product category                  */
+								/*     TYPE_GOES, TYPE_NWSTG, etc    */
+	ushort		pipe_prod_cat;				/* product category                  */
+								/*     CAT_IMAGE, etc		     */
+	ushort		pipe_prod_code;				/* product code 1,2,3,etc            */
+	ushort		pipe_prod_flag;				/* product flag (error & status)     */
+								/*     error_mask & prod_done,etc    */
+	ushort		reserve1;				/* reserved	                     */
+	ushort		reserve2;				/* reserved	                     */
+	uint		pipe_prod_orig_prod_seqno;		/* original prod seqno to retransmit */
+	int		pipe_prod_orig_NCF_rcv_time;		/* NCF receive time binary(GMT) */
+		/* Retransmit info */
+	ushort		pipe_prod_run_id;			/* Unique run identification    */
+								/*    for product stream    */
+								/*    parm for retransmission   */
+	ushort		pipe_prod_orig_run_id;			/* Unique orig run identification    */
+	char		pipe_prod_filename[MAX_ACQ_PATH_LEN];	/* UNIX filename for prod */
+} PIPE_PROD_NAME_HDR;
+
+typedef struct	file_node {
+	char		*fptr;		/* File name (without path) */
+	time_t		mtime;		/* File last modification time */
+	off_t		fsize;		/* File size in bytes */
+}	FILE_NODE;
+
+typedef struct	file_list_hdr {
+	FILE_NODE	*fileNodes;	/* Pointer to array of FILE_NODEs */
+	int		count;		/* Number of files in list */
+}	FILE_LIST;
+
+typedef struct	optdef {
+	char		*str;
+	unsigned int	val;
+}	OPT_SPEC;
+
+OPT_SPEC		inOpts[] = {	{ "GOESR",	IN_GOESR	},
+					{ "NDE",	IN_NDE		},
+					{ "PDA",	IN_PDA		},
+					{ "POLL",	IN_POLL		},
+					{ "ACQ_PIPE",	IN_ACQ_PIPE	},
+					{ NULL,		IN_NONE		}
+			};
+
+OPT_SPEC		outOpts[] = {	{ "DISCARD",	OUT_DISCARD	},
+					{ "FILE",	OUT_FILE	},
+#ifdef LDM_SUPPORT
+					{ "LDM",	OUT_LDM		},
+#endif
+					{ NULL,         OUT_NONE	}
+                        };
+
+#define MD5                             1
+#define SHA1                            2
+#define SHA224                          3
+#define SHA256                          4
+#define SHA384                          5
+#define SHA512                          6
+
+OPT_SPEC                csOpts[] = {	{ "MD5",        MD5     },
+					{ "SHA1",       SHA1    },
+					{ "SHA224",     SHA224  },
+					{ "SHA256",     SHA256  },
+					{ "SHA384",     SHA384  },
+					{ "SHA512",     SHA512  },
+					{ NULL,         0       }
+                        };
+
+char			*hashProgs[] = { "md5sum",
+					 "sha1sum",
+					 "sha224sum",
+					 "sha256sum",
+					 "sha384sum",
+					 "sha512sum"
+			};
+
+#ifdef LDM_SUPPORT
+OPT_SPEC		feedOpts[] = {	{ "IMAGE",	IMAGE	},
+					{ "TEXT",	TEXT	},
+					{ "GRID",	GRID	},
+					{ "POINT",	POINT	},
+					{ "BUFR",	BUFR	},
+					{ "GRAPH",	GRAPH	},
+					{ "OTHER",	OTHER	},
+					{ "NEXRAD",	NEXRAD	},
+					{ "NPORT",	NPORT	}
+			};
+#endif
+
+extern char             *optarg;
+
+pid_t                   MyPid;
+char			*ProgName;
+char			LocalHostName[MAX_HOST_NAME_LEN+1];
+int			PollInterval;				/* Default time to sleep if no files in polling directory */
+int			SleepPollInterval;			/* Time to sleep between poll iterations */
+int			Done;					/* Set when need to shut down */
+int			SaveFiles;				/* If set, processed files are saved to the 'sent' directory */
+int			MaxSentFiles;				/* If using -d, maximum # of files to write before starting over */
+int			SentFileDigits;				/* Number of digits to output in sent file names */
+int			SaveFails;				/* If set, files that failed valiation are saved to 'fail' directory */
+int                     OutAction;                              /* Output options: OUT_DISCARD, OUT_FILE, OUT_LDM, OUT_ACQSERVER */
+int                     InType;                                 /* Input options: IN_GOESR, IN_NDE */
+int                     Validate;                               /* Validate input files or not.  Validation method depends on InType */
+int                     CreateChecksum;                         /* Create checksum of input file contents and write to .hash file */
+int			HashOpt;
+char			*HashProgram;				/* Program executable name */
+int                     MaxQueueSize;                           /* Maximum number of products to read from the polling directory per cycle */
+int                     AddLdmWrapper;                          /* If set, an LDM wrapper (header and trailer) is added to each product */
+int                     AddWmoHeader;                           /* If set, a WMO header is calculated and added to each product */
+char			InputSource[MAX_PATH_LEN+1];		/* Directory to poll for products or pipe name with -iPIPE */
+char			Loc[5];					/* Input location string - either "pipe" or "dir" */
+char			FailDir[MAX_PATH_LEN+1];		/* Directory to write failed products */
+char			SentDir[MAX_PATH_LEN+1];		/* Directory to write sent products */
+char			SaveDir[MAX_PATH_LEN+1];		/* Directory to save products to when -o FILE option is provided along with -d */
+char			ParDir[MAX_PATH_LEN+1];			/* Directory to save PAR files to (GOES-R) */
+char			HostName[MAX_HOST_LEN+1];		/* Local host name */
+char			PollFileSpec[MAX_FILENAME_LEN+1];	/* File specification for products that are ready to ingest, can include wildcards */
+char			LogPathBase[MAX_PATH_LEN+1];		/* Product log directory */
+char			MessagePath[MAX_PATH_LEN+1];		/* Error/Debug log directory */
+int			DiscardAge;				/* Files older than this (in seconds) will be discarded */
+int			Verbosity;				/* Verbosity level of error log */
+LOGGER			*pLog;					/* Product logger */
+LOGGER			*eLog;					/* Error logger */
+char			*ProdBuf;				/* Buffer used to read products from disk.  Reallocated as necessary */
+int			ProdBufSize;				/* Current size of prodBuf */
+unsigned long long	TotalProductsProcessed;			/* Total number of products processed since start up */
+unsigned long long      TotalBytesProcessed;                    /* Total number of bytes processed since start up */
+int                     SbnSeqNo;                               /* Product sequence number for LDM */
+int                     SentSeqNo;                              /* Sequence number when the -of option is provided */
+
+#ifdef LDM_SUPPORT
+
+feedtypet		FeedType;				/* LDM Feed Type -- only valid with -oLDM */
+char                    pqfName[MAX_PATH_LEN+1];                /* LDM product queue file path */
+LdmProductQueue         *prodQueue;                             /* LDM queue structure */
+MD5_CTX                 *md5ctxp;                               /* MD5 context for generating hash codes used by LDM */
+
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	usage
+ *
+ * Format
+ *	static void usage (const char *progname)
+ *
+ * Arguments
+ *	char	*progname
+ *	Character string containing the name of this program.
+ *
+ * Description
+ *	Print program usage information and exit.
+ *
+ * Return Values
+ *	This function does not return, it exits with value 1 (error).
+ *
+ * -------------------------------------------------------------------------- */
+
+static void usage (const char *progname) {
+
+	fprintf (stderr, "usage: %s -p <poll dir or pipe> -i (ACQ_PIPE|GOESR|NDE|PDA|POLL)\n"
+#ifdef LDM_SUPPORT
+		"\t-o (DISCARD|FILE|LDM) [-q <queue>|-d <dir>] [-F <feedtype>] [-w]\n"
+#else
+		"\t-o (DISCARD|FILE) [-d <dir>] [-w]\n"
+#endif
+		"\t[-c <checksum type>] [-h <PAR dir>] [-x <sent digits>]\n"
+		"\t[-s <sent dir>] [-f <fail dir>] [-n <polling interval>]\n"
+		"\t[-t <template>] [-a <discard age>] [-L <prod log path>]\n"
+		"\t[-M <msg log path>] [-Q <max q size] [-D <log level>]\n\n"
+
+	"This program initiates processing on weather product files using one of several\n"
+	"possible input methods and performing one of several output actions. It runs as\n"
+	"either a standalone daemon or as a subprocess of LDM to insert files into a\n"
+	"product queue. As a standalone daemon, it can either discard files, or write them\n"
+	"to another directory as a front-end to uplink_send. This latter purpose is now\n"
+	"largely obsolete since the same input methods are now supported natively by \n"
+	"uplink_send.\n\n"
+	"On input, fileIngester can either poll a single input directory, or read files\n"
+	"to process from a named pipe (from uplink_send through acqserver). Polling method\n"
+	"can be: GOESR, NDE, PDA, or POLL.\n\n"
+	"The GOESR method relies on each file being renamed to a specific extension when\n"
+	"it's ready to be processed. Full products are broken into smaller tiles to be able\n"
+	"to meet program latency requirements. For each full product, a Product Activity\n"
+	"Report (XML file) is transmitted after all related tiles are sent. The PAR must\n"
+	"be processed by a separate external program. To support PAR processing,\n"
+	"fileIngester can create individual files in a separate directory containing a hash\n"
+	"code of each tile. GOES-R product files do not contain the required WMO\n"
+	"header, which this program will automatically generate from the file name. If\n"
+	"the output is to an LDM queue, the WMO header will be added automatically. If\n"
+	"not, then the '-w' option must be provided for the WMO header to be added to\n"
+	"the output file.\n\n"
+	"NDE and PDA both use a 'marker' file to indicate a matching product file is\n"
+	"ready for ingest. The NDE and PDA methods are identical: the marker file for each\n"
+	"product will contain a hash code for the product file that fileIngester can process\n"
+	"directly and output non-matching results to the error log. Regardless of status,\n"
+	"each file will be ingested.\n\n"
+	"The POLL method just assumes files are ready whenever they can be opened.\n\n"
+	"Options:\n"
+	"-a <discard age>\n"
+	"\tOptional parameter specifying the maximum age (in seconds) of a file for\n"
+	"\tprocessing. Old files will be deleted. The minimum is 60; the default is 3600.\n"
+	"\tIf specified as 0 or less, then all files are processed regardless of age.\n\n"
+	"-c <hash type>\n"
+	"\tOptional parameter indicating that a file of same name as input file with '.hash'\n"
+	"\textension containing a hashcode for each tile file is to be created. If this\n"
+	"\toption is not provided, then checksum files will not be produced. If -i is \"GOESR\"\n"
+	"\tand -c is provided, then -h must also be provided. Supported hash\n"
+	"\ttypes are:\n"
+	"\t\tMD5\n"
+	"\t\tSHA1\n"
+	"\t\tSHA224\n"
+	"\t\tSHA256\n"
+	"\t\tSHA384\n"
+	"\t\tSHA512\n\n"
+	"-D <log level>\n"
+	"\tUsed to enable debugging.  Diagnostic messages are written to the error log.\n"
+	"\tThe default logging level is 1 (ERROR). Other available levels are:\n"
+	"\t2 (INFO), 3 (DEBUG), and 4 (TRACE).\n\n"
+	"-d <save dir>\n"
+	"\tOptional parameter specifying the directory to save files to when -o FILE\n"
+	"\toption is given.\n\n"
+#ifdef LDM_SUPPORT
+	"-F <feed type>\n"
+	"\tOptional parameter to set feed type for products inserted into LDM. Default\n"
+	"\tis OTHER. Valid types are: IMAGE,TEXT,GRID,POINT,BUFR,GRAPH,OTHER,NEXRAD,NPORT\n\n"
+#endif
+	"-f <fail directory>\n"
+	"\tOptional parameter specifying where failed and discarded products are written.\n"
+	"\tIf not provided, failed files are not saved.\n\n"
+	"-h <PAR dir>\n"
+	"\tOptional directory for storing GOES-R PAR files. -h must be provided with -iGOESR\n"
+	"\tand -c. -h cannot be used alone.\n\n"
+	"-i (ACQ_PIPE|GOESR|NDE|PDA|POLL)\n"
+	"\tInput method for all ingested files. Can be ACQ_PIPE, GOESR, NDE, PDA, or POLL.\n"
+	"\tAll but POLL and ACQ_PIPE require a file template (-t).  With POLL processing,\n"
+	"\tany files matching the template ('*' by default) will be ingested as long as\n"
+	"\tthey are accessible (readable). With ACQ_PIPE processing, individual files\n"
+	"\tto be processed will be written to the acqserver pipe specified with -p. For\n"
+	"\tNDE and PDA products, files matching the template specification contain a hash\n"
+	"\tcode of the type specified by the -c argument. We are guaranteed that if the\n"
+	"\thash file exists, a product with the same name minus the template extension will\n"
+	"\texist and will be ready to be ingested. No additional processing is needed for\n"
+	"\tNDE products. For GOESR products, the existence of a match to the template\n"
+	"\tindicates that the file itself contains a product that is ready for processing.\n"
+	"\tGOESR files as received from the provider do not contain WMO headers. Information\n"
+	"\tin the file name is used to generate a WMO header, which is inserted at the front\n"
+	"\tor the file along with an LDM header and trailer. If -c is provided with -iGOESR,\n"
+	"\tthen -h must be provided as well.\n\n"
+	"-L <prod log path>\n"
+	"\tThis optional parameter provides the path to the product log file directory.\n"
+	"\tBy default it is: %s\n\n"
+	"-M <msg log path>\n"
+	"\tThis optional parameter provides the path to the message log directory.\n"
+	"\tBy default it is: %s\n\n"
+	"-n <polling interval>\n"
+	"\tOptional parameter how long this program should sleep (in seconds) between\n"
+	"\tpolls when no files are available for processing. This option is not valid\n"
+	"\twith -iACQ_PIPE. The default interval is %d seconds.\n\n"
+#ifdef LDM_SUPPORT
+	"-o (DISCARD|FILE|LDM)\n"
+	"\tRequired parameter indicating output type. Options are 'DISCARD', 'FILE',\n"
+	"\tor 'LDM'. If 'FILE', then products will be written to the 'sent' directory.\n"
+	"\tIf 'LDM', products will be written to the LDM product queue as specified\n"
+	"\twith the '-q' option. If 'DISCARD', products will be discarded after\n"
+	"\tvalidation and logging.\n\n"
+#else
+	"-o (DISCARD|FILE)\n"
+	"\tRequired parameter indicating output action.  Options are 'FILE' or 'DISCARD'.\n"
+	"\tIf 'FILE', then products will be written to the 'sent' directory. If 'DISCARD'\n"
+	"\tproducts will be validated, logged, and discarded.\n\n"
+#endif
+	"-p <poll dir or pipe>\n"
+	"\tRequired parameter specifying the directory that will be polled for products or,\n"
+	"\twith -iACQ_PIPE, the pipe that will be read for each product.\n\n"
+#ifdef LDM_SUPPORT
+	"-q <ldm queue>\n"
+	"\tOptional parameter providing the path to the LDM queue.\n"
+	"\tDefault is: %s\n\n"
+#endif
+	"-Q <maximum queue size>\n"
+	"\tMaximum number of files to queue from the polling directory per pass.  If\n"
+	"\tset to 0 or less, then there is no limit.  Default is 0.\n\n"
+	"-s <sent directory>\n"
+	"\tOptional parameter specifying the directory for processed products.  If not\n"
+	"\tprovided, files are deleted after processing.\n\n"
+	"-t <file spec template>\n"
+	"\tFile template specification used to find files that are ready for processing.\n"
+	"\tThe default spec is: %s\n\n"
+	"-w\n"
+	"\tOptional parameter to force WMO header to be added to each file.\n\n"
+	"-x <max sent files>\n"
+	"\tNumber of files to save in the sent directory. Only valid with -d\n\n"
+	, progname, PROD_LOG_PATH, MESSAGE_LOG_PATH, DEFAULT_POLLING_INTERVAL
+#ifdef LDM_SUPPORT
+	, DEF_LDM_QUEUE
+#endif
+	, DEFAULT_FILE_SPEC
+	);
+	exit (1);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	getOptFromString
+ *
+ * Format
+ *	int getOptFromString (OPT_SPEC opts, char *optStr)
+ *
+ * Arguments
+ *	opts
+ *	Pointer to array of options
+ *
+ *	optStr
+ *	Option string to match
+ *
+ * Description
+ *	Searches opts for optStr and returns the matching opt value.
+ *
+ * Return Values
+ *	Value corresponding to the option string.
+ *
+ * -------------------------------------------------------------------------- */
+
+int getOptFromString (OPT_SPEC *opts, char *optStr) {
+
+	OPT_SPEC	*p = opts;
+	int		i;
+
+	for (i = 0; p[i].str; i++) {
+		if (!strcmp (p[i].str, optStr)) {
+			return i;
+		}
+	}
+
+/*
+	while (p->str) {
+		if (!strcmp (p->str, optStr)) {
+			return p->val;
+		}
+
+		p++;
+	}
+*/
+
+	return -1;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	cmd_line
+ *
+ * Format
+ *	static void cmd_line (int argc, char **argv)
+ *
+ * Arguments
+ *	argc
+ *	This will be argc as passed directly from main().
+ *
+ *	argv
+ *	This will be argv as passed directly from main().
+ *
+ * Description
+ *	This function processes command line arguments and assigns them as
+ *	required for this program.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void cmd_line (int argc, char **argv) {
+
+	int		optchar;
+	int		val;
+	char		str[DEF_STR_LEN+1];
+	char		optstr[DEF_STR_LEN+1];
+#ifdef LDM_SUPPORT
+	char		*ldmopt = "q:";
+#else
+	char		*ldmopt = "";
+#endif
+
+	sprintf (optstr, "a:c:D:d:F:f:h:i:L:lM:n:o:p:Q:%ss:t:vwx:?", ldmopt);
+
+	PollInterval            = DEFAULT_POLLING_INTERVAL;
+	SleepPollInterval       = SLEEP_TIME_SECS;
+	DiscardAge		= DEFAULT_DISCARD_AGE;
+	Verbosity		= DEFAULT_VERBOSITY;
+	MaxQueueSize		= DEFAULT_MAX_QUEUE_SIZE;
+	SaveFiles		= FALSE;
+	SaveFails		= FALSE;
+	InType			= IN_NONE;
+	OutAction		= OUT_NONE;
+	AddWmoHeader            = FALSE;
+	AddLdmWrapper           = FALSE;
+	Validate                = FALSE;
+	CreateChecksum          = FALSE;
+	MaxSentFiles		= DEFAULT_MAX_SAVE_FILES;
+	SentFileDigits		= DEFAULT_SAVE_FILE_DIGITS;
+	ParDir[0]		= '\0';
+
+	strcpy (Loc, "dir");
+	strcpy (PollFileSpec, DEFAULT_FILE_SPEC);
+	strcpy (LogPathBase, PROD_LOG_PATH);
+	strcpy (MessagePath, MESSAGE_LOG_PATH);
+
+#ifdef LDM_SUPPORT
+	FeedType		= DEFAULT_FEED_TYPE;
+	strcpy (pqfName, DEF_LDM_QUEUE);
+#endif
+
+	while ((optchar = getopt(argc, argv, optstr)) != EOF) {
+		switch (optchar) {
+		case 'a':
+			if ((val = atoi(optarg)) <= 0) {
+				DiscardAge = 0;
+			} else if (val < MIN_DISCARD_AGE) {
+				DiscardAge = MIN_DISCARD_AGE;
+				fprintf(stderr,
+					"WARNING: Invalid discard age (%d) - setting to %d\n",
+					val, MIN_DISCARD_AGE);
+			} else {
+				DiscardAge = val;
+			}
+			break;
+
+		case 'c':
+			CreateChecksum = TRUE;
+			strncpy(str, optarg, DEF_STR_LEN);
+			if ((HashOpt = getOptFromString(csOpts, raiseCase(str))) == -1) {
+				fprintf(stderr,
+					"Invalid input option: %s\n",
+					optarg);
+				usage(basename(argv[0]));
+			}
+
+			HashProgram = hashProgs[HashOpt];
+			break;
+
+		case 'D':
+			if ((val = atoi(optarg)) < 0) {
+				Verbosity = 0;
+				fprintf(stderr,
+					"WARNING: Invalid debug level (%d) - setting to %d\n",
+					val, 0);
+			} else if (val > V_MAX) {
+				Verbosity = V_MAX;
+				fprintf(stderr,
+					"WARNING: Invalid debug level (%d) - setting to %d\n",
+					val, V_MAX);
+			} else {
+				Verbosity = val;
+			}
+			break;
+
+		case 'd':
+			strncpy(SaveDir, optarg, MAX_PATH_LEN);
+			stripTrailingChar(SaveDir, '/');
+			break;
+
+#ifdef LDM_SUPPORT
+		case 'F':
+			strncpy(str, optarg, DEF_STR_LEN);
+			if ((val = getOptFromString(feedOpts, raiseCase(str))) == -1) {
+				fprintf(stderr,
+					"Invalid input option: %s\n",
+					optarg);
+				usage(basename(argv[0]));
+			}
+			FeedType = feedOpts[val].val;
+			break;
+#endif
+
+		case 'f':
+			strncpy(FailDir, optarg, MAX_PATH_LEN);
+			stripTrailingChar(FailDir, '/');
+			SaveFails = TRUE;
+			break;
+
+		case 'h':
+			strncpy(ParDir, optarg, MAX_PATH_LEN);
+			break;
+
+		case 'i':
+			strncpy(str, optarg, DEF_STR_LEN);
+			if ((val = getOptFromString(inOpts, raiseCase(str))) == -1) {
+				fprintf(stderr,
+					"Invalid input option: %s\n",
+					optarg);
+				usage(basename(argv[0]));
+			}
+			InType = inOpts[val].val;
+			if (InType == IN_ACQ_PIPE) {
+				strcpy (Loc, "pipe");
+			}
+			break;
+
+		case 'L':
+			strncpy(LogPathBase, optarg, MAX_PATH_LEN);
+			break;
+
+		case 'l':
+			AddLdmWrapper = TRUE;
+			break;
+
+		case 'M':
+			strncpy(MessagePath, optarg, MAX_PATH_LEN);
+			break;
+
+		case 'n':
+			if ((val = atoi(optarg)) <= 0) {
+				PollInterval = 0;
+			} else {
+				PollInterval = val;
+			}
+			break;
+
+		case 'o':
+			strncpy(str, optarg, DEF_STR_LEN);
+			if ((val = getOptFromString(outOpts, raiseCase(str))) == -1) {
+				fprintf(stderr,
+					"Invalid output option: %s\n",
+					optarg);
+				usage(basename(argv[0]));
+			}
+			OutAction = outOpts[val].val;
+
+			switch (OutAction) {
+#ifdef LDM_SUPPORT
+			case OUT_LDM:
+				AddLdmWrapper = TRUE;
+
+				if (InType == IN_GOESR) {
+					AddWmoHeader = TRUE;
+				}
+				break;
+#endif
+			case OUT_DISCARD:
+				SaveFiles = FALSE;
+				break;
+			default:
+				break;
+			}
+			break;
+
+		case 'p':
+			strncpy(InputSource, optarg, MAX_PATH_LEN);
+			stripTrailingChar(InputSource, '/');
+			break;
+
+#ifdef LDM_SUPPORT
+			case 'q':
+			strncpy (pqfName, optarg, MAX_PATH_LEN);
+			break;
+
+#endif
+		case 'Q':
+			if ((val = atoi(optarg)) < 0) {
+				val = 0;
+				fprintf(stderr,
+					"WARNING: Invalid maximum queue age (%d) - setting to %d\n",
+					val, 0);
+			}
+
+			MaxQueueSize = val;
+			break;
+
+		case 's':
+			strncpy(SentDir, optarg, MAX_PATH_LEN);
+			stripTrailingChar(SentDir, '/');
+			SaveFiles = TRUE;
+			break;
+
+		case 't':
+			strncpy(PollFileSpec, optarg, MAX_FILENAME_LEN);
+			break;
+
+		case 'v':
+			Validate = TRUE;
+			break;
+
+		case 'w':
+			AddWmoHeader = TRUE;
+			break;
+
+		case 'x':
+			SentFileDigits = strlen (optarg);
+			if ((val = atoi(optarg)) > 0) {
+				MaxSentFiles = val;
+			}
+
+			if (MaxSentFiles > 100000) {
+				MaxSentFiles		= DEFAULT_MAX_SAVE_FILES;
+				SentFileDigits		= DEFAULT_SAVE_FILE_DIGITS;
+			}
+			break;
+
+		default:
+			usage(basename(argv[0]));
+			break;
+		}
+	}
+
+	if (InType == IN_NONE) {
+		fprintf (stderr,
+			"Input method (-i) is required\n");
+		usage (basename (argv[0]));
+	}
+
+	if (OutAction == OUT_NONE) {
+		fprintf (stderr,
+			"Output action (-o) is required\n");
+		usage (basename (argv[0]));
+	}
+
+	if ((InType == IN_GOESR) && ((CreateChecksum && (ParDir[0] == '\0')) ||
+				     (!CreateChecksum && (ParDir[0] != '\0')))) {
+		fprintf (stderr,
+			"With -iGOESR, both -c and -h must be provided, or neither can be\n");
+		usage (basename (argv[0]));
+	}
+
+	if ((OutAction == OUT_FILE) && !strlen (SaveDir)) {
+		fprintf (stderr,
+			"-d <save dir> must be provided with -o FILE\n");
+		usage (basename (argv[0]));
+	}
+
+	if (!strlen (InputSource)) {
+		if (InType == IN_ACQ_PIPE) {
+			logMsg (eLog, V_ALWAYS, S_FATAL,
+				"(%s) - Pipe not provided - exiting",
+				__FUNCTION__);
+		} else {
+			logMsg (eLog, V_ALWAYS, S_FATAL,
+				"(%s) - Polling directory not provided - exiting",
+				__FUNCTION__);
+		}
+
+		usage (basename (argv[0]));
+	}
+}
+
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	initLogs
+ *
+ * Format
+ *	int initLogs ()
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Initializes the product and error logs.  If LDM support is compiled in,
+ *	then the log facility used by LDM is also initialized.
+ *
+ * Return Values
+ *	0	Success
+ *	1	Some kind of error, probably fatal
+ *
+ * -------------------------------------------------------------------------- */
+
+#define COMMON_OPTS	(O_FLUSH_AFTER_EACH | O_ARCHIVE | O_TIMESTAMP | O_KEEP_OPEN | O_ADD_NEWLINE)
+#define PROD_LOG_OPTS	(COMMON_OPTS)
+#define ERR_LOG_OPTS	(COMMON_OPTS | O_LOG_INIT | O_SHOW_SEVERITY)
+
+static int initLogs () {
+
+	char	logName[MAX_FILENAME_LEN+1];
+
+	sprintf (logName, "%s.product.log", ProgName);
+	pLog = logInitLogger ("Transaction Log", F_FILE, PROD_LOG_OPTS, V_ERROR,
+			LogPathBase, logName, DEF_LOG_SIZE, LOG_BUFFER_SIZE);
+	if (!pLog) {
+		fprintf (stderr,
+			"FATAL: %s - could not open transaction log\n",
+			__FUNCTION__);
+		return 1;
+	}
+
+	sprintf (logName, "%s.error.log", ProgName);
+	eLog = logInitLogger ("Error Log", F_FILE, ERR_LOG_OPTS, Verbosity,
+			MessagePath, logName, DEF_LOG_SIZE, LOG_BUFFER_SIZE);
+	if (!eLog) {
+		fprintf (stderr,
+			"FATAL: %s - could not open transaction log\n",
+			__FUNCTION__);
+		return 1;
+	}
+
+#ifdef LDM_SUPPORT
+	sprintf (logName, "%s/ldm.log", MessagePath);
+	log_set_destination(logName);
+	log_set_level(LOG_LEVEL_NOTICE);
+#endif
+
+	return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	atExitHandler
+ *
+ * Format
+ *	void adExitHandler ()
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Handler called when the 'exit()' system call is issued to terminate
+ *	this program.  It shuts down the logging facilities, and 'free's up
+ *	some dynamically allocated memory.
+ *
+ *	If LDM support is compiled in, the LDM product queue is closed and
+ *	the MD5 context is freed up.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void atExitHandler () {
+
+	logMsg (pLog, V_ALWAYS, S_STATUS,
+		"Products processed: %'lld  Total Bytes Processed: %'lld",
+                TotalProductsProcessed, TotalBytesProcessed);
+        logShutdown ();
+
+#ifdef LDM_SUPPORT
+
+        free_MD5_CTX (md5ctxp);
+        lpqClose (prodQueue);
+
+#endif
+
+	free (ProgName);
+	free (ProdBuf);
+	puts ("Done.");
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	sigsetexitflag
+ * Format
+ *	void sigsetexitflag (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should terminate the process when
+ *	the current product has been processed.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void sigsetexitflag (int signum) {
+
+	/* set global flag for termination	*/
+	Done = TRUE;
+
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Received signal %d, setting exit flag",
+		signum);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	siglogandcontinue
+ *
+ * Format
+ *	void siglogandcontinue (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should be ignored.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void siglogandcontinue (int signum) {
+
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Received signal %d, ignored",
+		signum);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	sigexitnow
+ *
+ * Format
+ *	void sigexitnow (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should terminate the process immediately.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void sigexitnow (int signum) {
+
+	logMsg (eLog, V_ALWAYS, S_STATUS,
+		"Received signal %d, exit process immediately",
+		signum);
+
+	exit (0);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	setupSignalHandlers
+ *
+ * Format
+ *	void setupSignalHandlers ()
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Set up initial signal handlers for the process.
+ *
+ * Return Values
+ *
+ * -------------------------------------------------------------------------- */
+
+static void setupSigHandler () {
+	struct sigaction act;
+	static const char fname[40+1]="setupSigHandler";
+
+	/* SIGUSR1 will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGUSR1, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGUSR1, strerror(errno));
+	}
+
+	/* SIGTERM will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGTERM, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGTERM, strerror(errno));
+	}
+
+	/* SIGHUP will exit the process	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigexitnow;
+	act.sa_flags=0;
+	if (sigaction (SIGHUP, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigexitnow, %s\n",
+			fname, SIGHUP, strerror(errno));
+	}
+
+	/* SIGINT will be handled	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGINT, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGCHLD, strerror(errno));
+	}
+
+	/* SIGPIPE will be ignored	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = siglogandcontinue;
+	act.sa_flags=0;
+	if (sigaction (SIGPIPE, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGCHLD, strerror(errno));
+	}
+
+	/* SIGALRM will be ignored	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = siglogandcontinue;
+	act.sa_flags=0;
+	if (sigaction (SIGALRM, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGALRM, strerror(errno));
+	}
+
+//	/* SIGIO will be handled	*/
+//	sigemptyset (&act.sa_mask);
+//	act.sa_handler = sighandleIO;
+//	act.sa_flags=SA_SIGINFO;
+//	if (sigaction (SIGIO, &act, 0) == -1) {
+//		fprintf (stderr,
+//			"%s: Sigaction FAIL sig=%d, act=sighandleIO, %s\n",
+//			fname, SIGIO, strerror(errno));
+//	}
+
+	return;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	addFileToList
+ *
+ * Format
+ *	int addFileToList (FILE_LIST *flist, char *fname, time_t ftime, off_t fsize)
+ *
+ * Arguments
+ *	FILE_LIST	*flist
+ *	Pointer to FILE_LIST structure that will hold information about matching files.
+ *
+ *	char		*fname
+ *	Name of file to insert
+ *
+ *	time_t		ftime
+ *	File last modification time
+ *
+ *	off_t		fsize
+ *	Size of file in bytes
+ *
+ * Description
+ * 	Adds a new FILE_NODE to the flist FILE_LIST.
+ *
+ * Return Values
+ *	0	Success
+ *	1	Failure
+ *
+ * -------------------------------------------------------------------------- */
+
+int addFileToList (FILE_LIST *flist, char *fname, time_t ftime, off_t fsize) {
+
+	logMsg (eLog, V_DEBUG, S_DEBUG,
+		"(%s) Adding %s as item #%d in file list",
+		__FUNCTION__, fname, flist->count);
+
+	if (flist->count == 0) {
+		if ((flist->fileNodes = malloc (sizeof (FILE_NODE))) == NULL) {
+			logMsg (eLog, V_ERROR, S_ERROR,
+				"(%s) - could not malloc memory for file node list",
+				__FUNCTION__);
+			return 1;
+		}
+	} else {
+		if ((flist->fileNodes = realloc ((void *) flist->fileNodes, sizeof (FILE_NODE) * (flist->count + 1))) == NULL) {
+			logMsg (eLog, V_ERROR, S_ERROR,
+				"(%s) - could not realloc memory for file node list",
+				__FUNCTION__);
+			return 1;
+		}
+	}
+
+	if ((flist->fileNodes[flist->count].fptr = strdup (fname)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - could not malloc memory for file name",
+				__FUNCTION__);
+		return 1;
+	}
+
+	flist->fileNodes[flist->count].mtime = ftime;
+	flist->fileNodes[flist->count].fsize = fsize;
+	flist->count++;
+
+	return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	readAcqPipe
+ *
+ * Format
+ *	int readAcqPipe (int pipefd, FILE_LIST *fileList)
+ *
+ * Arguments
+ *	int		pipefd
+ *	File descriptor for already-open pipe
+ *
+ *	FILE_LIST	*fileList
+ *	If successful, will contain a FILE_LIST element for a single file.
+ *
+ * Description
+ *	Read a PIPE_PROD_NAME_HDR structure from the pipe.
+ *
+ * Return Values
+ *	0	success
+ *	1	failure
+ *
+ * -------------------------------------------------------------------------- */
+
+#define RETRIES		3
+
+int readAcqPipe (int pipefd, FILE_LIST *fileList) {
+	int				rtn_value;	/* return value from read */
+	int				request_size;
+	struct pipe_prod_name_hdr	prod_entry;
+	char				*p_readbuff;	/* ptr to read buffer */
+	struct stat			stat_buf;
+	int				err;
+
+	request_size = sizeof(PIPE_PROD_NAME_HDR);
+	p_readbuff = (char *) &prod_entry;
+
+	if ((rtn_value = read (pipefd, p_readbuff, request_size)) < 0) {
+		err = errno;
+		switch (err) {
+			case EINTR:
+				/* Interrupt received. As long as the process isn't exiting,
+				 * this function will be called again immediately.
+				 */
+				break;
+
+			case EBADF:
+				logMsg(eLog, V_ERROR, S_ERROR,
+					"%s ERROR bad file descriptor %d",
+					__FUNCTION__, pipefd);
+
+				break;
+
+			default:
+				break;
+		}
+
+		return 1;
+	}
+
+	if (rtn_value == 0) {
+		/* Assume this means pipe writer (acqserver) has exited.  When this happens,
+		 * the read does not block.  Just sleep to keep this process from free running */
+		sleep(1);
+		return 1;
+	}
+
+	if (rtn_value != request_size) {
+		logMsg(eLog, V_ERROR, S_ERROR,
+			"(%s) %d vs %d bytes fd=%d %s retry_cnt=%d\n",
+			__FUNCTION__, rtn_value, request_size, pipefd,
+			InputSource);
+		return 1;
+	}
+
+	if (rtn_value == request_size) { /* Read an entire product */
+		logMsg(eLog, V_DEBUG, S_DEBUG,
+			"(%s) Read entry for %s",
+			__FUNCTION__, prod_entry.pipe_prod_filename);
+
+		if (stat(prod_entry.pipe_prod_filename, &stat_buf) < 0) {
+			/* Perhaps we should remove the file ??? */
+			logMsg(eLog, V_ERROR, S_WARNING,
+				"(%s) - FAIL stat file <%s> errno=%d %s",
+				__FUNCTION__, prod_entry.pipe_prod_filename, errno, strerror(errno));
+			return 1;
+		}
+
+		if (addFileToList (fileList, prod_entry.pipe_prod_filename,
+				stat_buf.st_mtime, stat_buf.st_size) != 0) {
+			logMsg(eLog, V_ERROR, S_ERROR,
+					"(%s) Could not add %s to file list",
+					__FUNCTION__,
+					prod_entry.pipe_prod_filename);
+			return 1;
+		}
+	}
+
+	return 0;
+
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	findFilesLike
+ *
+ * Format
+ *	int findFilesLike (char *dir, char *file_spec, FILE_LIST *flist)
+ *
+ * Arguments
+ *	char		*dir
+ *	Absolute directory path to scan.
+ *
+ *	char		*file_spec
+ *	File specification to look for in dir.
+ *
+ *	FILE_LIST	*flist
+ *	Pointer to structure containing array of files found in dir that match
+ *	file_spec.
+ *
+ * Description
+ *	Uses the glob system call to search for files in dir.  Matching files
+ *	are returned in a dynamically allocated array described by flist.  If
+ *	file aging is enabled and not set to 0, files older than the provided
+ *	age are 'aged-out' and discarded.
+ *
+ * Return Values
+ *	-1	Error
+ *	0	Success, all files in the directory were put into flist
+ *	1	Success, but there were more files in the directory to process
+ *
+ * -------------------------------------------------------------------------- */
+
+int findFilesLike (char *dir, char *file_spec, FILE_LIST *flist) {
+
+	glob_t			gbuf;
+	int			count		= 0;
+	char			*fp;
+	char			cdir[MAX_PATH_LEN+1];
+	struct stat		stat_buf;
+	int			maxProdsToQ;
+	int			retval		= 0;
+	int			globstat;
+
+	if (getcwd (cdir, MAX_PATH_LEN) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - could not get current directory errno=%d errstring=%s",
+			__FUNCTION__, errno, strerror (errno));
+		return -1;
+	}
+
+	if (changeDirectory (dir, TRUE) != 0) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - could not change directory to %s", __FUNCTION__, dir);
+		return -1;
+	}
+
+	flist->count = 0;
+
+	switch (globstat = glob (file_spec, GLOB_NOSORT, NULL, &gbuf)) {
+		case 0:
+			logMsg (eLog, V_DEBUG, S_DEBUG,
+				"(%s) - found %d files matching \"%s\"",
+				__FUNCTION__, gbuf.gl_pathc, file_spec);
+
+			maxProdsToQ = (MaxQueueSize == 0) ? gbuf.gl_pathc : MIN (gbuf.gl_pathc, MaxQueueSize);
+
+			for (count = 0; count < maxProdsToQ; count++) {
+
+				fp = gbuf.gl_pathv[count];
+
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - found file fptr = %s, count = %d",
+					__FUNCTION__, fp, count);
+
+				if (stat (fp, &stat_buf) < 0) {
+					/* Perhaps we should remove the file ??? */
+					logMsg (eLog, V_ERROR, S_WARNING,
+						"(%s) - FAIL stat file <%s> errno=%d %s",
+						__FUNCTION__, fp, errno, strerror(errno));
+					continue;
+				}
+
+				if (!(stat_buf.st_mode & (S_IFREG | S_IFLNK))) {
+					/** not a regular file or link, skip it */
+					logMsg (eLog, V_INFO, S_STATUS,
+						"(%s) - skipping matching file %s with mode = %d",
+						__FUNCTION__, fp, (int) stat_buf.st_mode);
+					continue;
+				}
+
+				if (stat_buf.st_size < MIN_PROD_SIZE_READ) {
+					/** small size and just created/modified, skip it (this time) */
+					continue;
+				}
+
+				if (!(stat_buf.st_mode & (S_IRUSR | S_IRGRP | S_IROTH))) {
+					/* No one has read permission, skip it */
+					/* May want to use access() to check if can read file */
+					/* open will fail later anyway */
+					continue;
+				}
+
+				if (Verbosity >= V_DEBUG) {
+					char	*cptr = ctime (&stat_buf.st_mtime);
+
+					cptr[strlen (cptr)-1] = '\0'; /* Get rid of the \n terminator ctime adds */
+
+					logMsg (eLog, V_DEBUG, S_DEBUG,
+						"(%s) - #%d %s%s%s%s%s%s%s%s%s    %s    %s",
+						__FUNCTION__, flist->count,
+						(stat_buf.st_mode & S_IRUSR)?"r":"-",
+						(stat_buf.st_mode & S_IWUSR)?"w":"-",
+						(stat_buf.st_mode & S_IXUSR)?"x":"-",
+						(stat_buf.st_mode & S_IRGRP)?"r":"-",
+						(stat_buf.st_mode & S_IWGRP)?"w":"-",
+						(stat_buf.st_mode & S_IXGRP)?"x":"-",
+						(stat_buf.st_mode & S_IROTH)?"r":"-",
+						(stat_buf.st_mode & S_IWOTH)?"w":"-",
+						(stat_buf.st_mode & S_IXOTH)?"x":"-",
+						cptr, fp);
+				}
+
+				if (addFileToList (flist, fp, stat_buf.st_mtime, stat_buf.st_size) != 0) {
+					return -1;
+				}
+			}
+
+			logMsg (eLog, V_DEBUG, S_DEBUG,
+				"(%s) - queued %d out of %d products, MaxQueueSize = %d",
+				__FUNCTION__, count, gbuf.gl_pathc, MaxQueueSize);
+
+			retval = (count < gbuf.gl_pathc) ? 1 : 0;	/* if count < gbuf.gl_pathc, then all files
+									   in the directory were queued */
+			break;
+
+		case GLOB_NOMATCH:
+			logMsg (eLog, V_DEBUG, S_DEBUG,
+				"(%s) - glob returned no matches found for %s in %s",
+				__FUNCTION__, file_spec, dir);
+			retval = 0;
+			break;
+
+		default:
+			logMsg (eLog, V_ERROR, S_ERROR,
+				"(%s) - glob returned unexpected value %d",
+				__FUNCTION__, globstat);
+			retval = -1;
+			break;
+	}
+
+	changeDirectory (cdir, FALSE);
+
+	globfree (&gbuf);
+	return (retval);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logFileList
+ *
+ * Format
+ *	void logFileList (FILE_LIST *fl)
+ *
+ * Arguments
+ *	FILE_LIST	*fl
+ *	Pointer to FILE_LIST
+ *
+ * Description
+ *	Debugging function for writing a FILE_LIST to the error log.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+void logFileList (FILE_LIST *fl) {
+
+	int	i;
+
+	if ((fl == NULL) || (fl->fileNodes == NULL)) {
+		return;
+	}
+
+	if (fl->count == 0) {
+		logMsg (eLog, V_DEBUG, S_DEBUG, "No Files Found");
+	} else {
+		logMsg (eLog, V_DEBUG, S_DEBUG, "Files Found:");
+		for (i = 0; i < fl->count; i++) {
+			char	*cptr = ctime (&fl->fileNodes[i].mtime);
+
+			cptr[strlen(cptr)-1] = '\0';	/* Get rid of the \n terminator ctime adds */
+			logMsg (eLog, V_DEBUG, S_DEBUG,
+				"(%s) - f(%s), Mod Time: %s, Size: %d",
+				__FUNCTION__, fl->fileNodes[i].fptr, cptr, fl->fileNodes[i].fsize);
+		}
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	freeFileList
+ *
+ * Format
+ *	void freeFileList (FILE_LIST *fl)
+ *
+ * Arguments
+ *	FILE_LIST	*fl
+ *	Pointer to FILE_LIST
+ *
+ * Description
+ *	This function will free all memory in a FILE_LIST.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+void freeFileList (FILE_LIST *fl) {
+
+	int	i;
+
+	if (fl == NULL) {
+		return;
+	}
+
+	for (i = 0; i < fl->count; i++) {
+		logMsg (eLog, V_DEBUG, S_DEBUG,
+			"(%s) - Freeing file node: %s",
+			__FUNCTION__, fl->fileNodes[i].fptr);
+		free ((void *) fl->fileNodes[i].fptr);
+	}
+
+	if (fl->count > 0) {
+		free ((void *) fl->fileNodes);
+	}
+
+	fl->count = 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	compareFileNodeTimes
+ *
+ * Format
+ *	int compareFileNodeTimes (const void *fv1, const void *fv2)
+ *
+ * Arguments
+ *	void	*fv1
+ *	Pointer to a FILE_NODE
+ *
+ *	void	*fv2
+ *	Pointer to another FILE_NODE
+ *
+ * Description
+ *	'compar' function used by qsort to sort an array of FILE_NODEs
+ *
+ * Return Values
+ *	-1	fv1 < fv2
+ *	0	fv1 == fv2
+ *	1	fv1 > fv2
+ *
+ * -------------------------------------------------------------------------- */
+
+int compareFileNodeTimes (const void *fv1, const void *fv2) {
+
+	if ((((FILE_NODE *) fv1)->mtime) < (((FILE_NODE *) fv2)->mtime)) {
+		return -1;
+	} else if ((((FILE_NODE *) fv1)->mtime) > (((FILE_NODE *) fv2)->mtime)) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	getWmoOffset
+ *
+ * Format
+ * 	int getWmoOffset (char *buf, size_t buflen, size_t *p_wmolen)
+ *
+ * Arguments
+ * 	Type			Name		I/O		Description
+ * 	char *			buf		I		buffer to parse for WMO
+ * 	size_t			buflen		I		length of data in buffer
+ * 	size_t *		p_wmolen	O		length of wmo header
+ *
+ * Description
+ * 	Parse the wmo heading from buffer and load the appropriate prod
+ * 	info fields.  The following regular expressions will satisfy this
+ * 	parser.  Note this parser is not case sensative.
+ * 	The WMO format is supposed to be...
+ * 		TTAAii CCCC DDHHMM[ BBB]\r\r\n
+ * 		[NNNXXX\r\r\n]
+ *
+ * 	This parser is generous with the ii portion of the WMO and all spaces
+ * 	are optional.  The TTAAII, CCCC, and DDHHMM portions of the WMO are
+ * 	required followed by at least 1 <cr> or <lf> with no other unparsed
+ * 	intervening characters. The following quasi-grammar describe what
+ * 	is matched.
+ *
+ * 	WMO = "TTAAII CCCC DDHHMM [BBB] CRCRLF [NNNXXX CRCRLF]"
+ *
+ * 	TTAAII = "[A-Z]{4}[0-9]{0,1,2}" | "[A-Z]{4} [0-9]" | "[A-Z]{3}[0-9]{3} "
+ * 	CCCC = "[A-Z]{4}"
+ * 	DDHHMM = "[ 0-9][0-9]{3,5}"
+ * 	BBB = "[A-Z0-9]{0-3}"
+ * 	CRCRLF = "[\r\n]+"
+ * 	NNNXXX = "[A-Z0-9]{0,4-6}"
+ *
+ * 	Most of the WMO's that fail to be parsed seem to be missing the ii
+ * 	altogether or missing part or all of the timestamp (DDHHMM)
+ *
+ * Returns
+ * 	offset to WMO from buf[0]
+ * 	-1: otherwise
+ *
+ * -------------------------------------------------------------------------- */
+
+#define WMO_TTAAII_LEN		6
+#define WMO_CCCC_LEN		4
+#define WMO_DDHHMM_LEN		6
+#define WMO_DDHH_LEN		4
+#define WMO_BBB_LEN			3
+
+#define WMO_T1	0
+#define WMO_T2	1
+#define WMO_A1	2
+#define WMO_A2	3
+#define WMO_I1	4
+#define WMO_I2	5
+
+int getWmoOffset(char *buf, size_t buflen, size_t *p_wmolen) {
+	char *p_wmo;
+	int i_bbb;
+	int spaces;
+	int	ttaaii_found = 0;
+	int	ddhhmm_found = 0;
+	int	crcrlf_found = 0;
+	int	bbb_found = 0;
+	int wmo_offset = -1;
+
+	*p_wmolen = 0;
+
+	for (p_wmo = buf; p_wmo + WMO_I2 + 1 < buf + buflen; p_wmo++) {
+		if (isalpha(p_wmo[WMO_T1]) && isalpha(p_wmo[WMO_T2])
+				&& isalpha(p_wmo[WMO_A1]) && isalpha(p_wmo[WMO_A2])) {
+			/* 'TTAAII ' */
+			if (isdigit(p_wmo[WMO_I1]) && isdigit(p_wmo[WMO_I2])
+					&& (isspace(p_wmo[WMO_I2+1]) || isalpha(p_wmo[WMO_I2+1]))) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I2 + 1;
+				break;
+			/* 'TTAAI C' */
+			} else if (isdigit(p_wmo[WMO_I1]) && isspace(p_wmo[WMO_I2])
+					&& (isspace(p_wmo[WMO_I2+1]) || isalpha(p_wmo[WMO_I2+1]))) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I1 + 1;
+				break;
+			/* 'TTAA I ' */
+			} else if (isspace(p_wmo[WMO_I1]) && isdigit(p_wmo[WMO_I2])
+					&& (isspace(p_wmo[WMO_I2+1]) || isalpha(p_wmo[WMO_I2+1]))) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I2 + 1;
+				break;
+			/* 'TTAAIC' */
+			} else if (isdigit(p_wmo[WMO_I1]) && isalpha(p_wmo[WMO_I2])) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I1 + 1;
+				break;
+			}
+		} else if (isalpha(p_wmo[WMO_T1]) && isalpha(p_wmo[WMO_T2])
+				&& isalpha(p_wmo[WMO_A1]) && isdigit(p_wmo[WMO_A2])) {
+			/* 'TTA#II ' */
+			if (isdigit(p_wmo[WMO_I1]) && isdigit(p_wmo[WMO_I2])
+					&& (isspace(p_wmo[WMO_I2+1]) || isalpha(p_wmo[WMO_I2+1]))) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I2 + 1;
+				break;
+			}
+		} else if (!strncmp(p_wmo, "\r\r\n", 3)) {
+			/* got to EOH with no TTAAII found, check TTAA case below */
+			break;
+		}
+	}
+
+	if (!ttaaii_found) {
+		/* look for TTAA CCCC DDHHMM */
+		for (p_wmo = buf; p_wmo + 9 < buf + buflen; p_wmo++) {
+			if (isalpha(p_wmo[WMO_T1]) && isalpha(p_wmo[WMO_T2])
+					&& isalpha(p_wmo[WMO_A1]) && isalpha(p_wmo[WMO_A2])
+					&& isspace(p_wmo[WMO_A2+1]) && isalpha(p_wmo[WMO_A2+2])
+					&& isalpha(p_wmo[WMO_A2+3]) && isalpha(p_wmo[WMO_A2+4])
+					&& isalpha(p_wmo[WMO_A2+5]) && isspace(p_wmo[WMO_A2+6])) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_A2 + 1;
+				break;
+			} else if (!strncmp(p_wmo, "\r\r\n", 3)) {
+				/* got to EOH with no TTAA found, give up */
+				return -1;
+			}
+		}
+	}
+
+	/* skip spaces if present */
+	while (isspace(*p_wmo) && p_wmo < buf + buflen) {
+		p_wmo++;
+	}
+
+	if (p_wmo + WMO_CCCC_LEN > buf + buflen) {
+		return -1;
+	} else if (isalpha(*p_wmo) && isalnum(*(p_wmo+1))
+			&& isalpha(*(p_wmo+2)) && isalnum(*(p_wmo+3))) {
+		p_wmo += WMO_CCCC_LEN;
+	} else {
+		return -1;
+	}
+
+	/* skip spaces if present */
+	spaces = 0;
+	while (isspace(*p_wmo) && p_wmo < buf + buflen) {
+		p_wmo++;
+		spaces++;
+	}
+
+	/* case1: check for 6 digit date-time group */
+	if (p_wmo + 6 <= buf + buflen) {
+		if (isdigit(*p_wmo) && isdigit(*(p_wmo+1))
+				&& isdigit(*(p_wmo+2)) && isdigit(*(p_wmo+3))
+				&& isdigit(*(p_wmo+4)) && isdigit(*(p_wmo+5))) {
+			ddhhmm_found = 1;
+			p_wmo += 6;
+		}
+	}
+
+	/* case2: check for 4 digit date-time group */
+	if (!ddhhmm_found && p_wmo + 5 <= buf + buflen) {
+		if (isdigit(*p_wmo) && isdigit(*(p_wmo+1))
+				&& isdigit(*(p_wmo+2)) && isdigit(*(p_wmo+3))
+				&& isspace(*(p_wmo+4))) {
+			ddhhmm_found = 1;
+			p_wmo += 4;
+		}
+	}
+
+	/* case3: check for leading 0 in date-time group being a space */
+	if (!ddhhmm_found && p_wmo + 5 <= buf + buflen) {
+		if (spaces > 1 && isdigit(*p_wmo) && isdigit(*(p_wmo+1))
+				&& isdigit(*(p_wmo+2)) && isdigit(*(p_wmo+3))
+				&& isdigit(*(p_wmo+4))) {
+			ddhhmm_found = 1;
+			p_wmo += 5;
+		} else {
+			return -1;
+		}
+	}
+
+	/* skip potential trailing 'Z' on dddhhmm */
+	if (*p_wmo == 'Z') {
+		p_wmo++;
+	}
+
+	/* Everything past this point is gravy, we'll return the current
+	   length if we don't get the expected [bbb] crcrlf
+ 	 */
+
+	/* check if we have a <cr> and/or <lf>, parse bbb if present */
+	while (p_wmo < buf + buflen) {
+		if ((*p_wmo == '\r') || (*p_wmo == '\n')) {
+			crcrlf_found++;
+			p_wmo++;
+			if (crcrlf_found == 3) {
+				/* assume this is our complete cr-cr-lf */
+				break;
+			}
+		} else if (crcrlf_found) {
+			/* pre-mature end of crcrlf */
+			p_wmo--;
+			break;
+		} else if (isalpha(*p_wmo)) {
+			if (bbb_found) {
+				/* already have a bbb, give up here */
+				return wmo_offset;
+			}
+			for (i_bbb = 1;
+					p_wmo + i_bbb < buf + buflen && i_bbb < WMO_BBB_LEN;
+						i_bbb++) {
+				if (!isalpha(p_wmo[i_bbb])) {
+					break; /* out of bbb parse loop */
+				}
+			}
+			if (p_wmo + i_bbb < buf + buflen && isspace(p_wmo[i_bbb])) {
+				bbb_found = 1;
+				p_wmo += i_bbb;
+			} else {
+				/* bbb is too long or maybe not a bbb at all, give up */
+				return wmo_offset;
+			}
+		} else if (isspace(*p_wmo)) {
+			p_wmo++;
+		} else {
+			/* give up */
+			return wmo_offset;
+		}
+	}
+
+	/* update length to include bbb and crcrlf */
+	*p_wmolen = p_wmo - buf - wmo_offset;
+
+	return wmo_offset;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	getWmoFromFile
+ *
+ * Format
+ *	int getWmoFromFile (char *fname, char *wmo)
+ *
+ * Arguments
+ *	char	*fname
+ *	String containing file name.
+ *
+ *	void	*wmo
+ *	Pointer to string that will contain wmo header, if found.
+ *
+ * Description
+ *	Find and return the WMO header from a product file.
+ *
+ * Return Values
+ *	0	success
+ *	1	failure
+ *
+ * -------------------------------------------------------------------------- */
+#define MAX_PRODID_LEN		32
+#define SIZE_WMO		18
+
+int getWmoFromFile (char *fname, char *wmo) {
+
+	int	wmo_offset;
+	size_t	wmo_len;
+	FILE	*fp;
+	size_t	bufsize;
+	char	buf[DEF_STR_LEN+1];
+
+	if ((fp = fopen (fname, "r")) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Could not open product file %s",
+			__FUNCTION__, fname);
+		return 1;
+	}
+
+	if ((bufsize = fread (buf, 1, DEF_STR_LEN, fp)) > 0) {
+		if ((wmo_offset = getWmoOffset (buf, bufsize, &wmo_len)) >= 0) {
+			memset (wmo, '\0', SIZE_WMO+1);
+			strncpy (wmo, buf+wmo_offset, MIN (wmo_len, SIZE_WMO));
+			wmo[MIN (wmo_len, SIZE_WMO)] = '\0';
+			fclose (fp);
+			return 0;
+		}
+	}
+
+	fclose (fp);
+	return 1;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	makeAgeStr
+ *
+ * Format
+ *	void makeAgeStr (time_t mtime, char *buf)
+ *
+ * Arguments
+ *	time_t	mtime
+ *	Absolute time value.
+ *
+ *	char	*buf
+ *	Pointer to string that will contain an age string for logging purposes.
+ *
+ * Description
+ *	Create a message age string for logging
+ *
+ * Return Values
+ * 	nothing
+ *
+ * -------------------------------------------------------------------------- */
+
+void makeAgeStr (time_t mtime, char *buf) {
+
+	int age = (int) (time (NULL) - mtime);
+
+	if (age > 0) {
+		sprintf (buf, " +%ds", age);
+	} else {
+		buf[0] = '\0';
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	getWmoId
+ *
+ * Format
+ *	int getWmoId (char *fname, char *wmo)
+ *
+ * Arguments
+ *	char	*fname
+ *	String containing file name.
+ *
+ *	char	*wmo
+ *	Pointer to string that will contain wmo header, if found.
+ *
+ * Description
+ *	Find and return the WMO header from a product file based on the type of
+ *	product (NDE or GOESR) being processed.  For GOESR products, the WMO header
+ *	will be constructed based on the file name.
+ *
+ * Return Values
+ *	0	success
+ *	1	failure
+ *
+ * -------------------------------------------------------------------------- */
+
+int getWmoId (FILE_NODE *fnode, char *wmo) {
+
+	int	rstat	= 0;
+	char	tmpbuf[40];
+	char	fullName[MAX_FILENAME_LEN+1];
+
+	makeAgeStr (fnode->mtime, tmpbuf);
+
+	switch (InType) {
+		case IN_GOESR:
+			/* Try to build a WMO header from the file name */
+			if (goesrCmiFile2Wmo (fnode->fptr, wmo)) {
+				logMsg (pLog, V_ALWAYS, S_STATUS,
+					"END/ERROR_DISCARD WMO[] #%d bytes(%d) f(%s) Invalid file name%s",
+					-1, fnode->fsize, fnode->fptr, tmpbuf);
+				logMsg (eLog, V_ERROR, S_WARNING,
+					"(%s) - Invalid file name %s found",
+					__FUNCTION__, fnode->fptr);
+				rstat = 1;
+			}
+			break;
+
+		case IN_ACQ_PIPE:
+			/* Full file name was read from pipe */
+			if (getWmoFromFile (fnode->fptr, wmo)) {
+				logMsg (pLog, V_ALWAYS, S_STATUS,
+					"END/ERROR_DISCARD WMO[] #%d bytes(%d) f(%s) WMO header not found%s",
+					-1, fnode->fsize, fnode->fptr, tmpbuf);
+				logMsg (eLog, V_ERROR, S_WARNING,
+					"(%s) - Could not find WMO header in %s",
+					__FUNCTION__, fnode->fptr);
+				rstat = 1;
+			}
+			break;
+
+		case IN_NDE:
+		case IN_PDA:
+		case IN_POLL:
+			/* Must create full file name */
+			sprintf (fullName, "%s/%s", InputSource, fnode->fptr);
+			if (getWmoFromFile (fullName, wmo)) {
+				logMsg (pLog, V_ALWAYS, S_STATUS,
+					"END/ERROR_DISCARD WMO[] #%d bytes(%d) f(%s) WMO header not found%s",
+					-1, fnode->fsize, fnode->fptr, tmpbuf);
+				logMsg (eLog, V_ERROR, S_WARNING,
+					"(%s) - Could not find WMO header in %s",
+					__FUNCTION__, fnode->fptr);
+				rstat = 1;
+			}
+			break;
+
+		default:
+			logMsg (eLog, V_ERROR, S_ERROR,
+				"(%s) - Unknown InType %d - discarding file %s",
+				__FUNCTION__, InType, fnode->fptr);
+			rstat = 1;
+			break;
+	}
+
+	return rstat;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	processProducts
+ *
+ * Format
+ *	int processProducts (FILE_LIST *fileList)
+ *
+ * Arguments
+ *	FILE_LIST	*fileList
+ *	Pointer to FILE_LIST structure containing list of files to process.
+ *
+ * Description
+ *	Generates a WMO header for each product file from its file name and
+ *	outputs it as determined by the -o option specified on the command line.
+ *	Products are discarded, saved to disk, or written to an LDM product
+ *	queue.
+ *
+ * Return Values
+ *	Number of files processed.
+ *
+ * -------------------------------------------------------------------------- */
+
+int processProducts (FILE_LIST *fileList) {
+
+        int             i;
+	int		rstat;
+	FILE_NODE	*flist = fileList->fileNodes;
+	char		wmo_id[MAX_PRODID_LEN+1];
+	int		processed;
+	char		tmpbuf[40];
+	int		prodSize;
+	char		*p;
+	int		fd;
+	int		age;
+	ssize_t		readSize;
+	ssize_t		writeSize;
+	size_t		finalSize;
+	char		hashFileName[MAX_FILENAME_LEN+1];
+	char		*pFileName;
+	off_t		pFileSize;
+	time_t		pFileTime;
+	char		prodFullName[MAX_FILENAME_LEN+1];
+	char		outFilePath[MAX_FILENAME_LEN+1];
+	struct stat	stat_buf;
+
+#ifdef LDM_SUPPORT
+	product		ldmProd;
+#endif
+
+	for (i = 0, processed = 0; i < fileList->count; i++) {
+		pFileName = flist[i].fptr;
+		pFileSize = flist[i].fsize;
+		pFileTime = flist[i].mtime;
+		age = (int) (time (NULL) - pFileTime);
+
+		logMsg (eLog, V_DEBUG, S_DEBUG,
+			"(%s) - processing file %s (%d)",
+			__FUNCTION__, pFileName, pFileSize);
+
+		switch (InType) {
+			case IN_NDE:
+			case IN_PDA:	/* File names will be for checksum files here, not product files */
+				sprintf (hashFileName, "%s/%s", InputSource, pFileName);
+				/* Check age and discard hash file if older than maximum allowable ingest age */
+				if (DiscardAge && (age > DiscardAge)) {
+					if (unlink (hashFileName)) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - could not delete %s errno = %d errstr = %s",
+							__FUNCTION__, pFileName, errno, strerror (errno));
+					} else {
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/AGE_DISCARD WMO[%s] #%d bytes(%d) f(%s) +%ds",
+							wmo_id, -1, pFileSize, pFileName, age);
+
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) - file %s deleted (age %d > discard age %d)",
+							__FUNCTION__, pFileName, age, DiscardAge);
+					}
+				}
+
+				strncpy (prodFullName, hashFileName, MAX_FILENAME_LEN);	/* Copy hash file name */
+				removeExtension (prodFullName);		/* Now remove the extension to get the product file name */
+				removeExtension (pFileName);		/* Remove hash extension from globbed file name */
+				if (stat (prodFullName, &stat_buf) < 0) {
+					logMsg (eLog, V_ERROR, S_ERROR,
+						"Product file %s not found",
+						prodFullName);
+					if (unlink (hashFileName)) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - could not delete %s errno = %d errstr = %s",
+							__FUNCTION__, hashFileName, errno, strerror (errno));
+					} else {
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) - file %s not found, matching hash file deleted",
+							__FUNCTION__, pFileName);
+					}
+
+					continue;
+				} else {
+					pFileTime = stat_buf.st_mtime;
+					pFileSize = stat_buf.st_size;
+					age = (int) (time (NULL) - pFileTime);
+				}
+
+				if (DiscardAge && (age > DiscardAge)) {
+					if (unlink (prodFullName)) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - could not delete %s errno = %d errstr = %s",
+							__FUNCTION__, pFileName, errno, strerror (errno));
+					} else {
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/AGE_DISCARD WMO[%s] #%d bytes(%d) f(%s) +%ds",
+							wmo_id, -1, pFileSize, pFileName, age);
+
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) - file %s deleted (age %d > discard age %d)",
+							__FUNCTION__, pFileName, age, DiscardAge);
+					}
+
+					continue;
+				}
+
+				if (CreateChecksum) {
+					FILE	*hashFile;
+					FILE	*hashPipe;
+					char	hashCode[MAX_HASH_LEN+1];
+					char	fileHashCode[MAX_HASH_LEN+1];
+					char	fName[MAX_PATH_LEN+1];
+					char	command[MAX_PATH_LEN+1];
+
+					if ((hashFile = fopen (hashFileName, "r")) == NULL) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Error %d while opening hash file %s",
+							__FUNCTION__, errno, hashFileName);
+					} else {
+						/* Read the hash code and file name from the file */
+						if (fscanf (hashFile, "%s %s", hashCode, fName) == EOF) {
+							logMsg (eLog, V_ERROR, S_ERROR,
+								"(%s) - Error %d calling fscanf for hash code in %s",
+								__FUNCTION__, errno, hashFileName);
+						} else {
+
+							sprintf (command, "%s %s", HashProgram, prodFullName);
+							hashPipe = popen (command, "r");
+							if (fscanf (hashPipe, "%s %s", fileHashCode, fName) == EOF) {
+								logMsg (eLog, V_ERROR, S_ERROR,
+									"(%s) - Error %d calling fscanf while reading pipe",
+									__FUNCTION__, errno);
+							} else {
+								if (strcmp (hashCode, fileHashCode) == 0) {
+									logMsg (pLog, V_DEBUG, S_STATUS,
+										"INFO Hash code OK %s",
+										pFileName);
+								} else {
+									logMsg (pLog, V_ERROR, S_ERROR,
+										"INFO Hash code FAIL %s",
+										pFileName);
+								}
+							}
+							pclose (hashPipe);
+						}
+
+						fclose (hashFile);
+					}
+				}
+
+				/* Delete the hash code file */
+				if (unlink (hashFileName)) {
+					logMsg (eLog, V_ERROR, S_ERROR,
+						"(%s) - could not delete %s errno = %d errstr = %s",
+						__FUNCTION__, hashFileName, errno, strerror (errno));
+				}
+
+				break;
+
+			case IN_ACQ_PIPE:
+				strncpy (prodFullName, flist[i].fptr, MAX_FILENAME_LEN);
+				break;
+
+			case IN_GOESR:	/* Files will be product files */
+			case IN_POLL:
+			default:
+				sprintf (prodFullName, "%s/%s", InputSource, pFileName);
+
+				if (CreateChecksum) {	/* This is only valid for InType==GOESR */
+					/* Can't verify hashcode for GOES-R products since the file containing them (PAR file)
+					 * won't exist yet.  Create a file containing the hash code that must be processed later
+					 * by an external program.
+					 */
+					char	command[MAX_PATH_LEN+1];
+
+					sprintf (hashFileName, "%s/%s", ParDir, pFileName);
+					sprintf (command, "%s %s > %s.hash", HashProgram, prodFullName, hashFileName);
+					system (command);
+				}
+
+				/* Check age and Discard if older than maximum allowable ingest age - do this after so
+				 * the verification with the PAR can still occur */
+				if (DiscardAge && (age > DiscardAge)) {
+					if (unlink (prodFullName)) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - could not delete %s errno = %d errstr = %s",
+							__FUNCTION__, pFileName, errno, strerror (errno));
+					} else {
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/AGE_DISCARD WMO[%s] #%d bytes(%d) f(%s) +%ds",
+								wmo_id, -1, pFileSize, pFileName, age);
+
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) - file %s deleted (age %d > discard age %d)",
+							__FUNCTION__, pFileName, age, DiscardAge);
+					}
+
+					continue;
+				}
+				break;
+		}
+
+		if (getWmoId (&flist[i], wmo_id)) {
+			if (unlink (prodFullName)) {
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - Could not delete %s errno = %d errstr = %s",
+					__FUNCTION__, pFileName, errno, strerror (errno));
+			} else {
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - Failed file %s deleted",
+					__FUNCTION__, prodFullName);
+
+				if (SaveFails) {
+					/* Create empty file of same name in fail directory */
+					sprintf (outFilePath, "%s/%s", FailDir, pFileName);
+					if ((fd = open (outFilePath, (O_WRONLY | O_CREAT), (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH))) == -1) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Error (%d) \"%s\" while creating %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+					} else if (close (fd)) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Error (%d) \"%s\" while closing %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+					} else {
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) - Empty file %s created",
+							__FUNCTION__, outFilePath);
+					}
+				}
+			}
+
+			continue;
+		}
+
+		prodSize = pFileSize;
+#ifdef LDM_SUPPORT
+		if ((OutAction == OUT_LDM) || (((OutAction == OUT_FILE) && AddWmoHeader) || SaveFiles)) {
+#else
+		if (((OutAction == OUT_FILE) && AddWmoHeader) || SaveFiles) {
+#endif
+			/* No need to open the file if we DISCARDing it, or if we're simply moving it to another directory */
+			if (AddWmoHeader) {
+				prodSize += strlen (wmo_id) + SIZE_WMO_TERM;
+			}
+
+			if (AddLdmWrapper) {
+				prodSize += SIZE_SBN_HDR + SIZE_SBN_TLR;
+			}
+
+			if (ProdBuf == NULL) {
+				if ((ProdBuf = malloc (prodSize)) == NULL) {
+					logMsg (eLog, V_ERROR, S_ERROR,
+						"(%s) - Could not malloc %d bytes for prodBuf",
+						__FUNCTION__, prodSize);
+					return processed;
+				}
+
+				ProdBufSize = prodSize;
+			} else {
+				if (prodSize > ProdBufSize) {
+					if ((ProdBuf = realloc (ProdBuf, prodSize)) == NULL) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Could not realloc %d bytes for prodBuf",
+							__FUNCTION__, prodSize);
+						return processed;
+					}
+
+					ProdBufSize = prodSize;
+				}
+			}
+
+			/* Open the file and read the contents into p */
+			if ((fd = open (prodFullName, O_RDONLY)) == -1) {
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - Error (%d) \"%s\" while opening %s",
+					__FUNCTION__, errno, strerror (errno), prodFullName);
+
+				continue;	/* Maybe it will be accessible next pass? */
+			}
+
+			p = ProdBuf;
+
+			if (AddLdmWrapper) {
+				sprintf(p, SBN_HEADER_TEMPLATE, SbnSeqNo);
+				p = ProdBuf + strlen (ProdBuf);
+			}
+
+			if (AddWmoHeader) {
+				sprintf (p, "%s%s", wmo_id, WMO_TERMINATOR);
+				p = ProdBuf + strlen (ProdBuf);
+			}
+
+			if ((readSize = read (fd, p, pFileSize)) == -1) {
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - Error (%d) \"%s\" while reading %s",
+					__FUNCTION__, errno, strerror (errno), prodFullName);
+
+				close (fd);
+				continue;
+			}
+
+			if (readSize != pFileSize) {
+				logMsg (eLog, V_ERROR, S_WARNING,
+					"(%s) - %s is %d bytes, but only %d bytes read",
+					__FUNCTION__, prodFullName, pFileSize, readSize);
+			}
+
+			if (close (fd) == -1) {
+				logMsg (eLog, V_ERROR, S_WARNING,
+					"(%s) - Error (%d) \"%s\" while closing %s",
+					__FUNCTION__, errno, strerror (errno), prodFullName);
+			} else {
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - Successfully read [%s] %s into memory",
+					__FUNCTION__, wmo_id, pFileName);
+			}
+
+			if (AddLdmWrapper) {
+				memcpy (p+readSize, SBN_TRAILER, SIZE_SBN_TLR);		/* Append the SBN trailer */
+			}
+
+			finalSize = prodSize - pFileSize + readSize;
+		}
+
+		/* If saving the files, then move to save directory */
+		if (SaveFiles) {
+			if ((rstat = moveFile (prodFullName, SentDir, YES)) != 0) {
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - could not move %s to %s",
+					__FUNCTION__, prodFullName, SentDir);
+			} else {
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - moved %s to %s",
+					__FUNCTION__, prodFullName, SentDir);
+			}
+		} else if (((OutAction == OUT_FILE) && AddWmoHeader) ||
+#ifdef LDM_SUPPORT
+			    (OutAction == OUT_LDM) ||
+#endif
+			    (OutAction == OUT_DISCARD)) {
+			/* if action is FILE and a header is being added or action is DISCARD,
+			 * this can be deleted here since a new file will be created below */
+			if ((rstat = unlink (prodFullName)) != 0) {
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - %s could not be unlinked, errno = %d, strerr = %s",
+					__FUNCTION__, prodFullName, errno, strerror (errno));
+			} else {
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - %s deleted successfully",
+					__FUNCTION__, prodFullName);
+			}
+		}
+
+		makeAgeStr (pFileTime, tmpbuf);
+
+                switch (OutAction) {
+#ifdef LDM_SUPPORT
+                        case OUT_LDM:
+                                MD5Init(md5ctxp);
+                                MD5Update (md5ctxp, ProdBuf + SIZE_SBN_HDR, finalSize - SIZE_SBN_HDR);
+                                MD5Final (ldmProd.info.signature, md5ctxp);
+
+                                ldmProd.info.origin     = LocalHostName;
+                                ldmProd.info.feedtype   = FeedType;
+				ldmProd.info.seqno	= SbnSeqNo;
+				ldmProd.data		= ProdBuf;
+				ldmProd.info.sz		= finalSize;
+				ldmProd.info.ident	= wmo_id;
+				gettimeofday (&ldmProd.info.arrival, NULL);
+
+				if ((TotalProductsProcessed % STATUS_FREQUENCY) == 0) {
+					logMsg (pLog, V_ALWAYS, S_STATUS,
+						"STATUS [%s] pid(%d) HOST:%s ldmpq(%s) totprods(%lld) totbytes (%lld) %s(%s)",
+						ProgName, MyPid, LocalHostName, pqfName, TotalProductsProcessed,
+						TotalBytesProcessed, Loc, InputSource);
+				}
+
+				processed++;
+				TotalBytesProcessed += readSize;
+				TotalProductsProcessed++;
+				SbnSeqNo++;
+				SbnSeqNo %= 1000;
+
+				logMsg (eLog, V_DEBUG, S_DEBUG,
+					"(%s) - Before lpqInsert WMO[%s] size(%d)",
+					__FUNCTION__, wmo_id, finalSize);
+
+				switch (rstat = lpqInsert(prodQueue, &ldmProd)) {
+					case STAT_SUCCESS:
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/QUEUED WMO[%s] #%lld bytes(%d) f(%s)%s",
+							wmo_id, TotalProductsProcessed, pFileSize, pFileName, tmpbuf);
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) After lpqInsert - SUCCESS", __FUNCTION__);
+						break;
+
+					case STAT_ALREADY_QUEUED:
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/ALREADY_QUEUED WMO[%s] #%lld bytes(%d) f(%s)%s",
+							wmo_id, TotalProductsProcessed, pFileSize, pFileName, tmpbuf);
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) After lpqInsert - PRODUCT ALREADY QUEUED", __FUNCTION__);
+						break;
+
+					default:
+						logMsg (pLog, V_ALWAYS, S_STATUS,
+							"END/LDM_ERROR(%d) WMO[%s] #%lld bytes(%d) f(%s)%s",
+							rstat, wmo_id, TotalProductsProcessed, pFileSize, pFileName, tmpbuf);
+						logMsg (eLog, V_DEBUG, S_DEBUG,
+							"(%s) After lpqInsert - ERROR(%d)",
+							__FUNCTION__, rstat);
+						break;
+				}
+				break;
+#endif
+
+			case OUT_FILE:
+				sprintf (outFilePath, "%s/%s.%0*d", SaveDir, inOpts[InType-1].str, SentFileDigits, SentSeqNo);
+				if (AddWmoHeader) {
+					if ((fd = open (outFilePath, O_WRONLY | O_CREAT | O_TRUNC, OUTFILE_CREATE_PERMS)) == -1) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Error (%d) \"%s\" while opening out file %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+
+						continue; /* Maybe it will be accessible next pass? */
+					}
+
+					if ((writeSize = write (fd, ProdBuf, finalSize)) == -1) {
+						logMsg (eLog, V_ERROR, S_WARNING,
+							"(%s) - Error (%d) \"%s\" while writing %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+					} else if (writeSize != finalSize) {
+						logMsg (eLog, V_ERROR, S_WARNING,
+							"(%s) - write buffer contains %d bytes, but only %d bytes written",
+							__FUNCTION__, finalSize, writeSize);
+					}
+
+					if (close (fd) == -1) {
+						logMsg (eLog, V_ERROR, S_WARNING,
+							"(%s) - Error (%d) \"%s\" while closing %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+					}
+
+					if (chmod (outFilePath, OUTFILE_FINAL_PERMS) == -1) {
+						logMsg (eLog, V_ERROR, S_ERROR,
+							"(%s) - Error (%d) \"%s\" while calling chmod on %s",
+							__FUNCTION__, errno, strerror (errno), outFilePath);
+					}
+
+                		} else {
+                			if ((rstat = moveFile (prodFullName, outFilePath, YES)) != 0) {
+                				logMsg (eLog, V_ERROR, S_ERROR,
+                					"(%s) - could not move %s to %s",
+                					__FUNCTION__, prodFullName, outFilePath);
+                			} else {
+                				logMsg (eLog, V_DEBUG, S_DEBUG,
+                					"(%s) - moved %s to %s",
+                					__FUNCTION__, prodFullName, outFilePath);
+                			}
+
+                		}
+
+				if ((TotalProductsProcessed % STATUS_FREQUENCY) == 0) {
+					logMsg (pLog, V_ALWAYS, S_STATUS,
+						"STATUS [%s] pid(%d) HOST:%s outdir(%s) totprods(%lld) totbytes (%lld) %s(%s)",
+						ProgName, MyPid, LocalHostName, SentDir, TotalProductsProcessed,
+						TotalBytesProcessed, Loc, InputSource);
+				}
+
+				processed++;
+				TotalBytesProcessed += readSize;
+				TotalProductsProcessed++;
+
+				if (AddLdmWrapper) {
+					SbnSeqNo++;
+					SbnSeqNo %= 1000;
+				}
+
+				SentSeqNo++;
+				SentSeqNo %= MaxSentFiles;
+
+				logMsg (pLog, V_ALWAYS, S_STATUS,
+					"END/FILE WMO[%s] #%lld bytes(%d) f(%s)[%s]%s",
+					wmo_id, TotalProductsProcessed, pFileSize, pFileName, outFilePath, tmpbuf);
+				break;
+
+			case OUT_DISCARD:
+				if ((TotalProductsProcessed % STATUS_FREQUENCY) == 0) {
+					logMsg (pLog, V_ALWAYS, S_STATUS,
+						"STATUS [%s] pid(%d) HOST:%s DISCARD totprods(%lld) totbytes (%lld) %s(%s)",
+						ProgName, MyPid, LocalHostName, TotalProductsProcessed,
+						TotalBytesProcessed, Loc, InputSource);
+				}
+
+				processed++;
+				TotalBytesProcessed += readSize;
+				TotalProductsProcessed++;
+
+				logMsg (pLog, V_ALWAYS, S_STATUS,
+					"END/DISCARD WMO[%s] #%lld bytes(%d) f(%s)%s",
+					wmo_id, TotalProductsProcessed, pFileSize, pFileName, tmpbuf);
+				break;
+
+			default:
+				logMsg (eLog, V_ERROR, S_ERROR,
+					"(%s) - Unknown OutType (%d)",
+					__FUNCTION__, OutAction);
+				break;
+		}
+	}
+
+	return processed;
+}
+
+/* ---------------------------------------------------------------------------- */
+/* Main starts here */
+
+int main (int argc, char **argv) {
+
+	time_t			now_time;
+	time_t			lastPollTime;
+	FILE_LIST		fileList;
+	int			sleepTime;
+	int			moreProds;
+	int			pollAgain;
+	int			qProcessCount;
+	int			readPipe;
+
+#ifdef LDM_SUPPORT
+	int			status;
+#else
+#	ifdef REOPEN_STD_FILES
+
+	char			bufr[MAX_FILENAME_LEN+1];
+
+#	endif
+#endif
+
+	setlocale(LC_ALL, ""); /* use user selected locale */
+
+	MyPid = getpid ();
+	ProgName = strdup (basename (argv[0]));
+	if (gethostname(LocalHostName, MAX_HOST_NAME_LEN)) {
+		LocalHostName[0] = '\0';
+	}
+
+	if (strlen (LocalHostName) == 0) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - call to gethostname failed",
+			__FUNCTION__);
+	}
+
+	cmd_line (argc, argv);
+
+	if (!fileExists (LogPathBase)) {
+		if (makeDirectory (LogPathBase, YES, DIRECTORY_CREATE_PERMS)) {
+			fprintf (stderr,
+				"ERROR: %s - Could not create directory %s\n",
+				__FUNCTION__, LogPathBase);
+		}
+	}
+
+	if (strcmp (LogPathBase, MessagePath) && !fileExists (LogPathBase)) {
+		if (makeDirectory (MessagePath, YES, DIRECTORY_CREATE_PERMS)) {
+			fprintf (stderr,
+				"ERROR: %s - Could not create directory %s\n",
+				__FUNCTION__, MessagePath);
+		}
+	}
+
+#ifdef REOPEN_STD_FILES
+	sprintf (bufr, "%s/%s.stdout", MessagePath, ProgName);
+	reopenStdFile (1, bufr);
+
+	sprintf (bufr, "%s/%s.stderr", MessagePath, ProgName);
+	reopenStdFile (2, bufr);
+
+	if (Verbosity < S_WARNING) {
+		reopenStdFile (1, "/dev/null");
+		reopenStdFile (2, "/dev/null");
+	}
+#endif
+
+	if (initLogs ()) {
+		fprintf (stderr,
+			"InitLogs failed -- exiting\n");
+		return 1;
+	}
+
+	if (atexit (&atExitHandler)) {
+		logMsg (eLog, V_ERROR, S_FATAL,
+			"atExitHandler could not be registered with atexit()");
+
+		return 1;
+	}
+
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Start up parameters:");
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Debug Level: %d",
+		Verbosity);
+	if (InType == IN_ACQ_PIPE) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"ACQ Pipe: %s",
+			InputSource);
+	} else {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Polling Directory: %s",
+			InputSource);
+	}
+	if (SaveFiles) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Sent Directory: %s",
+			SentDir);
+	}
+	if (SaveFails) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Fail Directory: %s",
+			FailDir);
+	}
+	if ((OutAction == OUT_FILE) && strlen (SaveDir)) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Save Directory: %s",
+			SaveDir);
+        }
+
+	if (CreateChecksum) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Checksum Type: %s",
+			csOpts[HashOpt].str);
+	} else {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"Create Checksum: NO");
+	}
+
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Input Type: %s",
+		(InType == IN_ACQ_PIPE) ? "ACQ_PIPE" :
+		(InType == IN_POLL) ? "POLL" :
+		(InType == IN_NDE) ? "NDE" :
+		(InType == IN_PDA) ? "PDA" :
+                (InType == IN_GOESR) ? "GOESR" : "Unknown");
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Discard Age: %d",
+		DiscardAge);
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Polling Interval: %d",
+		PollInterval);
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Log Path: %s",
+		LogPathBase);
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Message Path: %s",
+		MessagePath);
+	logMsg (eLog, V_INFO, S_STATUS,
+		"File Template: %s",
+		PollFileSpec);
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Output Type: %s",
+		(OutAction == OUT_FILE) ? "FILE" :
+		(OutAction == OUT_DISCARD) ? "DISCARD" :
+#ifdef LDM_SUPPORT
+		(OutAction == OUT_LDM) ? "LDM" :
+#endif
+		"Unknown");
+#ifdef LDM_SUPPORT
+	if (OutAction == OUT_LDM) {
+		logMsg (eLog, V_INFO, S_STATUS,
+			"LDM Product Queue: %s",
+			pqfName);
+	}
+#endif
+
+	if ((OutAction == OUT_FILE) && strlen (SaveDir) && !fileExists (SaveDir)) {
+		if (makeDirectory (SaveDir, YES, DIRECTORY_CREATE_PERMS)) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - could not create save directory %s",
+				__FUNCTION__, SaveDir);
+			return 1;
+		}
+	}
+
+	if (SaveFiles && !fileExists (SentDir)) {
+		if (makeDirectory (SentDir, YES, DIRECTORY_CREATE_PERMS)) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - could not create sent directory %s",
+				__FUNCTION__, SentDir);
+			return 1;
+		}
+	}
+
+	if (SaveFails && !fileExists (FailDir)) {
+		if (makeDirectory (FailDir, YES, DIRECTORY_CREATE_PERMS)) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - could not create fail directory %s",
+				__FUNCTION__, FailDir);
+			return 1;
+		}
+	}
+
+	if (ParDir[0] && !fileExists (ParDir)) {
+		if (makeDirectory (ParDir, YES, DIRECTORY_CREATE_PERMS)) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - could not create PAR file directory %s",
+				__FUNCTION__, FailDir);
+			return 1;
+		}
+	}
+
+        setupSigHandler ();
+
+#ifdef LDM_SUPPORT
+        md5ctxp = new_MD5_CTX();
+
+        if (md5ctxp == NULL) {
+		logMsg (eLog, V_ERROR, S_FATAL,
+			"(%s) - could not allocate MD5 object",
+			__FUNCTION__);
+                exit (1);
+        }
+
+        if (OutAction == OUT_LDM) {
+                if ((status = lpqGet(pqfName, &prodQueue)) != 0) {
+                        logMsg (eLog, V_ERROR, S_ERROR,
+                        	"(%s) - Error (%d) could not open LDM product queue %s",
+				__FUNCTION__, status, pqfName);
+			exit (1);
+		}
+	}
+#endif
+
+        /*
+         * If InType is ACQ_PIPE, then InputSource will be a pipe name, otherwise it will be a directory
+         */
+	if (InType == IN_ACQ_PIPE) {
+		if (!fileExists (InputSource)) {
+			if (mknod (InputSource, S_IFIFO | OUTFILE_FINAL_PERMS, 0)) {
+				logMsg (eLog, V_ERROR, S_FATAL,
+					"(%s) - Error (%d) \"%s\" creating pipe %s",
+					__FUNCTION__, errno, strerror (errno), InputSource);
+				return 1;
+			}
+		} else if (getFileType (InputSource) != S_IFIFO) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - %s must be a pipe",
+				__FUNCTION__, InputSource);
+			return 1;
+		}
+
+		/*
+		 * IMPORTANT NOTE -- It's possible for this open to block
+		 */
+		if ((readPipe = open (InputSource, O_RDONLY, 0)) == -1) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - Error (%d) \"%s\" opening pipe %s",
+				__FUNCTION__, errno, strerror (errno), InputSource);
+			return 1;
+		}
+	} else if (!fileExists (InputSource)) {
+		if (makeDirectory (InputSource, YES, DIRECTORY_FULL_OPEN_PERMS)) {
+			logMsg (eLog, V_ERROR, S_FATAL,
+				"(%s) - could not create polling directory %s",
+				__FUNCTION__, InputSource);
+			return 1;
+		}
+	}
+
+	TotalProductsProcessed = 0;
+	TotalBytesProcessed = 0;
+	lastPollTime = 0;
+	moreProds = TRUE;
+	pollAgain = FALSE;
+	Done = FALSE;
+	SbnSeqNo = 1;
+	SentSeqNo = 0;
+	fileList.count = 0;
+
+	while (!Done) {
+		now_time = time (NULL);
+		/* lastDeltaTime = now_time - lastPollTime; */
+
+		if (PollInterval <= 0) {
+			Done = TRUE;
+		}
+
+		if (InType == IN_ACQ_PIPE) {
+			if (!readAcqPipe (readPipe, &fileList)) {
+				logFileList (&fileList);
+				if ((qProcessCount = processProducts (&fileList)) != fileList.count) {
+					logMsg (eLog, V_ERROR, S_WARNING,
+						"(%s) - only %d of %d queued products processed",
+						__FUNCTION__, qProcessCount, fileList.count);
+				}
+
+				freeFileList (&fileList);
+			}
+		} else {	/* Poll a directory for files */
+			if (moreProds || pollAgain || ((now_time - lastPollTime) >= PollInterval)) {
+
+				if ((moreProds = findFilesLike (InputSource, PollFileSpec, &fileList)) < 0) {
+					logMsg (eLog, V_ERROR, S_ERROR,
+						"(%s) - Unrecoverable error calling find_files_like",
+						__FUNCTION__);
+					break;
+				}
+
+				if (fileList.count > 0) {
+					if (Verbosity >= V_DEBUG) {
+						logFileList (&fileList);
+					}
+
+					if (fileList.count > 1) {
+						/* Sort by last modification time so oldest files are sent first */
+						qsort (fileList.fileNodes, fileList.count, sizeof (FILE_NODE), compareFileNodeTimes);
+
+						if (Verbosity >= V_DEBUG) {
+							logFileList (&fileList);
+						}
+
+					}
+
+					if ((qProcessCount = processProducts (&fileList)) != fileList.count) {
+						logMsg (eLog, V_ERROR, S_WARNING,
+							"(%s) - only %d of %d queued products processed",
+							__FUNCTION__, qProcessCount, fileList.count);
+
+						/* Do anything else??? */
+						pollAgain = FALSE;
+						moreProds = FALSE;
+					} else {
+						pollAgain = TRUE;
+					}
+
+					freeFileList (&fileList);
+				} else {
+					pollAgain = FALSE;
+				}
+
+				lastPollTime = time (NULL);
+			} else {
+				sleepTime = PollInterval;
+
+				if (sleepTime > SleepPollInterval) {
+					sleepTime = SleepPollInterval;
+				}
+
+				if (sleepTime > 0) {
+					logMsg (eLog, V_DEBUG, S_DEBUG,
+						"(%s) - sleeping for %d seconds",
+						__FUNCTION__, sleepTime);
+					sleep (sleepTime);
+				}
+			}
+		}
+	}
+
+	return 0;
+}
diff --git a/fileIngest/goesr_lib.c b/fileIngest/goesr_lib.c
new file mode 100644
index 000000000..cf0f98430
--- /dev/null
+++ b/fileIngest/goesr_lib.c
@@ -0,0 +1,906 @@
+
+/* ------------------------------------------------------------------------------
+ *
+ * File Name:
+ *	goesr_lib.c
+ *
+ * Description:
+ *	This file contains functions generating WMO headers based on file names.
+ *
+ * Functions defined:
+ * 	findGoesrCmiNonMesoRegionID
+ * 	findGoesrCmiMesoRegionID
+ * 	calc_ii
+ * 	calc_bbb
+ * 	goesrCmiFile2Wmo
+ *
+ * Author:
+ * 	Brian Rapp		Jun 29, 2012
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+ ------------------------------------------------------------------------------ */
+#define _GNU_SOURCE
+
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+#include "../fileIngest/stdclib.h"
+#include "../fileIngest/goesr_lib.h"
+#include "../fileIngest/mlogger.h"
+
+#define	FIELD_SEPARATOR			"_"
+#define SUBFIELD_SEPARATOR		"-"
+#define FIELD_COUNT			5
+#define MAX_SCENE_NAME_LEN		32
+#define DATE_STR_LEN			13
+#define WMO_DATE_LEN			6
+#define SIZE_LONG_WMO			25
+#define MAX_FIELD_LEN			64
+#define SIZE_RESOLUTION			3
+#define SIZE_BITDEPTH			3
+#define SUBFIELD3_SIZE			2
+#define SIZE_LOCATION			7
+#define SIZE_LAT			2
+#define SIZE_LONG			3
+#define SIZE_CHANNEL			2
+#define SIZE_TILE			3
+#define SIZE_BBB			3
+
+#define WMO_T1_SATELLITE		'T'
+#define WMO_T2_IMAGERY			'I'
+#define WMO_A1_GOESR_CMI_NON_MESO	'R'
+#define WMO_A1_GOESR_CMI_MESO		'S'
+#define WMO_ORIGINATOR			"KNES"
+
+#define	BASE				26
+#define	MAX_SEQ_NUM			((BASE * BASE) - 1)
+
+extern LOGGER		*eLog;
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	findGoesrCmiNonMesoRegionID
+
+Synopsis:
+	Calculates the A2 character of a GOES-R non-mesoscale product based on
+	the region string.
+
+Prototype:
+	static char findGoesrCmiNonMesoRegionID (char *regionName)
+
+Arguments:
+
+	Name:		regionName
+	Type:		char *
+	Access:		read only
+
+	Contains the region name from the GOES-R PD-generated file name.  Valid
+	values are: AKRegi, EFD, WFD, EConus, HIRegi, PRRegi, WConus.
+
+Description:
+	This function finds the A2 character of a WMO header of the format
+	"TTAAii CCCC YYGGgg bbb" using the region string in the file name of a
+	non-mesoscale GOES-R file name.  Values are as follows:
+
+	Region		A2
+	======		==
+	AKREGI		A
+	TCONUS		C
+	ECONUS		E
+	HIREGI		H
+	PRREGI		P
+	EFD		S
+	WFD		T
+	TFD		U
+	WCONUS		W
+
+Return Values:
+	A single character a defined above.  If a match is not found, an ASCII 'Z'
+	is returned.
+
+------------------------------------------------------------------------------ */
+
+static char findGoesrCmiNonMesoRegionID (char *regionName) {
+
+	int	i;
+
+	struct a2_non_meso_table_struct {
+		char	*regionName;
+		char	regionDesignator;
+	};
+	static struct a2_non_meso_table_struct	a2_table[] = {
+			{ "AKREGI",	'A' },
+			{ "TCONUS",	'C' },
+			{ "ECONUS",	'E' },
+			{ "HIREGI",	'H' },
+			{ "PRREGI",	'P' },
+			{ "EFD",	'S' },
+			{ "WFD",	'T' },
+			{ "TFD",	'U' },
+			{ "WCONUS",	'W' },
+			{ "\0",		'\0' }
+		};
+
+	for (i = 0; a2_table[i].regionDesignator != '\0'; i++) {
+		if (strncmp (regionName, a2_table[i].regionName, strlen (a2_table[i].regionName)) == 0)
+			return (a2_table[i].regionDesignator);
+	}
+
+	return ('Z');
+}
+
+ /* ------------------------------------------------------------------------------
+
+ Function Name:
+ 	findGoesrCmiMesoRegionID
+
+ Synopsis:
+ 	Calculates the A2 character of a GOES-R mesoscale product based on the
+ 	the center point (lat/long) provided in the file name.
+
+ Prototype:
+ 	static char findGoesrCmiMesoRegionID (int latitude, int longitude)
+
+ Arguments:
+
+ 	Name:		latitude
+ 	Type:		int
+ 	Access:		read only
+
+	Center point latitude.  Expected to be in the range -90 to +90.
+
+ 	Name:		longitude
+ 	Type:		int
+ 	Access:		read only
+
+	Center point longitude.  Expected to be in the range -180 to 180.
+
+ Description:
+ 	This function finds the A2 character of a WMO header of the format
+ 	"TTAAii CCCC YYGGgg bbb" using the center latitude/longitude of the
+ 	image as provided in the file name of a mesoscale GOES-R file name.
+
+ 	Mapping of the A2 values are determined according to the table below:
+
+
+   	   90   180
+       	       -180 -165 -150 -135 -120 -105 -90 -75 -60 -45 -30 -15  0
+	75 +-----+--------------+-------------------------------------+ 75
+   	   |     |              |                  T                  |
+	60 |     |      R       |-------------------------------------+ 60
+   	   |     |              | A  | B  | C | D | E |               |
+	45 |     |--------------+----+----+---+---+---|               | 45
+   	   |  V  |              | F  | G  | H | I | J |               |
+	30 |     |              |----+----+---+---+---|       U       | 30
+   	   |     |      S       | K  | L  | M | N | O |               |
+	15 |     |              |-------------+-------|               | 15
+   	   |     |              |      P      |   Q   |               |
+	0  |----------------------------------------------------------+ 0
+   	   |              Y               |             Z             |
+	-90+------------------------------+---------------------------+ -90
+
+	Eastern Longitudes are positive integers; Western are negative.  Similarly,
+	Northern latitudes are positive while Southern are negative.
+
+ Return Values:
+ 	A single character a defined above.  If a match is not found, an ASCII 'X'
+ 	is returned.
+
+ ------------------------------------------------------------------------------ */
+
+static char findGoesrCmiMesoRegionID (int latitude, int longitude) {
+
+	 struct a2_meso_table_struct {
+		 char	regionID;
+		 int	top_lat;
+		 int	bottom_lat;
+		 int	left_long;
+		 int	right_long;
+	 };
+
+	 const static struct a2_meso_table_struct	a2_table[] = {
+		/*	   A2	       t.lat   b.lat   l.long  r.long	*/
+			 { 'A',		60, 	45, 	-135, 	-120	},
+			 { 'B',		60, 	45, 	-120, 	-105	},
+			 { 'C',		60, 	45, 	-105, 	-90	},
+			 { 'D',		60, 	45, 	-90, 	-75	},
+			 { 'E',		60, 	45, 	-75, 	-60	},
+			 { 'F',		45, 	30, 	-135, 	-120	},
+			 { 'G',		45, 	30, 	-120, 	-105	},
+			 { 'H',		45, 	30, 	-105, 	-90	},
+			 { 'I',		45, 	30, 	-90, 	-75	},
+			 { 'J',		45, 	30, 	-75, 	-60	},
+			 { 'K',		30, 	15, 	-135, 	-120	},
+			 { 'L',		30, 	15, 	-120, 	-105	},
+			 { 'M',		30, 	15, 	-105, 	-90	},
+			 { 'N',		30, 	15, 	-90, 	-75	},
+			 { 'O',		30, 	15, 	-75, 	-60	},
+			 { 'P',		15, 	0, 	-135, 	-90	},
+			 { 'Q',		15, 	0, 	-90, 	-60	},
+			 { 'R',		75, 	45, 	-180, 	-135	},
+			 { 'S',		45, 	0, 	-180, 	-135	},
+			 { 'T',		75, 	60, 	-135, 	0	},
+			 { 'U',		60, 	0, 	-60, 	0	},
+			 { 'V',		75, 	0, 	90, 	180	},
+			 { 'Y',		0, 	-90, 	-180, 	-105	},
+			 { 'Y',		0, 	-90, 	90, 	180	},
+			 { 'Z',		0, 	-90, 	-105, 	0	},
+			 { '\0',	0,	0,	0,	0	}
+	 	 };
+
+	 int		i;
+
+	 for (i = 0; a2_table[i].regionID != '\0'; i++) {
+		 if ((latitude >= a2_table[i].bottom_lat) && (latitude < a2_table[i].top_lat) &&
+		     (longitude >= a2_table[i].left_long) && (longitude < a2_table[i].right_long)) {
+			 return a2_table[i].regionID;
+		 }
+	 }
+
+	 return ('X');
+ }
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	calc_ii
+
+Synopsis:
+	Creates the ii from the channel number.
+
+
+Prototype:
+	static int calc_ii (int channel)
+
+Arguments:
+
+	Name:		channel
+	Type:		unsigned int
+	Access:		read only
+
+	GOES-R ABI channel number for this scene.
+
+Description:
+	For now, this function is nothing more than a stub that returns the ABI
+	channel number for ii.  If additional products are added later that
+	requires a more complex calculation, this function will need to be
+	modified.
+
+Return Values:
+	An integer value between 1 and 16 inclusive representing the 16 ABI
+	channels.
+
+------------------------------------------------------------------------------ */
+
+static int calc_ii (int channel) {
+	return channel;
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	calc_bbb
+
+Synopsis:
+	Creates the bbb field from the tile number.
+
+Prototype:
+	static char *calc_bbb (unsigned int sequence)
+
+Arguments:
+
+	Name:		sequence
+	Type:		unsigned int
+	Access:		read only
+
+	GOES-R product tile number.
+
+Description:
+	The function calculates the optional BBB field of a WMO header using
+	the tile number in the file name generated by the GOES-R ground segment
+	for every file transmitted to AWIPS.
+
+	The BBB field follows the Pxx indicator group specification with an
+	exception for the final segment.  Because AWIPS has no a priori knowledge
+	of the total number of tiles in a file and there is no indication within
+	the file name, the BBB field for the final segment does not receive
+	special treatment and follows the same calculation rules as every other
+	tile.  The Pxx indicator group is calculated as follows:
+
+	When a bulletin exceeds the length limit defined in Table A, it shall be
+	segmented for communications purposes using a bulletin segment heading
+	line utilizing the Pxx Indicator Group.  There are two different struc-
+	tures possible for segments.  Segmented alphanumeric products have a
+	supplementary identification line which repeats information in addition
+	to the bulletin segment heading line in each segment. Segmented binary
+	products do not repeat the supplementary identification line information
+	in a second line for each subsequent segment. Only the bulletin segment
+	heading line is repeated.
+
+	Defining:
+
+	Pxx = values of xx = AA through ZZ
+
+	The following principles shall apply when segmenting alphanumeric
+	bulletins for transmission:
+
+	The first bulletin segment heading will have sequence indicator xx = AA,
+	the second AB and so on.  The segment heading is a base 26 number using
+	the letters of the alphabet to represent each digit.  This scheme allows
+	26 * 26 or 676 possible combinations.  Since the first tile will be 1
+	and the first segment must be AA, the sequence is first biased to 0
+	before calculating the segment.
+
+Return Values:
+	This function has no return values.  The bbb is returned in the second
+	argument, which must be allocated to at least 4 bytes by the caller.
+
+------------------------------------------------------------------------------ */
+
+static void calc_bbb (unsigned int sequence, char *bbb) {
+
+	int		lsb;
+	int		msb;
+
+	sequence--;			/* Bias sequence to 0 */
+	strcpy (bbb, "PZZ");		/* Provide default value for bbb (used for any seq > 675) */
+
+	if (sequence < MAX_SEQ_NUM) {
+		msb = sequence / BASE;
+		lsb = sequence % BASE;
+
+		sprintf (bbb, "P%c%c", msb + 'A', lsb + 'A');
+	}
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	goesrCmiFile2Wmo
+
+Synopsis:
+	This function calculates a WMO header from a file name string.
+
+
+Prototype:
+	void goesrCmiFile2Wmo (char *goesrFileName, char *wmo_header)
+
+Arguments:
+
+	Name:		goesrFileName
+	Type:		char *
+	Access:		read only
+
+	goesrFileName is the name of a GOES-R CMI product file as transferred
+	from the GOES-R PD to AWIPS.
+
+	Name:		wmo_header
+	Type:		char *
+	Access:		write only
+
+	wmo_header is an output variable containing the WMO header of the form:
+	  	TTAAII<sp>CCCC<sp>YYGGgg<sp>bbb
+
+	where:
+
+		<sp> is the ASCII space character
+
+	The memory for this variable must be allocated by the caller.
+
+Description:
+	Generate a WMO header for a GOES-R Advanced Baseline Imager (ABI) Cloud
+	and Moisture Imagery (CMI) product based on the file name as defined in
+	the GOES-R/AWIPS ICD.  There are two formats: one for non-mesoscale
+	products and one for mesoscale products.
+
+	Non-mesoscale format:
+
+		zy_xxxx-rrr-Bnn-MnCnn-Tnnn_Gnn_sYYYYDDDhhmmss_cYYYYDDDhhmmss.nc
+
+		z = Environment
+			I - Integrated Test Environment (ITE)
+			D - Development Environment (DE)
+			O - Operational Environment (OE)
+
+		y = Data Type
+			R - Real-time
+			P - Playback
+			S - Simulated
+			T - Test
+
+		xxxx = Product Region
+			ECONUS - East CONUS
+			WCONUS - West CONUS
+			TCONUS - Center position CONUS
+			HIREGI - Hawaii Regional
+			PRREGI - Puerto Rico Regional
+			AKREGI - Alaska Regional
+			EFD    - East Full Disk
+			WFD    - West Full Disk
+			TFD    - Center position Full Disk
+
+		rrr = Resolution
+			005 - 0.5 km
+			010 - 1.0 km
+			025 - 2.5 km
+			280 - 28 km
+
+		Bnn = Bit Depth
+			B08 - 8 bits
+			B09 - 9 bits
+			B10 - 10 bits
+			B11 - 11 bits
+			B12 - 12 bits
+			B13 - 13 bits
+			B14 - 14 bits
+
+		Mn = ABI Mode
+			M3 - ABI Mode 3
+			M4 - ABI Mode 4
+
+		Cnn - ABI Channel
+			C01 - ABI Channel 1
+			C02 - ABI Channel 2
+			...
+			C16 - ABI Channel 16
+
+		Tnnn = Tile Number
+			T001 - Tile 1 (upper left corner)
+			...
+			Txxx - Last tile (lower right corner) depends on product and tile size
+
+		Gnn = Satellite Number
+			G16 - GOES-R
+			G17 - GOES-S
+			...
+			Gnn - Additional GOES-R-series satellites
+
+		sYYYYDDDhhmmss = Start date/time of ABI scene
+			YYYY - year
+			DDD - Julian day of year
+			hh - hour (00 - 23)
+			mm - minute (00 - 59)
+			ss - second (00 - 59)
+
+		cYYYYDDDhhmmss = File creation time of first tile generated for product
+			YYYY - year
+			DDD - Julian day of year
+			hh - hour (00 - 23)
+			mm - minute (00 - 59)
+			ss - second (00 - 59)
+
+
+	Mesoscale format:
+
+		zy_xxxx-rrr-Bnn-Sn-NxxWyyy-MnCnn-Tnnn_Gnn_sYYYYDDDhhmmss_cYYYYDDDhhmmss.nc
+
+		z = Environment
+			I - Integrated Test Environment (ITE)
+			D - Development Environment (DE)
+			O - Operational Environment (OE)
+
+		y = Data Type
+			R - Real-time
+			P - Playback
+			S - Simulated
+			T - Test
+
+		xxxx = Product Region
+			EMeso  - East Satellite Mesoscale
+			WMeso  - West Satellite Mesoscale
+			TMeso  - Center Position Mesoscale
+
+		rrr = Resolution
+			005 - 0.5 km
+			010 - 1.0 km
+			025 - 2.5 km
+			280 - 28 km
+
+		Bnn = Bit Depth
+			B08 - 8 bits
+			B09 - 9 bits
+			B10 - 10 bits
+			B11 - 11 bits
+			B12 - 12 bits
+			B13 - 13 bits
+			B14 - 14 bits
+
+		Sn = Mesoscale scene indicator
+			S1 - Mesoscale scene 1
+			S2 - Mesoscale scene 2
+
+		NxxWyyy - Lat/Long center point of mesoscale image
+			Nxx -	Latitude value where N can be either 'N' (North) or 'S' (South)
+				followed by two digit latitude value.
+			Wyyy -	Longitude value where W can be either 'E' (East) or 'W' (West)
+ 				followed by three digit longitude value.
+
+		Mn = ABI Mode
+ 			M3 - ABI Mode 3
+			M4 - ABI Mode 4
+
+		Cnn - ABI Channel
+			C01 - ABI Channel 1
+			C02 - ABI Channel 2
+			...
+			C16 - ABI Channel 16
+
+		Tnnn = Tile Number
+			T001 - Tile 1 (upper left corner)
+			...
+			Txxx - Last tile (lower right corner) depends on product and tile size
+
+		Gnn = Satellite Number
+			G16 - GOES-R
+			G17 - GOES-S
+			...
+			Gnn - Additional GOES-R-series satellites
+
+		sYYYYDDDhhmmss = Start date/time of ABI scene
+			YYYY - year
+			DDD - Julian day of year
+			hh - hour (00 - 23)
+			mm - minute (00 - 59)
+			ss - second (00 - 59)
+
+		cYYYYDDDhhmmss = File creation time of first tile generated for product
+			YYYY - year
+			DDD - Julian day of year
+			hh - hour (00 - 23)
+			mm - minute (00 - 59)
+			ss - second (00 - 59)
+
+Return Values:
+	0	- Success
+	1	- Failure - a valid WMO header was not generated.
+
+------------------------------------------------------------------------------ */
+
+int goesrCmiFile2Wmo (char *goesrFileName, char *wmo_header) {
+
+//	char		environment;				/* Environment in which this product was created - I, D, or O */
+//	char		data_type;				/* Product mode - 'R'eal-time, 'P'layback, 'S'imulated, or 'T'est */
+	char		scene_name[MAX_SCENE_NAME_LEN+1];	/* Name of scene (e.g. - AKNatl) */
+//	int		resolution;				/* Resolution of scene in hectometers (.1 km) */
+//	int		bit_depth;				/* bits used per pixel */
+	int		meso_scene;				/* Mesoscale scene number (1 or 2) */
+	int		center_latitude;			/* Center point latitude */
+	int		center_longitude;			/* Center point longitude */
+	int		lat_dir;				/* latitude direction */
+	int		long_dir;				/* longitude direction */
+	int		abi_mode;				/* ABI instrument mode for this scene */
+	int		channel;				/* Channel for this scene */
+	int		tile_num;				/* Tile number */
+	int		sat_num;				/* Satellite number */
+	char		scene_time[DATE_STR_LEN+1];		/* Scene time from file name */
+	char		wmo_time[WMO_DATE_LEN+1];		/* Date string as used in WMO header */
+	int		i;					/* array index/loop counter */
+	char		field[FIELD_COUNT][MAX_FIELD_LEN+1];	/* array of character strings for individual tokens */
+	char		*str;					/* character pointer used for parsing */
+	char		*token;					/* temporary string pointer */
+	char		isMeso;					/* set TRUE for mesos, FALSE for non-mesos */
+	char		buf[4];					/* temporary buffer for lat/long calculations */
+	char		a2;					/* A2 field of WMO header */
+	int		ii;					/* ii field of WMO header */
+	char		bbb[SIZE_BBB+1];			/* optional bbb field of WMO header */
+	char		fname[MAX_STR_LEN+1];
+	struct tm	tms;
+
+	wmo_header[0] = '\0';
+
+	strncpy (fname, goesrFileName, MAX_STR_LEN);
+
+	if (strlen (fname) == 0) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - File name is null or zero length", __FUNCTION__);
+		return 1;
+	}
+
+//	printf ("File name: %s in goesr_cmiFile2wmo\n", fname);
+
+	/* Break the file name down into tokens separated by '_' and put into 'field' array */
+	for (i = 0, str = fname; i < FIELD_COUNT - 1; i++, str = NULL) {
+		token = strtok (str, FIELD_SEPARATOR);
+
+		if (token == NULL) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - strtok unexpectedly returned NULL", __FUNCTION__);
+			return 1;
+		}
+
+		if (strlen (token) > MAX_FIELD_LEN) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Token length (%d) > MAX_FIELD_LEN (%d)",
+				__FUNCTION__, (int) strlen (token), MAX_FIELD_LEN);
+			return 1;
+		}
+		strcpy (field[i], token);
+
+//		printf ("field[%d] = %s\n", i, field[i]);
+	}
+
+	if (i != (FIELD_COUNT - 1)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - token count (%d) != %d in goesr_cmiFile2wmo",
+			__FUNCTION__, i, FIELD_COUNT - 1);
+		return 1;
+	}
+
+	/* Strip the file extension from the last token */
+	token = strtok (NULL, ".");
+	strcpy (field[i], token);
+//	printf ("field[%d] = %s\n", i, field[i]);
+
+	if (strlen (field[0]) != 2) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - file name field 1 \"%s\" is an invalid length (%d != 2)",
+			__FUNCTION__, field[0], (int) strlen (field[0]));
+		return 1;
+	}
+
+//	environment = field[0][0];
+//	data_type = field[0][1];
+
+//	printf ("Environment = %c, Data Type = %c\n", environment, data_type);
+
+	if ((token = strtok (field[1], SUBFIELD_SEPARATOR)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - could not strtok field[1] subfield 0 (%s)",
+			__FUNCTION__, field[1]);
+		return 1;
+	}
+
+	if (strlen (token) > MAX_SCENE_NAME_LEN) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - scene name length (%d) too long: \"%s\"",
+			__FUNCTION__, (int) strlen (token), token);
+		return 1;
+	}
+
+	strcpy (scene_name, token);
+	raiseCase (scene_name);
+//	printf ("Scene name: %s\n", scene_name);
+
+	if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - could not strtok field[1] subfield 1 (%s)",
+			__FUNCTION__, field[1]);
+		return 1;
+	}
+
+	if (strlen (token) != SIZE_RESOLUTION) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - resolution field incorrect size (%d), should be %d",
+			__FUNCTION__, (int) strlen (token), SIZE_RESOLUTION);
+		return 1;
+	}
+
+	if (!isNumber (token)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - resolution is not numeric (%s)",
+			__FUNCTION__, token);
+		return 1;
+	}
+
+//	resolution = atoi (token);
+//	printf ("Resolution = %d\n", resolution);
+
+	if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - could not strtok field[1] subfield 2 (%s)",
+			__FUNCTION__, field[1]);
+		return 1;
+	}
+
+	if (strlen (token) != SIZE_BITDEPTH) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - bit depth field incorrect size (%d), should be %d",
+			__FUNCTION__, (int) strlen (token), SIZE_BITDEPTH);
+		return 1;
+	}
+
+	if (!isNumber (&token[1])) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - bit depth is not numeric (%s)",
+			__FUNCTION__, token);
+		return 1;
+	}
+
+//	bit_depth = atoi (&token[1]);
+//	printf ("Bit depth = %d\n", bit_depth);
+
+	if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - could not strtok field[1] subfield 3 (%s)", __FUNCTION__, field[1]);
+		return 1;
+	}
+
+	switch (token[0]) {
+		case 'S':
+			isMeso = TRUE;
+			break;
+		case 'M':
+			isMeso = FALSE;
+			break;
+		default:
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - unexpected value of field 1 subfield 3 (%c)",
+				__FUNCTION__, token[0]);
+			return 1;
+			break;
+	}
+
+	if (isMeso) {	// zy_xxxx-rrr-Bnn-Sn-NxxWyyy-MnCnn-Tnnn_Gnn_sYYYYDDDhhmmss_cYYYYDDDhhmmss.nc
+//		printf ("This is a mesoscale product\n");
+		meso_scene = atoi (&token[1]);
+
+		if ((meso_scene != 1) && (meso_scene != 2)) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Unexpected value of mesoscale scene %d",
+				__FUNCTION__, meso_scene);
+			return 1;
+		}
+
+//		printf ("Mesoscale scene = %d\n", meso_scene);
+
+		if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Could not strtok field[1] subfield 3 (%s)",
+				__FUNCTION__, field[1]);
+			return 1;
+		}
+
+		if (strlen (token) != SIZE_LOCATION) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Incorrect size (%d) of Lat/Long field, should be %d",
+				__FUNCTION__, (int) strlen (token), SIZE_LOCATION);
+			return 1;
+		}
+
+		if ((token[0] != 'N') && (token[0] != 'S')) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Unknown value %c for latitude direction",
+				__FUNCTION__, token[0]);
+			return 1;
+		}
+
+		if ((token[3] != 'E') && (token[3] != 'W')) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Unknown value %c for longitude direction",
+				__FUNCTION__, token[3]);
+			return 1;
+		}
+
+		lat_dir = (token[0] == 'N') ? 1 : -1;
+		long_dir = (token[3] == 'E') ? 1 : -1;
+
+		memset (buf, '\0', 4);
+		memcpy (buf, &token[1], SIZE_LAT);
+		center_latitude = lat_dir * atoi (buf);
+
+		memset (buf, '\0', 4);
+		memcpy (buf, &token[4], SIZE_LONG);
+		center_longitude = long_dir * atoi (buf);
+
+		center_longitude = center_longitude == 180 ? -180 : center_longitude;
+
+//		printf ("Center point = %d lat/%d long\n", center_latitude, center_longitude);
+
+		a2 = findGoesrCmiMesoRegionID (center_latitude, center_longitude);
+
+		if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+			logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Could not strtok mode/channel subfield",
+				__FUNCTION__);
+			return 1;
+		}
+
+	} else {	// Non-mesoscale product - zy_xxxx-rrr-Bnn-MnCnn-Tnnn_Gnn_sYYYYDDDhhmmss_cYYYYDDDhhmmss.nc
+//		printf ("This is a non-mesoscale product\n");
+		a2 = findGoesrCmiNonMesoRegionID (scene_name);
+	}
+
+	if (token[0] != 'M') {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Unknown value for ABI field %c, should be 'M'",
+			__FUNCTION__, token[0]);
+		return 1;
+	}
+
+	abi_mode = token[1] - '0';
+
+	if ((abi_mode != 3) && (abi_mode != 4)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid ABI mode %d",
+			__FUNCTION__, abi_mode);
+		return 1;
+	}
+
+//	printf ("ABI mode = %d\n", abi_mode);
+
+	if (token[2] != 'C') {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Unknown value for channel field ID %c, should be 'C'",
+			__FUNCTION__, token[2]);
+		return 1;
+	}
+
+	channel = atoi (&token[3]);
+
+	if ((channel < 1) || (channel > 16)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "Invalid ABI mode %d\n", abi_mode);
+		return 1;
+	}
+
+//	printf ("Channel = %d\n", channel);
+
+	if ((token = strtok (NULL, SUBFIELD_SEPARATOR)) == NULL) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Could not strtok tile number subfield",
+			__FUNCTION__);
+		return 1;
+	}
+
+	if (strlen (token) != SIZE_TILE + 1) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Incorrect size (%d) of tile number field, should be %d",
+			__FUNCTION__, (int) strlen (token), SIZE_TILE+1);
+		return 1;
+	}
+
+	if (token[0] != 'T') {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid tile number specifier '%c'",
+			__FUNCTION__, token[0]);
+		return 1;
+	}
+
+	tile_num = atoi (&token[1]);
+	if ((tile_num < 1) || (tile_num > 999)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid tile number %d",
+			__FUNCTION__, tile_num);
+		return 1;
+	}
+
+//	printf ("Tile number = %d\n", tile_num);
+
+	if (field[2][0] != 'G') {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid satellite number specifier '%c'",
+			__FUNCTION__, field[2][0]);
+		return 1;
+	}
+
+	sat_num = atoi (&field[2][1]);
+
+	if (sat_num < 16) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid satellite number %d",
+			__FUNCTION__, sat_num);
+		return 1;
+	}
+
+//	printf ("Satellite number = %d\n", sat_num);
+
+	strcpy (scene_time, &field[3][1]);
+	if (strlen (scene_time) != DATE_STR_LEN) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid date string length %d, should be %d",
+			__FUNCTION__, (int) strlen (scene_time), DATE_STR_LEN);
+		return 1;
+	}
+
+//	printf ("Scene time = %s\n", scene_time);
+
+	strptime (scene_time, "%Y%j%H%M%S", &tms);
+	strftime (wmo_time, WMO_DATE_LEN+1, "%d%H%M", &tms);
+
+//	if (!formatDateString ("%Y%j%H%M%S", "%d%H%M", 0, scene_time, wmo_time, WMO_DATE_LEN+1)) {
+//		logMsg (eLog, V_ERROR, S_ERROR, "Could not parse scene time\n");
+//		return;
+//	}
+
+//	printf ("WMO time = %s\n", wmo_time);
+
+	if (!isalpha(a2)) {
+		logMsg (eLog, V_ERROR, S_ERROR, "(%s) - Invalid a2 character '%c'",
+			__FUNCTION__, a2);
+		return 1;
+	}
+
+	ii = calc_ii (channel);
+
+	calc_bbb (tile_num, bbb);
+	sprintf (wmo_header, "%c%c%c%c%02d %s %s %s",
+			WMO_T1_SATELLITE,
+			WMO_T2_IMAGERY,
+			isMeso ? WMO_A1_GOESR_CMI_MESO : WMO_A1_GOESR_CMI_NON_MESO,
+			a2,
+			ii,
+			WMO_ORIGINATOR,
+			wmo_time,
+			bbb);
+
+	// printf ("WMO header: %s\n", wmo_header);
+	logMsg (eLog, V_DEBUG, S_DEBUG, "(%s) - Generated WMO: %s", __FUNCTION__, wmo_header);
+	return 0;
+}
+
diff --git a/fileIngest/goesr_lib.hin b/fileIngest/goesr_lib.hin
new file mode 100644
index 000000000..4470d7d9f
--- /dev/null
+++ b/fileIngest/goesr_lib.hin
@@ -0,0 +1,13 @@
+/*
+ * goesr_lib.h
+ *
+ *  Created on: Nov 17, 2013
+ *      Author: brapp
+ */
+
+#ifndef GOESR_LIB_H_
+#define GOESR_LIB_H_
+
+@FUNCTION_DECLARATIONS@
+
+#endif /* GOESR_LIB_H_ */
diff --git a/fileIngest/ldm-raftr b/fileIngest/ldm-raftr
new file mode 100755
index 000000000..c6da463d3
--- /dev/null
+++ b/fileIngest/ldm-raftr
@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# ldmcp:	This starts and stops the SBN LDMCP software at the sites
+#
+# chkconfig:	345 99 0
+# description:	ldmcp starts/stops SBN LDM software on the CP at the site
+#
+#
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin
+
+# Source function library.
+. /etc/init.d/functions
+
+RETVAL=0
+LDM_PROJECT="/usr/local/ldm"
+LOGFILE=`basename $0`
+LOCKFILE="/var/lock/subsys/ldm-raftr"
+DATA_DIR="/data/ldm/data"
+PROD_QUEUE="${DATA_DIR}/ldm.pq"
+USER_SPEC="ldm:users"
+
+function handle_ramdisk() {
+
+	# check if ramdisk is mounted:
+	if ! mount | grep ram0 > /dev/null 
+	then
+		echo -ne "Creating RAMDISK:\t"
+		if mkfs -t ext2 -m 0 -q /dev/ram0 1500000 && success || failure	
+		then
+			echo
+			# mount to /data/ldm/data
+			echo -ne "Mounting to ${DATA_DIR}:\t"
+			if ! mount /dev/ram0 $DATA_DIR && failure 
+			then
+				echo
+				return 1
+			else
+				success
+			fi
+			echo
+			sleep 2
+		else
+			echo
+			return 1
+		fi
+	fi
+	echo -ne "Fixing Permissions:\t"
+	if ! chown -R $USER_SPEC $DATA_DIR && failure 
+	then
+		echo
+		return 1
+	fi
+		success
+	echo
+	return 0
+}
+
+function clean_ldm() {
+
+	echo -ne "Cleaning LDM:\t"
+	su ldm -lc "ldmadmin clean" > /dev/null 2>&1 && success || failure
+	myRetVal=$?
+        if [[ ${myRetVal} -ne 0 ]]
+        then
+                return ${myRetVal}
+        fi
+	echo
+
+	if [[ -f $PROD_QUEUE ]] 
+	then
+		echo -ne "\nDeleting the ldm queue:\t"
+		su ldm -lc "ldmadmin delqueue" > /dev/null 2>&1 && success || failure
+		echo
+	fi
+        echo -ne "\nCreating the ldm queue:\t"
+        su ldm -lc "ldmadmin mkqueue" > /dev/null 2>&1 && success || failure
+	myRetVal=$?
+        echo
+	return ${myRetVal}
+}
+
+case $1 in
+
+'start')
+#	if ! handle_ramdisk; then exit 1 ; fi
+	if ! clean_ldm; then exit 1 ; fi
+
+	echo -n "Starting RaFTR LDM processes:"
+	su - ldm -c "ldmadmin start"
+	if [ $? -eq 0 ]
+	then
+		RETVAL=0
+		touch $LOCKFILE
+		success  && echo
+	else
+		RETVAL=1
+		failure && echo
+	fi
+	;;
+
+'stop')
+	echo -n "Stopping RaFTR LDM processes:"
+	su - ldm -c "ldmadmin stop"
+	if [ $? -eq 0 ] 
+	then
+		RETVAL=0
+		rm -f $LOCKFILE
+		success && echo
+	else
+		RETVAL=1
+		failure && echo
+	fi
+	;;
+
+*)
+	echo "usage: $0 {start|stop}"
+	RETVAL=1
+	;;
+
+esac
+
+exit $RETVAL
diff --git a/fileIngest/ldmProductQueue.c b/fileIngest/ldmProductQueue.c
new file mode 100644
index 000000000..6de96d01c
--- /dev/null
+++ b/fileIngest/ldmProductQueue.c
@@ -0,0 +1,236 @@
+/*
+ *   Copyright 2013, University Corporation for Atmospheric Research.
+ *   All rights reserved.
+ *   See file COPYRIGHT in the top-level source-directory for copying and
+ *   redistribution conditions.
+ */
+/*
+ * This module comprises a thread-safe wrapper around the LDM product-queue.
+ */
+#include "config.h"
+
+#include "log.h"
+#include "ldmProductQueue.h"    /* Eat own dog food */
+#include "ldm.h"
+#include "pq.h"
+#include "globals.h"
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct LdmProductQueue {
+    char*           path;       /**< Pathname of the LDM product-queue */
+    pqueue*         pq;         /**< The actual LDM product-queue */
+    pthread_mutex_t mutex;      /**< concurrent-access mutex */
+};
+
+/**
+ * Returns the pathname of the LDM product-queue.
+ *
+ * @return Pathname of the LDM product-queue.
+ */
+const char* lpqGetQueuePath(void)
+{
+    return
+        getQueuePath();
+}
+
+/**
+ * Returns the LDM product-queue that corresponds to a pathname.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success.
+ * @retval 1    Precondition failure. \link log_add() \endlink called.
+ * @retval 2    O/S failure. \link log_add() \endlink called.
+ * @retval 3    Couldn't open product-queue. \link log_add() \endlink called.
+ */
+int lpqGet(
+    const char*             pathname,   /**< [in] LDM product-queue pathname or
+                                          *  NULL to obtain the default queue */
+    LdmProductQueue** const lpq)        /**< [out] Pointer to pointer to be set
+                                         *  to address of corresponding LDM
+                                         *  product-queue. */
+{
+    int                         status = 0;     /* default success */
+    static pthread_mutex_t      mutex = PTHREAD_MUTEX_INITIALIZER;
+
+    if ((status = pthread_mutex_lock(&mutex)) != 0) {
+        log_errno(status, "Couldn't lock mutex");
+        status = 2;
+    }
+    else {
+        int                         queueIndex;     /* index of queue */
+        static int                  queueCount = 0; /* number of queues */
+        static LdmProductQueue**    queues;         /* array of unique queues */
+
+        if (NULL == pathname) {
+            pathname = getQueuePath();
+        }
+
+        for (queueIndex = 0; queueIndex < queueCount; queueIndex++) {
+            if (strcmp(queues[queueIndex]->path, pathname) == 0)
+                break;
+        }
+
+        if (queueIndex >= queueCount) {
+            LdmProductQueue**    newArray = (LdmProductQueue**)realloc(queues,
+                    (queueCount+1)*sizeof(LdmProductQueue*));
+
+            if (NULL == newArray) {
+                log_syserr("Unable to allocate new LdmProductQueue array: "
+                        "queueCount=%d", queueCount);
+                status = 2;
+            }
+            else {
+                LdmProductQueue*    newLpq =
+                    (LdmProductQueue*)malloc(sizeof(LdmProductQueue));
+
+                if (NULL == newLpq) {
+                    log_syserr("Unable to allocate new LdmProductQueue");
+                    status = 2;
+                }
+                else {
+                    pqueue* pq;
+                    int     err = pq_open(pathname, PQ_DEFAULT, &pq);
+
+                    if (err) {
+                        if (err > 0) {
+                            log_errno(err,
+                                    "Couldn't open product-queue \"%s\"",
+                                    pathname);
+                        }
+                        else {
+                            log_add(
+                                    "Couldn't open product-queue \"%s\": "
+                                    "pq_open() returned %d", pathname, err);
+                        }
+                        status = 3;
+                    }
+                    else {
+                        char* path = strdup(pathname);
+
+                        if (NULL == path) {
+                            log_syserr("Couldn't duplicate string \"%s\"",
+                                    pathname);
+                            status = 2;
+                        }
+                        else {
+                            pthread_mutex_t mutex;
+
+                            if ((status = pthread_mutex_init(&mutex, NULL)) !=
+                                    0) {
+                                log_errno(status,
+                                        "Couldn't initialize mutex");
+                                free(path);
+                                status = 2;
+                            }
+                            else {
+                                newLpq->path = path;
+                                newLpq->pq = pq;
+                                newLpq->mutex = mutex;
+                                newArray[queueCount++] = newLpq;
+                                queues = newArray;
+                            }
+                        } // `path` allocated
+
+                        if (0 != status)
+                            (void)pq_close(pq);
+                    }                       /* "pq" open */
+
+                    if (0 != status)
+                        free(newLpq);
+                }                           /* "newLpq" allocated */
+
+                if (0 != status)
+                    free(newArray);
+            }                               /* "newArray" allocated */
+        }                                   /* if new product-queue */
+
+        if (0 == status)
+            *lpq = queues[queueIndex];
+
+        (void)pthread_mutex_unlock(&mutex);
+    }                                       /* "mutex" locked */
+
+    return status;
+}
+
+/**
+ * Inserts a data-product into an LDM product-queue.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success. Product inserted into queue.
+ * @retval 1    Precondition failure. \link log_add() \endlink called.
+ * @retval 2    O/S error. \link log_add() \endlink called.
+ * @retval 3    Product already in queue.
+ * @retval 4    Product-queue error. \link log_add() \endlink called.
+ */
+int lpqInsert(
+    LdmProductQueue* const  lpq,    /**< LDM product-queue to insert data-
+                                     *   product into. */
+    const product* const    prod)   /**< LDM data-product to be inserted */
+{
+
+    int status = 0;                 /* default success */
+
+    if ((status = pthread_mutex_lock(&lpq->mutex)) != 0) {
+        log_errno(status, "Couldn't lock mutex");
+        status = 2;
+    }
+    else {
+        if ((status = pq_insert(lpq->pq, prod)) != 0) {
+            if (PQUEUE_DUP == status) {
+                status = 3;
+            }
+            else {
+                log_add("Couldn't insert product into queue: status=%d",
+                        status);
+                status = 4;
+            }
+        }
+
+        (void)pthread_mutex_unlock(&lpq->mutex);
+    }                                   /* "lpq->mutex" locked */
+
+    return status;
+}
+
+/**
+ * Closes an LDM product-queue.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success. Product inserted into queue.
+ * @retval 1    Precondition failure. \link log_add() \endlink called.
+ * @retval 2    O/S error. \link log_add() \endlink called.
+ */
+int lpqClose(
+    LdmProductQueue* const  lpq)    /**< LDM product-queue */
+{
+    int status;
+
+    if ((status = pthread_mutex_lock(&lpq->mutex)) != 0) {
+        log_errno(status, "Couldn't lock mutex");
+        status = 2;
+    }
+    else {
+        if ((status = pq_close(lpq->pq)) != 0) {
+            if (EOVERFLOW == status) {
+                log_add("LDM product-queue is corrupt");
+                status = 1;             /* precondition error */
+            }
+            else {
+                log_syserr("Couldn't close LDM product-queue");
+                status = 2;
+            }
+        }
+
+        (void)pthread_mutex_unlock(&lpq->mutex);
+    }
+
+    return status;
+}
diff --git a/fileIngest/ldmProductQueue.h b/fileIngest/ldmProductQueue.h
new file mode 100644
index 000000000..962818c45
--- /dev/null
+++ b/fileIngest/ldmProductQueue.h
@@ -0,0 +1,65 @@
+/*
+ *   Copyright 2011, University Corporation for Atmospheric Research.
+ *   See file COPYRIGHT for copying and redistribution conditions.
+ */
+
+#ifndef LDM_PRODUCT_QUEUE_H
+#define LDM_PRODUCT_QUEUE_H
+
+#include "ldm.h"
+
+typedef struct LdmProductQueue  LdmProductQueue;
+
+/**
+ * Returns the pathname of the LDM product-queue.
+ *
+ * @return Pathname of the LDM product-queue.
+ */
+const char* lpqGetQueuePath(void);
+
+/**
+ * Returns the LDM product-queue that corresponds to a pathname.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success.
+ * @retval 1    Precondition failure. \link log_start() \endlink called.
+ * @retval 2    O/S failure. \link log_start() \endlink called.
+ * @retval 3    Couldn't open product-queue. \link log_start() \endlink called.
+ */
+int lpqGet(
+    const char*             pathname,   /**< [in] LDM product-queue pathname or
+                                          *  NULL to obtain the default queue */
+    LdmProductQueue** const lpq)        /**< [out] Pointer to pointer to be set
+                                         *  to address of corresponding LDM
+                                         *  product-queue. */;
+
+/**
+ * Inserts a data-product into an LDM product-queue.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success. Product inserted into queue.
+ * @retval 1    Precondition failure. \link log_start() \endlink called.
+ * @retval 2    O/S error. \link log_start() \endlink called.
+ * @retval 3    Product already in queue.
+ * @retval 4    Product-queue error. \link log_start() \endlink called.
+ */
+int lpqInsert(
+    LdmProductQueue* const  lpq,    /**< LDM product-queue to insert data-
+                                     *   product into. */
+    const product* const    prod)   /**< LDM data-product to be inserted */;
+
+/**
+ * Closes an LDM product-queue.
+ *
+ * This function is thread-safe.
+ *
+ * @retval 0    Success. Product inserted into queue.
+ * @retval 1    Precondition failure. \link log_start() \endlink called.
+ * @retval 2    O/S error. \link log_start() \endlink called.
+ */
+int lpqClose(
+    LdmProductQueue* const  lpq)    /**< LDM product-queue */;
+
+#endif
diff --git a/fileIngest/ldmd.conf b/fileIngest/ldmd.conf
new file mode 100644
index 000000000..f20b2f86b
--- /dev/null
+++ b/fileIngest/ldmd.conf
@@ -0,0 +1,137 @@
+#####
+# Sample ldmd.conf for ldmd(1)
+####
+#
+# This is the main configuration file for the LDM server. All lines that start
+# with a "#" sign are comments.
+#
+# To debug an LDM that hangs on start up, run the following from LDM home:
+# % bin/ldmd -vl- etc/ldmd.conf
+#
+# If the LDM still hangs, comment out all lines in this file except noted
+# allow line entry below and try again.
+#
+###############################################################################
+# WARNING: Pathological Product-ID Patterns
+###############################################################################
+#
+# The REQUEST and ACCEPT entries both have product-ID patterns that are regular
+# expressions (RE-s).  It is EXTREMELY IMPORTANT that these patterns not have a
+# ".*" prefix because: 1) such a prefix accomplishes nothing (i.e., the set of
+# possible matches is unaltered by the prefix); and 2) such a prefix causes the 
+# RE to take MUCH, MUCH LONGER TO EXECUTE (by 3 orders of magnitude in some
+# cases).  Therefore, DO NOT USE RE-s like
+#
+#     ".*UFPBA"
+#
+# Instead, simply use
+#
+#     "UFPBA"
+#
+# The regex(1) utility of this package can be used to examine the efficiency
+# of an RE.
+#
+###############################################################################
+# Include Statements
+###############################################################################
+#
+# It's possible to include other files by uncommented-out statements
+# like the following:
+#
+#INCLUDE pathname
+#INCLUDE "pathname with spaces"
+#
+# Non-absolute pathnames are relative to the directory that contains the
+# configuration-file with the include statement.
+#
+###############################################################################
+# Exec Entries
+###############################################################################
+#
+# Programs that can share a queue with the ldmd(1) server, these programs
+# are started by the "exec" command and are in the same process group.
+#
+# Start fileIngester
+#
+EXEC	"fileIngester -p /data/co/raftr/input -L /data/ldm/logs -M /data/ldm/logs -o LDM -q /data/ldm/data/ldm.pq -D4 -i2 -a300"
+#
+###############################################################################
+# Request Entries
+###############################################################################
+#
+# Request data-products from upstream LDM-s.  The syntax is
+#
+#	REQUEST	<feedset> <pattern> <host>[:<port>]
+#
+# where:
+#	<feedset>	Is the union of feedtypes to request.
+#	<pattern>	Is an extended regular-expression for the product-
+#			identifiers to match.
+#	<host>		Is the host identifier: either a hostname or IP
+#			address in "dotted-quad" format.
+#	<port>		Is the (optional) port on <host> to which to connect
+#			(the square brackets denote an option and should be
+#			omitted).
+#
+# If the same feedtype and pattern is requested from multiple hosts, then
+# the host of the first such request will be the initial primary source
+# of data-products (i.e., data-products will be rapidly sent using the
+# HEREIS message) and the other hosts will initially be alternate sources of
+# data-products (i.e., data will be sent using the COMMINGSOON and BLKDATA
+# messages).  The primary host will probably change over time -- depending on
+# which host can deliver the data-products most quickly on average.
+#
+#REQUEST WMO ".*" initial-primary-host.some.domain:388
+#REQUEST WMO ".*" initial-secondary-host.another.domain
+#REQUEST WMO ".*" another-secondary-host.yet_another.domain:3152
+#
+###############################################################################
+# Allow Entries
+###############################################################################
+#
+# Give permission to downstream LDM-s to request data-products from your LDM.
+#
+# ALLOW	<feedset> <hostname pattern> [<OK pattern> [<not pattern>]]
+#
+# where:
+#	<feedset>		is the set of feedtypes for this entry
+#	<hostname pattern>	is an extended regular-expression that specifies
+#				which hosts are allowed to receive data-products
+#				whose feedtype is in <feedset>.
+#	<OK pattern>		is an optional extended regular-expression that
+#				a product-identifier must match in order to be
+#				sent to the requesting LDM.  The default value
+#				is ".*".
+#	<not pattern>		is an optional extended regular-expression that
+#				a product-identifier must NOT match in order to
+#				be sent to the requesting LDM.  If this field is
+#				empty, then such matching will be disabled for
+#				this entry.
+#
+# Under no circumstances comment out the next allow entry to localhost
+# The LDM will NOT start if the entry is commented-out.
+ALLOW	ANY	^((localhost|loopback)|(127\.0\.0\.1\.?$))
+#
+# Give permission to the Unidata Program Center
+ALLOW	ANY	^[a-z].*\.unidata\.ucar\.edu\.?$
+#
+###############################################################################
+# Accept Entries
+###############################################################################
+# ACCEPT: Who can feed us without be requested by a REQUEST entry, currently
+# this action is ONLY needed for WSI data
+#
+# ACCEPT <feedset> <pattern> <hostname pattern>
+#
+# ACCEPT anything from yourself
+#
+#ACCEPT ANY ".*" ^((localhost|loopback)|(127\.0\.0\.1\.?$))
+#
+# accept from your upstream site
+#
+# WSI is using ldm4 protocol so the accept is still required
+#ACCEPT	WSI .* ^[a-z].*\.uni\.wsicorp\.com$
+#
+###############################################################################
+# End 
+###############################################################################
diff --git a/fileIngest/log_tester.c b/fileIngest/log_tester.c
new file mode 100644
index 000000000..6beb67fcc
--- /dev/null
+++ b/fileIngest/log_tester.c
@@ -0,0 +1,127 @@
+/*
+ * log_tester.c
+ *
+ *  Created on: Nov 29, 2013
+ *      Author: brapp
+ */
+
+
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <time.h>
+#include <signal.h>
+#include "stdclib.h"
+#include "mlogger.h"
+
+#define DEF_LOG_SIZE			(4 * 1024 * 1024)
+#define TRACE_LOG_SIZE			(100 * 1024 * 1024)
+#define LOG_BUFFER_SIZE			1024
+#define COMMON_OPTS			(O_ARCHIVE | O_TIMESTAMP | O_KEEP_OPEN | O_ADD_NEWLINE | O_FLUSH_AFTER_EACH)
+#define PROD_LOG_OPTS			(COMMON_OPTS)
+#define ERR_LOG_OPTS			(COMMON_OPTS | O_LOG_INIT | O_SHOW_SEVERITY)
+
+LOGGER		*eLog;
+LOGGER		*pLog;
+int		Done;
+int		ei	= 0;
+int		pi	= 0;
+
+static void setExitFlag (int signum) {
+
+	/* set global flag for termination	*/
+	Done = TRUE;
+
+	logMsg (eLog, V_INFO, S_STATUS,
+		"Received signal %d, setting exit flag", signum);
+}
+
+static int initLogs () {
+
+	pLog = logInitLogger ("Product Log", F_FILE, PROD_LOG_OPTS, V_ERROR,
+			"/home/brapp/test", "test.product.log", TRACE_LOG_SIZE, LOG_BUFFER_SIZE);
+	if (!pLog) {
+		fprintf (stderr, "FATAL: %s - could not open transaction log\n", __FUNCTION__);
+		return 1;
+	}
+
+	eLog = logInitLogger ("Error Log", F_FILE, ERR_LOG_OPTS, V_DEBUG,
+			"/home/brapp/test", "test.error.log", TRACE_LOG_SIZE, LOG_BUFFER_SIZE);
+	if (!eLog) {
+		fprintf (stderr, "FATAL: %s - could not open transaction log\n", __FUNCTION__);
+		return 1;
+	}
+
+	return 0;
+}
+
+static void setupSigHandler () {
+	struct sigaction act;
+	static const char fname[40+1]="setupSigHandler";
+
+	/* SIGUSR1 will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = setExitFlag;
+	act.sa_flags=0;
+	if (sigaction (SIGUSR1, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGUSR1, strerror(errno));
+	}
+
+	/* SIGTERM will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = setExitFlag;
+	act.sa_flags=0;
+	if (sigaction (SIGTERM, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGTERM, strerror(errno));
+	}
+
+	/* SIGHUP will exit the process	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = setExitFlag;
+	act.sa_flags=0;
+	if (sigaction (SIGHUP, &act, 0) == -1) {
+		logMsg (eLog, V_ERROR, S_ERROR,
+			"(%s) - Sigaction FAIL sig=%d, act=sigexitnow, %s\n",
+			fname, SIGHUP, strerror(errno));
+	}
+
+	return;
+}
+
+
+static void atExitHandler () {
+
+	logShutdown ();
+	puts ("Shutting Down.");
+}
+
+int main (int argc, char **argv) {
+
+	Done = FALSE;
+
+	initLogs ();
+
+	atexit (&atExitHandler);
+	setupSigHandler ();
+
+	while (!Done) {
+		logMsg (eLog, V_ALWAYS, S_STATUS, "Error Message #%d", ++ei);
+//		logMsg (pLog, V_ALWAYS, S_STATUS, "Product Message #%d", ++pi);
+//		usleep (100000);
+	}
+
+	return 0;
+}
diff --git a/fileIngest/mlogger.c b/fileIngest/mlogger.c
new file mode 100644
index 000000000..4da90658d
--- /dev/null
+++ b/fileIngest/mlogger.c
@@ -0,0 +1,1449 @@
+/* -----------------------------------------------------------------------------
+ *
+ * File Name:
+ *	mlogger.c
+ *
+ * Description:
+ *	This file defines the mlogger logging system.  The 'm' is for "Multi"
+ *	because it is designed to support multiple output types.  Currently, only
+ *	file types are supported, but it has the beginnings of support for also
+ *	logging to pipes, sockets, terminals, printers, and databases using the
+ *	same common interface. To add the additional support types, XML files
+ *	support will be added to simplify configuration.
+ *
+ * Public functions defined:
+ *	 logOpen
+ *	 logClose
+ *	 logInitLogger
+ *	 logCloseLogger
+ *	 logShutdown
+ *	 logSetLogLevel
+ *	 logMsg
+ *
+ * Private functions defined:
+ *	logOpenFile
+ *	logOpenDB
+ *	logOpenSocket
+ *	logOpenPipe
+ *	logOpenConsole
+ *	logOpenPrinter
+ *	logCloseFile
+ *	logCloseDB
+ *	logCloseSocket
+ *	logClosePipe
+ *	logCloseConsole
+ *	logClosePrinter
+ *	archiveLog
+ *	checkLogRollover
+ *
+ * Author:
+ * 	Brian M Rapp		17-Nov-2013
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+ * --------------------------------------------------------------------------- */
+
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <signal.h>
+
+#include "../fileIngest/stdclib.h"
+#include "../fileIngest/mlogger.h"
+
+#define DIRECTORY_CREATE_PERMS		(S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)
+#define	SECONDS_PER_DAY			(24 * 60 * 60)
+
+static LOGGER_HDR	loggerStore;
+static char		*logSeverityStrings[6] = { "FATAL", "ERROR", "WARNING", "STATUS", "DEBUG", "TRACE" };
+static char		*logVerbosityStrings[5] = { "ALWAYS", "ERROR", "INFO", "DEBUG", "TRACE" };
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenFile
+ *
+ * Format
+ *	static int logOpenFile (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined file for appending.  The location must be
+ *	accessible by the user context this is executed by.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenFile (LOGGER *p_logger) {
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if ((p_logger->fullLogName == NULL) || (p_logger->fullLogName[0] == '\0')) {
+		fprintf (stderr, "ERROR: %s - NULL log name\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	/* If it's not already open, open it */
+	if (p_logger->logFd == NULL) {
+		if ((p_logger->logFd = fopen (p_logger->fullLogName, "a")) == NULL) {
+			fprintf (stderr, "ERROR: %s - Could not open log file %s\n", __FUNCTION__, p_logger->fullLogName);
+			return ERROR;
+		}
+	}
+
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenDB
+ *
+ * Format
+ *	static int logOpenDB (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined database log for appending.  The location must be
+ *	accessible by the user context this is executed by.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenDB (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenSocket
+ *
+ * Format
+ *	static int logOpenSocket (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined socket for writing.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenSocket (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenPipe
+ *
+ * Format
+ *	static int logOpenPipe (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined named pipe for appending.  The location must be
+ *	accessible by the user context this is executed by and there must
+ *	be a pipe-reading process.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenPipe (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenConsole
+ *
+ * Format
+ *	static int logOpenConsole (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined console device for appending.  The device must be
+ *	accessible by the user context this is executed by.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenConsole (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logOpenPrinter
+ *
+ * Format
+ *	static int logOpenPrinter (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logOpen to open a
+ *	previously-defined printer for appending.  The device must be
+ *	accessible by the user context this is executed by.
+ *
+ * Return Values
+ * 	0	Success
+ * 	1	Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpenPrinter (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	logOpen
+ *
+ * Format
+ *	static int logOpen (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	Open all devices for this logger for output.
+ *
+ * Return Values
+ *	0 - Success
+ *	1 - Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logOpen (LOGGER *p_logger) {
+
+	int	retval	= SUCCESS;
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	switch (p_logger->facility) {
+		case F_FILE:
+			retval = logOpenFile (p_logger);
+			break;
+
+		case F_DB:
+			retval = logOpenDB (p_logger);
+			break;
+
+		case F_SOCKET:
+			retval = logOpenSocket (p_logger);
+			break;
+
+		case F_PIPE:
+			retval = logOpenPipe (p_logger);
+			break;
+
+		case F_CONSOLE:
+			retval = logOpenConsole (p_logger);
+			break;
+
+		case F_PRINTER:
+			retval = logOpenPrinter (p_logger);
+			break;
+
+		default:	/* Shouldn't ever get here... */
+			break;
+	}
+
+	return retval;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logCloseFile
+ *
+ * Format
+ *	static int logCloseFile (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	file defined in the specified logger.  If the file is not open,
+ *	it will simply return SUCCESS.
+ *
+ * Return Values
+ * 	0	- Success
+ * 	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logCloseFile (LOGGER *p_logger) {
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (p_logger->logFd == NULL) {
+		return SUCCESS;
+	}
+
+	if (fclose (p_logger->logFd)) {
+		fprintf (stderr, "ERROR: %s - %d returned by fclose\n", __FUNCTION__, errno);
+		return ERROR;
+	}
+
+	p_logger->logFd = NULL;
+
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logCloseDB
+ *
+ * Format
+ *	static int logCloseDB (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	database connection defined in the specified logger.  If the connection
+ *	is not open, it will simply return SUCCESS.
+ *
+ * Return Values
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logCloseDB (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logCloseSocket
+ *
+ * Format
+ *	static int logCloseSocket (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	socket defined in the specified logger.  If the socket is not open,
+ *	it will simply return SUCCESS.
+ *
+ * Return Values
+ * 	0	- Success
+ * 	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logCloseSocket (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logClosePipe
+ *
+ * Format
+ *	static int logClosePipe (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	named pipe defined in the specified logger.  If the pipe is not open,
+ *	it will simply return SUCCESS.
+ *
+ * Return Values
+ * 	0	- Success
+ * 	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logClosePipe (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logCloseConsole
+ *
+ * Format
+ *	static int logCloseConsole (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	console device defined in the specified logger.  If the device is
+ *	not open, it will simply return SUCCESS.
+ *
+ * Return Values
+ * 	0	- Success
+ * 	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logCloseConsole (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logClosePrinter
+ *
+ * Format
+ *	static int logClosePrinter (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	This static function is called internally by logClose to close a
+ *	printer device defined in the specified logger.  If the printer
+ *	device is not open, it will simply return SUCCESS.
+ *
+ * Return Values
+ * 	0	- Success
+ * 	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logClosePrinter (LOGGER *p_logger) {
+
+	fprintf (stderr, "INFO: %s - function not yet implemented\n", __FUNCTION__);
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	logClose
+ *
+ * Format
+ *	static int logClose (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	Close all devices for this logger for output.
+ *
+ * Return Values
+ *	0 - Success
+ *	1 - Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int logClose (LOGGER *p_logger) {
+
+	int	retval	= SUCCESS;
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	switch (p_logger->facility) {
+		case F_FILE:
+			retval = logCloseFile (p_logger);
+			break;
+
+		case F_DB:
+			retval = logCloseDB (p_logger);
+			break;
+
+		case F_SOCKET:
+			retval = logCloseSocket (p_logger);
+			break;
+
+		case F_PIPE:
+			retval = logClosePipe (p_logger);
+			break;
+
+		case F_CONSOLE:
+			retval = logCloseConsole (p_logger);
+			break;
+
+		case F_PRINTER:
+			retval = logClosePrinter (p_logger);
+			break;
+
+		default:	/* Shouldn't ever get here... */
+			break;
+	}
+
+	return retval;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	archiveLog
+ *
+ * Format
+ *	static int archiveLog (LOGGER *p_logger, char *archiveDate)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ *	archiveDate
+ *	Date string to be used as subdirectory for the archived file
+ *
+ * Description
+ *	Move the current log file to the archive directory, creating it if it
+ *	does already exist.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int archiveLog (LOGGER *p_logger, char *archiveDate) {
+
+	int		retval	= SUCCESS;
+	char		archivePath[LOG_MAX_PATH_LEN+1];
+	char		*fname;
+	char		*ext;
+	char		timeStr[64];	/* .HH.MM.SS */
+	char		newName[LOG_MAX_FILENAME_LEN+1];
+	struct tm	*lt;
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	sprintf (archivePath, "%s/%s", p_logger->archivePath, archiveDate);
+	if (!fileExists (archivePath)) {
+		if (makeDirectory (archivePath, YES, DIRECTORY_CREATE_PERMS)) {
+			fprintf (stderr, "ERROR: %s - could not create directory %s\n", __FUNCTION__, archivePath);
+			retval = ERROR;
+		}
+	}
+
+	fname = strdup (p_logger->logName);
+	splitFilenameExt (fname, &ext);		/* Remove the extension, if there is one */
+
+	lt = localtime (&p_logger->lastLogTime);
+	sprintf (timeStr, "%02d.%02d.%02d", lt->tm_hour, lt->tm_min, lt->tm_sec);
+
+	sprintf (newName, "%s/%s.%s", archivePath, fname, timeStr);
+	free (fname);
+
+	if (p_logger->optionMask & O_LOG_INIT) {
+		p_logger->amArchiving = TRUE;
+		logMsg (p_logger, V_ALWAYS, S_STATUS, "%s ARCHIVED TO %s", p_logger->name, newName);
+		p_logger->amArchiving = FALSE;
+	}
+
+	logClose (p_logger);
+
+	if (moveFile (p_logger->fullLogName, newName, NO)) {
+		fprintf (stderr, "ERROR: %s - could not move %s to %s\n", __FUNCTION__, p_logger->fullLogName, archivePath);
+		retval = ERROR;
+	}
+
+	return retval;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	checkLogRollover
+ *
+ * Format
+ *	static void checkLogRollover (LOGGER *p_logger)
+ *
+ * Arguments
+ *	p_logger
+ *	Pointer to initialized logger
+ *
+ * Description
+ *	If the date has changed since the last log message or if the current
+ *	log file has exceeded the maximum allowable size, roll it over to a
+ *	new file.  If the O_ARCHIVE option is set for this logger,
+ *	then call archiveLog to write it to the archive directory.  Otherwise,
+ *	move it to "<log>.old".
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void checkLogRollover (LOGGER *p_logger) {
+
+	char		archiveDate[LOG_SIZE_ARCHIVE_DATE+1];
+	time_t		now;
+
+	if (p_logger == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return;
+	}
+
+	if (!(p_logger->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return;
+	}
+
+	if ((p_logger->lastLogTime == 0) || (p_logger->logSize == 0))
+		return;
+
+	if ((p_logger->optionMask & O_ARCHIVE)) {
+		now = time (NULL);
+		/* Check if date changed since last run or log reached rollover size and archive it if so */
+		if (((now / 86400) != p_logger->lastLogDay) ||
+		   (p_logger->rollOverSize && (p_logger->logSize >= p_logger->rollOverSize))) {
+			strftime (archiveDate, LOG_SIZE_ARCHIVE_DATE+1, "%b%d", localtime (&p_logger->lastLogTime));
+			if (archiveLog(p_logger, archiveDate) == 0) {
+				p_logger->lastLogDay = p_logger->lastLogTime = 0;
+				p_logger->logSize = 0;
+			}
+
+			if (p_logger->optionMask & O_KEEP_OPEN) {
+				logOpen (p_logger);
+			}
+		}
+	} else {
+		if (p_logger->rollOverSize && (p_logger->logSize >= p_logger->rollOverSize)) {
+			char	*oldExt = ".old";
+			char	*fname = strdup (p_logger->logName);
+			char	*newName = malloc (strlen (p_logger->fullLogName) + strlen (oldExt) + 1);	/* Reserve characters for old extension */
+			char	*ext;
+
+			splitFilenameExt (fname, &ext);
+			sprintf (newName, "%s/%s.%s", p_logger->logPath, fname, oldExt);
+
+			if (p_logger->optionMask & O_LOG_INIT) {
+				p_logger->amArchiving = TRUE;
+				logMsg (p_logger, V_ALWAYS, S_STATUS, "%s TERMINATED %s FILE SIZE %d RENAMED TO %s",
+					p_logger->name, p_logger->fullLogName, p_logger->logSize, newName);
+				p_logger->amArchiving = FALSE;
+			}
+
+			logClose (p_logger);
+			if (moveFile (p_logger->fullLogName, newName, TRUE)) {
+				fprintf (stderr, "ERROR: %s - could not move %s to %s\n", __FUNCTION__, p_logger->fullLogName, newName);
+			}
+			p_logger->lastLogDay = p_logger->lastLogTime = 0;
+			p_logger->logSize = 0;
+
+			if (p_logger->optionMask & O_KEEP_OPEN) {
+				logOpen (p_logger);
+			}
+
+			free (newName);
+			free (fname);
+		}
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logInitLogger
+ *
+ * Format
+ *	LOGGER *logInitLogger (char *name, int facility, int options, int verbosity, char *logPath,
+ *		char *logName, long rollOverSize, long bufferSize)
+ *
+ * Arguments
+ *	name
+ *	Text string containing printable log name
+ *
+ *	facility
+ *	Type of log:
+ *		F_FILE
+ *		F_DB
+ *		F_SOCKET
+ *		F_PIPE
+ *		F_CONSOLE
+ *		F_PRINTER
+ *	Currently, only F_FILE is supported.
+ *
+ *	options
+ *	Bit-masked options to use for this logger:
+ *		O_FLUSH_AFTER_EACH	- Flush after each message
+ *		O_TIMED_FLUSH		- Flush periodically (flushInterval)
+ *		O_ARCHIVE		- Create daily archives
+ *		O_TIMESTAMP		- Include timestamp in each message (microseconds)
+ *		O_CONCURRENT		- Reserved
+ *		O_KEEP_OPEN		- Log file always kept open
+ *		O_SHOW_LEVEL		- Write Visibility/Verbosity of each message
+ *		O_SHOW_SEVERITY		- Write Severity of each message
+ *		O_ADD_NEWLINE		- Put a \n at the end of each line
+ *		O_LOG_INIT		- Include log event messages
+ *
+ *	verbosity
+ *	Maximum level of messages that will be logged.  Verbosity/visibility levels from
+ *	most restrictive to least:
+ *		V_ALWAYS
+ *		V_ERROR
+ *		V_INFO
+ *		V_DEBUG
+ *		V_TRACE
+ *
+ *	logPath
+ *	Path specification for the log; does not include file name.
+ *
+ *	logName
+ *	Name of log file.  Concatenated to logPath.
+ *
+ *	rollOverSize
+ *	Maximum log size before rolling over to a new log file.
+ *
+ *	bufferSize
+ *	Size to reserve internally for individual log messages.
+ *
+ * Description
+ *	Initializes a new logger with the provided parameters.  This function
+ *	must be called before a logger can be used.
+ *
+ * Return Values
+ *	NULL		- Error
+ *	non-NULL	- Success
+ *
+ * -------------------------------------------------------------------------- */
+
+LOGGER *logInitLogger (char *name, int facility, int options, int verbosity, char *logPath,
+			char *logName, long rollOverSize, long bufferSize) {
+
+	LOGGER 		*pl;
+	int		i;
+	struct stat	sb;
+
+	if ((logPath == NULL) || (logPath[0] == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid logPath passed\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((logName == NULL) || (logName[0] == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid logName passed\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((facility < F_MIN) || (facility > F_MAX)) {
+		fprintf (stderr, "ERROR: %s - Unknown facility %d\n", __FUNCTION__, facility);
+		return NULL;
+	}
+
+	if (facility != F_FILE) {
+		fprintf (stderr, "ERROR: %s - The only facility current supported is F_FILE (%d)\n",
+			__FUNCTION__, F_FILE);
+		return NULL;
+	}
+
+	if ((options & O_FLUSH_AFTER_EACH) && (options & O_TIMED_FLUSH)) {
+		fprintf (stderr, "ERROR: %s - O_FLUSH_AFTER_EACH and O_TIMED_FLUSH cannot both be set\n",
+			__FUNCTION__);
+		return NULL;
+	}
+
+	verbosity = (verbosity < V_MIN) ? V_MIN : verbosity;
+	verbosity = (verbosity > V_MAX) ? V_MAX : verbosity;
+
+	if (loggerStore.count == 0) {
+		i = 0;
+		if ((loggerStore.loggers = (LOGGER **) malloc (sizeof (LOGGER *))) == NULL) {
+			fprintf (stderr, "ERROR: %s - Could not malloc space for loggerStore array\n", __FUNCTION__);
+			return NULL;
+		}
+
+		if ((loggerStore.loggers[0] = (LOGGER *) malloc (sizeof (LOGGER))) == NULL) {
+			fprintf (stderr, "ERROR: %s - Could not malloc space for logger node\n", __FUNCTION__);
+			return NULL;
+		}
+	} else {	/* Try to find an allocated logger that's not being used */
+		for (i = 0; i < loggerStore.count; i++) {
+			if (!(loggerStore.loggers[i]->optionMask & NODE_IN_USE)) {
+				break;
+			}
+		}
+
+		if (i >= loggerStore.count) {
+			if ((loggerStore.loggers = (LOGGER **) realloc (loggerStore.loggers, sizeof (LOGGER *) * (loggerStore.count+1))) == NULL) {
+				fprintf (stderr, "ERROR: %s - Could not realloc loggerStore\n", __FUNCTION__);
+				return NULL;
+			}
+
+			if ((loggerStore.loggers[i] = (LOGGER *) malloc (sizeof (LOGGER))) == NULL) {
+				fprintf (stderr, "ERROR: %s - Could not malloc space for logger node\n", __FUNCTION__);
+				return NULL;
+			}
+		}
+
+	}
+
+	pl = loggerStore.loggers[i];
+	pl->index = i;
+
+	loggerStore.count++;
+	pl->name = strdup (name);
+	options |= NODE_IN_USE;
+	pl->optionMask		= options;		/* Set the LOG_IN_USE bit and the flags passed in */
+	pl->verbosity		= verbosity;
+	pl->facility		= facility;		/* Only supports LOG_FILE now...how to implement others? */
+	pl->bufferSize		= bufferSize;
+	pl->logFd		= NULL;
+	pl->needFlush		= FALSE;
+	pl->flushInterval	= LOG_DEFAULT_FLUSH_INTERVAL;
+	pl->timerSignal		= SIGRTMIN;
+	pl->flushBufSize	= 0;
+	pl->amArchiving		= FALSE;
+
+//	switch (p_logger->facility) {
+//		case F_FILE:
+//			retval = logInitFile (p_logger);
+//			break;
+//
+//		case F_DB:
+//			retval = logInitDB (p_logger);
+//			break;
+//
+//		case F_SOCKET:
+//			retval = logInitSocket (p_logger);
+//			break;
+//
+//		case F_PIPE:
+//			retval = logInitPipe (p_logger);
+//			break;
+//
+//		case F_CONSOLE:
+//			retval = logInitConsole (p_logger);
+//			break;
+//
+//		case F_PRINTER:
+//			retval = logInitPipe (p_logger);
+//			break;
+//
+//		default:	/* Shouldn't ever get here... */
+//			fprintf ("ERROR: %s - hit default case\n", __FUNCTION__);
+//			break;
+//	}
+
+	/* Force rollover size to LOG_MAX_FILE_SIZE if user leaves it set to 0 */
+	pl->rollOverSize = rollOverSize ? rollOverSize : LOG_MAX_FILE_SIZE;
+
+	if ((pl->logPath = strdup (logPath)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not strdup logPath\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((pl->logName = strdup (logName)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not strdup logName\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((pl->fullLogName = malloc (strlen (logPath) + strlen (logName) + 2)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not malloc fullLogName\n", __FUNCTION__);
+		return NULL;
+	}
+
+	sprintf (pl->fullLogName, "%s/%s", logPath, logName);
+
+	/* This is kludged for now, allow it to be specified later */
+	if ((pl->archivePath = malloc (strlen (logPath) + strlen ("/ARCHIVE/MmmDd") + 1)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not malloc archivePath\n", __FUNCTION__);
+		return NULL;
+	}
+
+	sprintf (pl->archivePath, "%s/ARCHIVE", logPath);
+
+	if ((pl->timeFormat = strdup (LOG_DEFAULT_DATE_FORMAT)) == NULL) {	/* Hand jam this for now. In future make it configurable */
+		fprintf (stderr, "ERROR: %s - Could not strdup date format string\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((pl->buffer = malloc (bufferSize)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not malloc buffer\n", __FUNCTION__);
+		return NULL;
+	}
+
+	if ((pl->formatBuf = malloc (LOG_FORMAT_BUF_SIZE)) == NULL) {
+		fprintf (stderr, "ERROR: %s - Could not malloc format buffer\n", __FUNCTION__);
+		return NULL;
+	}
+
+	pl->lastLogDay = pl->lastLogTime = 0;
+
+	if (!fileExists (pl->logPath)) {
+		if (makeDirectory (pl->logPath, YES, DIRECTORY_CREATE_PERMS) < 0) {
+			fprintf (stderr, "ERROR: %s - Could not make directory for logPath\n", __FUNCTION__);
+			return NULL;
+		}
+	}
+
+	/* Cheat to get the device block size by checking on the block size of the logPath directory file */
+	pl->flushBufSize = (stat (pl->logPath, &sb) == 0) ? sb.st_blksize : DEFAULT_DISK_BLOCK_SIZE;
+
+	if (fileExists (pl->fullLogName)) {
+		pl->lastLogTime = getFileLastMod (pl->fullLogName);
+		pl->lastLogDay = pl->lastLogTime / SECONDS_PER_DAY;
+		pl->logSize = getFileSize (pl->fullLogName);
+		checkLogRollover (pl);		/* Rollover the log if necessary */
+	} else {
+		pl->lastLogDay = pl->lastLogTime = 0;
+		pl->logSize = 0;
+	}
+
+	if (options & O_LOG_INIT) {
+		logMsg (pl, V_INFO, S_STATUS, "%s INITIALIZED", pl->name);
+		if (!(options & O_KEEP_OPEN)) {
+			logClose (pl);
+		}
+	}
+
+	if (options & O_KEEP_OPEN) {
+		logOpen (pl);
+	}
+
+	return pl;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logCloseLogger
+ *
+ * Format
+ *	int logCloseLogger (LOGGER *pl)
+ *
+ * Arguments
+ *	pl
+ *	Pointer to logger
+ *
+ * Description
+ *	Closes a logger and releases all of its resources.  Only use if this
+ *	logger will no longer be used.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+int logCloseLogger (LOGGER *pl) {
+
+	if (pl == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(pl->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (pl->optionMask & O_LOG_INIT) {
+		logMsg (pl, V_INFO, S_STATUS, "%s HALTED", pl->name);
+	}
+
+	logClose (pl);
+
+	free (pl->archivePath);
+	free (pl->buffer);
+	free (pl->fullLogName);
+	free (pl->logName);
+	free (pl->logPath);
+	free (pl->timeFormat);
+	free (pl->formatBuf);
+	free (pl->name);
+
+	pl->logSize		= 0;
+	pl->lastLogTime		= 0;
+	pl->lastLogDay		= 0;
+	pl->rollOverSize	= 0;
+	pl->optionMask		= 0;	/* This turns off the IN_USE flag */
+	pl->verbosity		= 0;
+
+	loggerStore.count--;
+	/* If this is the last logger in the loggerStore array, free it */
+	if (pl->index == loggerStore.count) {
+		if (loggerStore.count > 0) {
+			if ((loggerStore.loggers = (LOGGER **) realloc (loggerStore.loggers, sizeof (LOGGER *) * (loggerStore.count))) == NULL) {
+				fprintf (stderr, "ERROR: %s - Could not realloc loggerStore\n", __FUNCTION__);
+				return ERROR;
+			}
+		} else {
+			free (loggerStore.loggers);
+		}
+	}
+
+	free (pl);
+
+	return SUCCESS;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logShutdown
+ *
+ * Format
+ *	void logShutdown
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Convenience function to shut down all open loggers.  Usually called
+ *	from an exit handler prior to program termination.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+void logShutdown () {
+	int	i;
+	int	count = loggerStore.count;	/* Must use a temporary variable since loggerStore.count gets decremented */
+
+	for (i = 0; i < count; i++) {
+		if (loggerStore.loggers[i]->optionMask & NODE_IN_USE) {
+			logCloseLogger (loggerStore.loggers[i]);
+		}
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logSetLogLevel
+ *
+ * Format
+ *	int logSetLogLevel (LOGGER *pl, int new_verb)
+ *
+ * Arguments
+ *	pl
+ *	Pointer to logger
+ *
+ *	new_verb
+ *	New log verbosity level
+ *
+ * Description
+ *	This function changes the verbosity level of an existing logger.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+int logSetLogLevel (LOGGER *pl, int new_verb) {
+
+	int		old_verb;
+
+	if (pl == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return SUCCESS;
+	}
+
+	if (!(pl->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return SUCCESS;
+	}
+
+	old_verb = pl->verbosity;
+	pl->verbosity = new_verb;
+
+	return old_verb;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	flushHandler
+ *
+ * Format
+ *	static void flushHandler (int sig, siginfo_t *si, void *uc)
+ *
+ * Arguments
+ *	sig
+ *	Signal number that triggered this handler.
+ *
+ *	si
+ *	Pointer to siginfo structure
+ *
+ *	uc
+ *	User context
+ *
+ * Description
+ *	Signal handler for timed flushes (O_TIMED_FLUSH) option.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static void flushHandler (int sig, siginfo_t *si, void *uc) {
+
+	timer_t		*tp;
+	int		i;
+
+	tp = si->si_value.sival_ptr;
+
+	/* Find the logger this alarm is for */
+	for (i = 0; i < loggerStore.count; i++) {
+		if ((loggerStore.loggers[i]->optionMask & NODE_IN_USE) &&
+		    (loggerStore.loggers[i]->timerSignal == sig) &&
+		    (loggerStore.loggers[i]->timerID == *tp)) {
+			break;
+		}
+	}
+
+	if (i < loggerStore.count) {
+		if (loggerStore.loggers[i]->logFd != 0) {
+			if (fflush (loggerStore.loggers[i]->logFd) != 0) {
+				fprintf (stderr, "ERROR: %s - fflush returned error code %d\n", __FUNCTION__, errno);
+			}
+		}
+
+		loggerStore.loggers[i]->flushBufBytes = 0;
+		loggerStore.loggers[i]->needFlush = FALSE;
+
+	} else {
+		fprintf (stderr, "Unknown timer expired");
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	setFlushTimer
+ *
+ * Format
+ *	static int setFlushTimer (char *name, timer_t *tid, int sigNo, int expireSec)
+ *
+ * Arguments
+ *	name
+ *	String container name of logger.
+ *
+ *	tid
+ *	Pointer to timer_t passed by reference.
+ *
+ *	sigNo
+ *	Signal number to use for the timer
+ *
+ *	expireSec
+ *	Duration of timer in seconds.
+ *
+ * Description
+ *	Sets a timer that will call the flushHandler signal handler when it
+ *	expires.  This is only used when the O_TIMED_FLUSH option is used.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+static int setFlushTimer (char *name, timer_t *tid, int sigNo, int expireSec) {
+
+	struct sigevent se;
+	struct itimerspec its;
+	struct sigaction sa;
+
+	/* Set up signal handler. */
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = flushHandler;
+	sigemptyset (&sa.sa_mask);
+	if (sigaction (sigNo, &sa, NULL) == -1) {
+		fprintf (stderr, "%s Failed to setup signal handling for %s.\n", __FUNCTION__, name);
+		return (-1);
+	}
+
+	/* Set and enable alarm */
+	se.sigev_notify = SIGEV_SIGNAL;
+	se.sigev_signo = sigNo;
+	se.sigev_value.sival_ptr = tid;
+	timer_create (CLOCK_REALTIME, &se, tid);
+
+	its.it_interval.tv_sec = 0;
+	its.it_interval.tv_nsec = 0;
+	its.it_value.tv_sec = expireSec;
+	its.it_value.tv_nsec = 0;
+	timer_settime (*tid, 0, &its, NULL);
+
+	return (0);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	logMsg
+ *
+ * Format
+ *	int logMsg (LOGGER *pl, int visibility, int severity, const char *format, ...)
+ *
+ * Arguments
+ *	pl
+ *	Pointer to initialized logger.
+ *
+ *	visibility
+ *	Visibility level of this message.  The logger's verbosity level must
+ *	be greater than or equal to the message visibility for the message to be
+ *	written to the log.  Will be displayed in the log if the O_SHOW_LEVEL
+ *	option is set.  Valid values are:
+ *		V_ALWAYS
+ *		V_ERROR
+ *		V_INFO
+ *		V_DEBUG
+ *		V_TRACE
+ *
+ *	severity
+ *	Message severity level.  Will be displayed in a log message if the
+ *	O_SHOW_SEVERITY option is set.  Can be any of:
+ *		S_FATAL
+ *		S_ERROR
+ *		S_WARNING
+ *		S_STATUS
+ *		S_DEBUG
+ *		S_TRACE
+ *
+ *	format
+ *	Message format string.  Uses same characters as printf.
+ *
+ *	...
+ *	Additional parameters corresponding to the tokens within the format
+ *	string.
+ *
+ * Description
+ *	Function used to write messages to a log.  Uses the same format as
+ *	printf.
+ *
+ * Return Values
+ *	0	- Success
+ *	1	- Error
+ *
+ * -------------------------------------------------------------------------- */
+
+int logMsg (LOGGER *pl, int visibility, int severity, const char *format, ...) {
+
+	va_list		args;
+	sigset_t	mask;
+	sigset_t	orig_mask;
+	int		retval 		= SUCCESS;
+	char		*p;
+
+	if (pl == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL logger provided\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	if (!(pl->optionMask & NODE_IN_USE)) {
+		fprintf (stderr, "ERROR: %s - Logger not in use\n", __FUNCTION__);
+		return ERROR;
+	}
+
+	p = pl->formatBuf;
+	visibility = (visibility < V_MIN) ? V_MIN : visibility;
+	visibility = (visibility > V_MAX) ? V_MAX : visibility;
+	severity = (severity < S_MIN) ? S_MIN : severity;
+	severity = (severity > S_MAX) ? S_MAX : severity;
+
+	if (visibility > pl->verbosity) {
+		return SUCCESS;
+	}
+
+	if (pl->optionMask & O_TIMED_FLUSH) {
+		/* Block the timer signal to prevent race condition when flushHandler runs */
+		sigemptyset (&mask);
+		sigaddset (&mask, pl->timerSignal);
+		if (sigprocmask (SIG_BLOCK, &mask, &orig_mask) < 0) {
+			fprintf (stderr,
+			                "%s - Call to sigprocmask failed with eror %d - %s",
+			                __FUNCTION__, errno, strerror (errno));
+			retval = ERROR;
+		}
+	}
+
+	if (!pl->amArchiving) {
+		checkLogRollover (pl);
+	}
+
+	va_start(args, format);
+
+	if ((pl->optionMask & O_TIMESTAMP)) {
+		char			datebuf[LOG_DATE_LEN+1];		/* YYYY-MM-DD HH:MM:SS.cccc */
+		struct timespec		hrt;
+
+		if (clock_gettime (CLOCK_REALTIME, &hrt)) {
+			logMsg (pl, V_ALWAYS, S_FATAL, "Call to clock_gettime failed - exiting");
+			exit (errno);
+		}
+
+		strftime (datebuf, LOG_DATE_LEN+1, LOG_DEFAULT_DATE_FORMAT, localtime (&hrt.tv_sec));
+		p = datebuf + strlen (datebuf);
+		sprintf (p, ".%06ld", hrt.tv_nsec / 1000);	/* Report in microseconds */
+		sprintf (pl->formatBuf, "%s ", datebuf);
+		p = pl->formatBuf + strlen (pl->formatBuf);
+	}
+
+	if (pl->optionMask & O_SHOW_LEVEL) {
+		sprintf (p, "<%s> ", logVerbosityStrings[visibility]);
+		p = pl->formatBuf + strlen (pl->formatBuf);
+	}
+
+	if (pl->optionMask & O_SHOW_SEVERITY) {
+		sprintf (p, "[%s]: ", logSeverityStrings[severity]);
+		p = pl->formatBuf + strlen (pl->formatBuf);
+	}
+
+	sprintf (p, "%s%c", format, (pl->optionMask & O_ADD_NEWLINE) ? '\n' : '\0');
+
+	vsnprintf (pl->buffer, pl->bufferSize, pl->formatBuf, args);
+
+	if (logOpen (pl)) {
+		fprintf (stderr, "ERROR: %s - logOpen failed\n", __FUNCTION__);
+	} else {
+		int	msgSize = strlen (pl->buffer);
+		int	writeSize;
+
+		if ((writeSize = fprintf (pl->logFd, pl->buffer, args)) < msgSize) {
+			fprintf (stderr, "ERROR: %s - only wrote %d bytes of %d byte message\n", __FUNCTION__, writeSize, msgSize);
+		}
+
+		if (writeSize > 0) {
+			pl->logSize += writeSize;
+			pl->lastLogTime = time (NULL);
+			pl->lastLogDay = pl->lastLogTime / SECONDS_PER_DAY;
+		}
+
+		if (pl->optionMask & O_FLUSH_AFTER_EACH) {
+			if (fflush (pl->logFd) != 0) {
+				fprintf (stderr, "ERROR: %s - fflush returned error code %d\n", __FUNCTION__, errno);
+			}
+		}
+
+		if (pl->optionMask & O_TIMED_FLUSH) {
+			pl->flushBufBytes += writeSize;
+			if (pl->flushBufBytes >= pl->flushBufSize) {
+				if (fflush (pl->logFd) != 0) {
+					fprintf (stderr, "ERROR: %s - fflush returned error code %d\n", __FUNCTION__, errno);
+				}
+
+				// printf ("%s - Manually flushing %s flushBufSize: %d flushBufBytes: %d\n", __FUNCTION__, pl->name, pl->flushBufSize, pl->flushBufBytes);
+				pl->flushBufBytes = 0;
+				pl->needFlush = FALSE;
+			} else {
+				if (!pl->needFlush) {
+					pl->needFlush = TRUE;
+
+					/* Set flush timer */
+					setFlushTimer (pl->name, &pl->timerID, pl->timerSignal, pl->flushInterval);
+				}
+			}
+
+			if (sigprocmask (SIG_SETMASK, &orig_mask, NULL) < 0) {
+				fprintf (stderr, "%s - Call to sigprocmask failed with error %d - %s",
+					__FUNCTION__, errno, strerror (errno));
+				retval = ERROR;
+			}
+		}
+	}
+
+	va_end (args);
+
+	return retval;
+}
+
diff --git a/fileIngest/mlogger.hin b/fileIngest/mlogger.hin
new file mode 100644
index 000000000..e0a461885
--- /dev/null
+++ b/fileIngest/mlogger.hin
@@ -0,0 +1,121 @@
+/*
+ * mlogger.h
+ *
+ *  Created on: Nov 17, 2013
+ *      Author: brapp
+ */
+
+#ifndef MLOGGER_H_
+#define MLOGGER_H_
+
+/* Options for logger optionMask */
+#define O_FLUSH_AFTER_EACH		(1 << 0)	/* Flush buffer after each write */
+#define O_TIMED_FLUSH			(1 << 1)	/* Flush buffer periodically */
+#define O_ARCHIVE			(1 << 2)	/* When log reaches maximum size, or date changes, archive the current log */
+#define O_TIMESTAMP			(1 << 3)	/* Display current time stamp at the beginning of each message "YYYY-MM-DD HH:MM:SS" */
+#define O_CONCURRENT			(1 << 4)	/* Future - must add mutex and shared memory */
+#define O_KEEP_OPEN			(1 << 5)	/* Open log during initialization */
+#define O_SHOW_LEVEL			(1 << 6)	/* Display the log level in the message */
+#define O_SHOW_SEVERITY			(1 << 7)	/* Display the severity of the message */
+#define O_ADD_NEWLINE			(1 << 8)	/* Terminate each line with an ASCII <lf> character */
+#define O_LOG_INIT			(1 << 9)	/* Write to log whenever the logger is initialized or shut down */
+#define NODE_IN_USE			(1 << 31)	/* Used internally to track which logger nodes are allocated */
+
+/* Various size and format definitions */
+#define LOG_MAX_PATH_LEN		256
+#define LOG_BUFFER_DEFAULT_SIZE		1024
+#define LOG_FORMAT_BUF_SIZE		512
+#define	LOG_MAX_FILENAME_LEN		128
+#define LOG_MAX_MSG_LEN			1024
+#define LOG_DATE_LEN			24			/* YYYY-MM-DD HH:MM:SS.cccc */
+#define LOG_DEFAULT_DATE_FORMAT		"%Y-%m-%d %H:%M:%S"
+#define LOG_DEFAULT_MAX_LOG_SIZE	(4 * 1024 * 1024)
+#define LOG_MAX_FILE_SIZE		(1024 * 1024 * 1024)
+#define LOG_MAXHOSTNAMELEN		64
+#define LOG_SIZE_ARCHIVE_DATE		5
+#define LOG_SIZE_LONG_DATE		10
+#define DEFAULT_DISK_BLOCK_SIZE		4096
+#define LOG_DEFAULT_FLUSH_INTERVAL	2
+
+/* Logging facilities */
+#define F_MIN				1
+#define	F_FILE				1
+#define F_DB				2
+#define F_SOCKET			3
+#define F_PIPE				4
+#define F_CONSOLE			5
+#define F_PRINTER			6
+#define F_MAX				6
+
+/* Verbosity Levels */
+#define V_MIN				0
+#define V_ALWAYS			0
+#define V_ERROR				1
+#define V_INFO				2
+#define V_DEBUG				3
+#define V_TRACE				4
+#define V_MAX				4
+
+/* Severity Levels */
+#define S_MIN				0
+#define S_FATAL				0	/* Results in program termination */
+#define S_ERROR				1	/* Serious correctable error */
+#define S_WARNING			2	/* Minor correctable error */
+#define S_STATUS			3	/* Informational or status message */
+#define S_DEBUG				4	/* Debugging data showing pertinent data values */
+#define S_TRACE				5	/* Traces functions */
+#define S_MAX				5
+
+// ------------------------------------------
+//for later when individual facilities are defined
+//
+//
+//typedef struct	logger_file {
+//	long long	logSize;	/* Current size of log file - only works with single process per log */
+//	long long	rollOverSize;	/* Maximum file size before rollover.  If 0, no rollover. */
+//	FILE		*logFd;		/* File descriptor for the log file.  When null, file is closed. */
+//	char		*logPath;	/* Absolute log file base path */
+//	char		*logName;	/* Name of log file */
+//	char		*fullLogName;	/* Full path plus name */
+//	char		*archivePath;	/* Absolute path to archives, NULL if no archives kept */
+//	time_t		lastLogTime;	/* Time of last log update */
+//} LOGGER_FILE;
+//
+
+typedef struct	logger_struct {
+	long		logSize;	/* Current size of log file - only works with single process per log */
+	long		rollOverSize;	/* Maximum file size before rollover.  If 0, no rollover. */
+	int		index;		/* Array index in loggerStore */
+	int		bufferSize;	/* Size of output buffer */
+	int		optionMask;	/* Most significant bit is the in_use flag */
+	int		verbosity;	/* Logging level that will be written to this logger */
+	int		facility;	/* Logging medium mask: database, socket, file, console, pipe, etc. */
+	char		*name;		/* User-defined name for this log */
+	FILE		*logFd;		/* File descriptor for the log file.  When null, file is closed. */
+	char		*logPath;	/* Absolute log file base path */
+	char		*logName;	/* Name of log file */
+	char		*fullLogName;	/* Full path plus name */
+	char		*archivePath;	/* Absolute path to archives, NULL if no archives kept */
+	char		*buffer;	/* Output buffer */
+	char		*formatBuf;	/* Buffer for format string */
+	char		*timeFormat;	/* Format of date string - default is "%Y-%m-%d %H:%M:%S" */
+	time_t		lastLogTime;	/* Time of last log update */
+	time_t		lastLogDay;	/* Epoch / 86400 */
+	int		needFlush;	/* Bytes have been written since last flush */
+	int		flushInterval;	/* How often to flush to disk if O_TIMED_FLUSH is set */
+	int		flushBufSize;	/* Maximum size of the flush buffer before forcing flush */
+	int		flushBufBytes;	/* Number of bytes written since last flush */
+	timer_t		timerID;	/* Flush timer ID */
+	int		timerSignal;	/* Signal to use with O_TIMED_FLUSH */
+	int		amArchiving;	/* Set when archiving to prevent infinite recursion */
+} LOGGER;
+
+typedef struct	logger_hdr_struct {
+	int		count;		/* Number of logger structures allocated */
+	LOGGER		**loggers;	/* Pointer to array of LOGGER pointers */
+} LOGGER_HDR;
+
+
+@FUNCTION_DECLARATIONS@
+
+#endif /* MLOGGER_H_ */
diff --git a/fileIngest/par.xsd b/fileIngest/par.xsd
new file mode 100644
index 000000000..5c2e3c420
--- /dev/null
+++ b/fileIngest/par.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+	<xs:element name="productactivity_report">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="report_gen_time" type="xs:dateTime"/>
+				<xs:element name="start_coverage_time" type="xs:dateTime"/>
+				<xs:element name="end_coverage_time" type="xs:dateTime"/>
+				<xs:element name="num_tile-files_sent" type="xs:int"/>
+				<xs:element ref="senttile-file" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="senttile-file">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="tile-filename" type="xs:string"/>
+				<xs:element name="tile-filesize" type="xs:long"/>
+				<xs:element name="checksum">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="value" type="xs:hexBinary"/>
+							<xs:element name="type" type="xs:string"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/fileIngest/read_acq_pipe.c b/fileIngest/read_acq_pipe.c
new file mode 100644
index 000000000..bddb4a4a3
--- /dev/null
+++ b/fileIngest/read_acq_pipe.c
@@ -0,0 +1,513 @@
+/* -----------------------------------------------------------------------------
+ *
+ * File Name:
+ *	read_acq_pipe.c
+ *
+ * Description:
+ *
+ * Build Instructions:
+ *
+ * Functions defined:
+ *
+ * Author:
+ * 	brapp		Jun 27, 2015
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+ * -------------------------------------------------------------------------- */
+
+#define _GNU_SOURCE
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <ctype.h>
+#include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <poll.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+#include "stdclib.h"
+
+#define	MAX_ACQ_PATH_LEN		128
+#define OUTFILE_FINAL_PERMS		(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+
+typedef  struct	pipe_prod_name_hdr  {				/* prod filename hdr for pipe 	     */
+	int		pipe_insert_time;			/* time product added to pipe	     */
+	int		pipe_prod_NCF_rcv_time;			/* time product received at NCF	     */
+	ushort		pipe_prod_type;				/* product category                  */
+								/*     TYPE_GOES, TYPE_NWSTG, etc    */
+	ushort		pipe_prod_cat;				/* product category                  */
+								/*     CAT_IMAGE, etc		     */
+	ushort		pipe_prod_code;				/* product code 1,2,3,etc            */
+	ushort		pipe_prod_flag;				/* product flag (error & status)     */
+								/*     error_mask & prod_done,etc    */
+	ushort		reserve1;				/* reserved	                     */
+	ushort		reserve2;				/* reserved	                     */
+	uint		pipe_prod_orig_prod_seqno;		/* original prod seqno to retransmit */
+	int		pipe_prod_orig_NCF_rcv_time;		/* NCF receive time binary(GMT) */
+		/* Retransmit info */
+	ushort		pipe_prod_run_id;			/* Unique run identification    */
+								/*    for product stream    */
+								/*    parm for retransmission   */
+	ushort		pipe_prod_orig_run_id;			/* Unique orig run identification    */
+	char		pipe_prod_filename[MAX_ACQ_PATH_LEN];	/* UNIX filename for prod */
+} PIPE_PROD_NAME_HDR;
+
+typedef struct	file_node {
+	char		*fptr;		/* File name (without path) */
+	time_t		mtime;		/* File last modification time */
+	off_t		fsize;		/* File size in bytes */
+}	FILE_NODE;
+
+typedef struct	file_list_hdr {
+	FILE_NODE	*fileNodes;	/* Pointer to array of FILE_NODEs */
+	int		count;		/* Number of files in list */
+}	FILE_LIST;
+
+char 		*pipeFile		= "/dev/p_INET";
+int		Done			= FALSE;
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	atExitHandler
+ *
+ * Format
+ *	void adExitHandler ()
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Handler called when the 'exit()' system call is issued to terminate
+ *	this program.  It shuts down the logging facilities, and 'free's up
+ *	some dynamically allocated memory.
+ *
+ *	If LDM support is compiled in, the LDM product queue is closed and
+ *	the MD5 context is freed up.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void atExitHandler () {
+
+	puts ("Done.");
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	sigsetexitflag
+ * Format
+ *	void sigsetexitflag (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should terminate the process when
+ *	the current product has been processed.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void sigsetexitflag (int signum) {
+
+	/* set global flag for termination	*/
+	Done = TRUE;
+
+	fprintf (stderr,
+		"Received signal %d, setting exit flag\n",
+		signum);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	siglogandcontinue
+ *
+ * Format
+ *	void siglogandcontinue (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should be ignored.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void siglogandcontinue (int signum) {
+
+	fprintf (stderr,
+		"Received signal %d, ignored\n",
+		signum);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	sigexitnow
+ *
+ * Format
+ *	void sigexitnow (int signum)
+ *
+ * Arguments
+ *	int signum
+ *	Signal that triggered execution of this trap.
+ *
+ * Description
+ *	Handler function for signals that should terminate the process immediately.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+static void sigexitnow (int signum) {
+
+	fprintf (stderr,
+		"Received signal %d, exit process immediately\n",
+		signum);
+
+	exit (0);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	setupSignalHandlers
+ *
+ * Format
+ *	void setupSignalHandlers ()
+ *
+ * Arguments
+ *	N/A
+ *
+ * Description
+ *	Set up initial signal handlers for the process.
+ *
+ * Return Values
+ *
+ * -------------------------------------------------------------------------- */
+
+static void setupSigHandler () {
+	struct sigaction act;
+	static const char fname[40+1]="setupSigHandler";
+
+	/* SIGUSR1 will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGUSR1, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGUSR1, strerror(errno));
+	}
+
+	/* SIGTERM will exit after sending the current product	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGTERM, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=sigsetexitflag, %s\n",
+			fname, SIGTERM, strerror(errno));
+	}
+
+	/* SIGHUP will exit the process	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigexitnow;
+	act.sa_flags=0;
+	if (sigaction (SIGHUP, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=sigexitnow, %s\n",
+			fname, SIGHUP, strerror(errno));
+	}
+
+	/* SIGINT will be handled	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = sigsetexitflag;
+	act.sa_flags=0;
+	if (sigaction (SIGINT, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGCHLD, strerror(errno));
+	}
+
+	/* SIGPIPE will be ignored	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = siglogandcontinue;
+	act.sa_flags=0;
+	if (sigaction (SIGPIPE, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGCHLD, strerror(errno));
+	}
+
+	/* SIGALRM will be ignored	*/
+	sigemptyset (&act.sa_mask);
+	act.sa_handler = siglogandcontinue;
+	act.sa_flags=0;
+	if (sigaction (SIGALRM, &act, 0) == -1) {
+		fprintf (stderr,
+			"(%s) - Sigaction FAIL sig=%d, act=siglogandcontinue, %s\n",
+			fname, SIGALRM, strerror(errno));
+	}
+
+//	/* SIGIO will be handled	*/
+//	sigemptyset (&act.sa_mask);
+//	act.sa_handler = sighandleIO;
+//	act.sa_flags=SA_SIGINFO;
+//	if (sigaction (SIGIO, &act, 0) == -1) {
+//		fprintf (stderr,
+//			"%s: Sigaction FAIL sig=%d, act=sighandleIO, %s\n",
+//			fname, SIGIO, strerror(errno));
+//	}
+
+	return;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	addFileToList
+ *
+ * Format
+ *	int addFileToList (FILE_LIST *flist, char *fname, time_t ftime, off_t fsize)
+ *
+ * Arguments
+ *	FILE_LIST	*flist
+ *	Pointer to FILE_LIST structure that will hold information about matching files.
+ *
+ *	char		*fname
+ *	Name of file to insert
+ *
+ *	time_t		ftime
+ *	File last modification time
+ *
+ *	off_t		fsize
+ *	Size of file in bytes
+ *
+ * Description
+ * 	Adds a new FILE_NODE to the flist FILE_LIST.
+ *
+ * Return Values
+ *	0	Success
+ *	1	Failure
+ *
+ * -------------------------------------------------------------------------- */
+
+int addFileToList (FILE_LIST *flist, char *fname, time_t ftime, off_t fsize) {
+
+	if (flist->count == 0) {
+		if ((flist->fileNodes = malloc (sizeof (FILE_NODE))) == NULL) {
+			fprintf (stderr,
+				"(%s) - could not malloc memory for file node list\n",
+				__FUNCTION__);
+			return 1;
+		}
+	} else {
+		if ((flist->fileNodes = realloc ((void *) flist->fileNodes, sizeof (FILE_NODE) * flist->count)) == NULL) {
+			fprintf (stderr,
+				"(%s) - could not realloc memory for file node list\n",
+				__FUNCTION__);
+			return 1;
+		}
+	}
+
+	if ((flist->fileNodes[flist->count-1].fptr = strdup (fname)) == NULL) {
+		fprintf (stderr,
+			"(%s) - could not malloc memory for file name\n",
+				__FUNCTION__);
+		return 1;
+	}
+
+	flist->count++;
+	flist->fileNodes[flist->count-1].mtime = ftime;
+	flist->fileNodes[flist->count-1].fsize = fsize;
+
+	return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	freeFileList
+ *
+ * Format
+ *	void freeFileList (FILE_LIST *fl)
+ *
+ * Arguments
+ *	FILE_LIST	*fl
+ *	Pointer to FILE_LIST
+ *
+ * Description
+ *	This function will free all memory in a FILE_LIST.
+ *
+ * Return Values
+ *	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+void freeFileList (FILE_LIST *fl) {
+
+	int	i;
+
+	if (fl == NULL) {
+		return;
+	}
+
+	for (i = 0; i < fl->count; i++) {
+		fprintf (stderr,
+			"(%s) - Freeing file node: %s\n",
+			__FUNCTION__, fl->fileNodes[i].fptr);
+		free ((void *) fl->fileNodes[i].fptr);
+	}
+
+	free ((void *) fl->fileNodes);
+	fl->count = 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	readAcqPipe
+ *
+ * Format
+ *	int readAcqPipe (int pipefd, FILE_LIST *fileList)
+ *
+ * Arguments
+ *	int		pipefd
+ *	File descriptor for already-open pipe
+ *
+ *	FILE_LIST	*fileList
+ *	If successful, will contain a FILE_LIST element for a single file.
+ *
+ * Description
+ *	Read a PIPE_PROD_NAME_HDR structure from the pipe.
+ *
+ * Return Values
+ *	0	success
+ *	1	failure
+ *
+ * -------------------------------------------------------------------------- */
+
+#define RETRIES		3
+
+
+int readAcqPipe(int pipefd, FILE_LIST *fileList) {
+	int rtn_value; /* return value from read */
+	int total_read; /* total read bytes */
+	int read_size; /* bytes to read */
+	int request_size;
+	int numb_retries; /* numb of retries */
+	struct pipe_prod_name_hdr prod_entry;
+	char *p_readbuff; /* ptr to read buffer */
+
+	total_read = 0;
+	request_size = read_size = sizeof(PIPE_PROD_NAME_HDR);
+	p_readbuff = (char *) &prod_entry;
+	numb_retries = 0;
+
+	while (total_read != request_size) {
+
+		rtn_value = read(pipefd, p_readbuff, read_size);
+
+		if (rtn_value < 0) {
+			if (errno == EINTR) {
+				fprintf (stderr, "(%s) Interrupt received\n", __FUNCTION__);
+				return 1;
+			}
+
+			fprintf(stderr, "%s ERROR read(%d) fd[%d] %s\n", __FUNCTION__, rtn_value, pipefd, pipeFile);
+			/* Return error to caller */
+			return 1;
+		}
+
+		if (rtn_value == 0) {
+			/* Check if need to continue */
+			numb_retries++;
+			/* Note caller should determine number of retries */
+			/*  based on type of input */
+			if (numb_retries < RETRIES) {
+				if ((total_read > 0) && (numb_retries > 0)) {
+					fprintf(stderr, "(%s) pipe read returned 0, sleeping for 1 second\n", __FUNCTION__);
+					sleep(1);
+				}
+
+				continue;
+			}
+
+			/* Assume have end of pipe */
+			fprintf(stderr, "(%s) quit read %d vs %d bytes retried=%d\n", __FUNCTION__, total_read, request_size,
+					numb_retries);
+			break;
+		}
+
+		total_read += rtn_value;
+		if (rtn_value != read_size) {
+			fprintf(stderr, "(%s) %d vs %d bytes fd=%d %s\n", __FUNCTION__, rtn_value, read_size, pipefd, pipeFile);
+			read_size = request_size - total_read;
+			p_readbuff += rtn_value;
+		}
+	} /* end while loop for read */
+
+	if (rtn_value > 0) {
+		fprintf(stderr, "%s ok read (fd=%d) %d of %d bytes retried=%d\n", __FUNCTION__, pipefd, total_read, request_size,
+				numb_retries);
+	}
+
+	if (total_read == request_size) { /* Read an entire product */
+		fprintf(stderr, "(%s) Read entry for %s\n", __FUNCTION__, prod_entry.pipe_prod_filename);
+	}
+
+	return 0;
+
+} /* end do_read */
+
+
+int main (int argc, char **argv) {
+
+	int		readPipe;
+	FILE_LIST	fileList;
+
+	atexit (&atExitHandler);
+	setupSigHandler ();
+
+	if (!fileExists(pipeFile)) {
+		if (mknod(pipeFile, S_IFIFO | OUTFILE_FINAL_PERMS, 0)) {
+			fprintf (stderr, "(%s) - Error (%d) \"%s\" creating pipe %s\n",
+				__FUNCTION__, errno, strerror(errno), pipeFile);
+			return 1;
+		}
+	} else if (getFileType(pipeFile) != S_IFIFO) {
+		fprintf (stderr, "(%s) - %s must be a pipe\n", __FUNCTION__, pipeFile);
+		return 1;
+	}
+
+	if ((readPipe = open(pipeFile, O_RDONLY, 0)) == -1) {
+		fprintf (stderr, "(%s) - Error (%d) \"%s\" opening pipe %s\n",
+			__FUNCTION__, errno, strerror(errno), pipeFile);
+		return 1;
+	}
+
+	while (!Done) {
+		readAcqPipe (readPipe, &fileList);
+
+		freeFileList (&fileList);
+	}
+
+	return 0;
+}
+
diff --git a/fileIngest/registry.xml b/fileIngest/registry.xml
new file mode 100755
index 000000000..27d72e7ef
--- /dev/null
+++ b/fileIngest/registry.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<registry>
+  <delete-info-files>0</delete-info-files>
+  <hostname>raftr-tbwo</hostname>
+  <insertion-check-interval>300</insertion-check-interval>
+  <reconciliation-mode>do nothing</reconciliation-mode>
+  <check-time>
+    <enabled>1</enabled>
+    <limit>10</limit>
+    <warn-if-disabled>1</warn-if-disabled>
+    <ntpdate>
+      <command>/usr/sbin/ntpdate</command>
+      <servers>clock-tncf</servers>
+      <timeout>5</timeout>
+    </ntpdate>
+  </check-time>
+  <log>
+    <count>7</count>
+    <file>/data/ldm/logs/ldmd.log</file>
+    <rotate>1</rotate>
+  </log>
+  <metrics>
+    <count>4</count>
+    <file>/data/ldm/logs/metrics.txt</file>
+    <files>/data/ldm/logs/metrics.txt*</files>
+    <netstat-command>/bin/netstat -A inet -t -n</netstat-command>
+    <top-command>/usr/bin/top -b -n 1</top-command>
+  </metrics>
+  <pqact>
+    <config-path>/usr/local/ldm/etc/pqact.conf</config-path>
+    <datadir-path>/data/ldm/data</datadir-path>
+  </pqact>
+  <pqsurf>
+    <config-path>/usr/local/ldm/etc/pqsurf.conf</config-path>
+    <datadir-path>/data/ldm/data</datadir-path>
+  </pqsurf>
+  <queue>
+    <path>/data/ldm/data/ldm.pq</path>
+    <size>500M</size>
+    <slots>default</slots>
+  </queue>
+  <scour>
+    <config-path>/usr/local/ldm/etc/scour.conf</config-path>
+  </scour>
+  <server>
+    <config-path>/usr/local/ldm/etc/ldmd.conf</config-path>
+    <ip-addr>0.0.0.0</ip-addr>
+    <max-clients>256</max-clients>
+    <max-latency>3600</max-latency>
+    <port>388</port>
+    <time-offset>3600</time-offset>
+  </server>
+  <surf-queue>
+    <path>/data/ldm/data/pqsurf.pq</path>
+    <size>2M</size>
+  </surf-queue>
+</registry>
diff --git a/fileIngest/stdclib.c b/fileIngest/stdclib.c
new file mode 100644
index 000000000..d09495ebb
--- /dev/null
+++ b/fileIngest/stdclib.c
@@ -0,0 +1,1175 @@
+/* ------------------------------------------------------------------------------
+ *
+ * File Name:
+ *	mystdlib.c
+ *
+ * Description:
+ *	This file contains general-purpose functions for performing common tasks.
+ *
+ * Functions defined:
+ * 	fileExists - determines if the requested file exists.
+ *
+ * 	raiseCase - force all letters within a string to all upper case.
+ *
+ * 	lowerCase - force all letters within a string to all lower case.
+ *
+ * 	isNumber - determines if a given string contains all numeric characters.
+ *
+ * 	moveFile - move or rename a file.
+ *
+ *	copyFile - copies a file from one place to another.
+ *
+ * 	changeDirectory - change the current working directory.
+ *
+ * 	makeDirectory - create a new directory.
+ *
+ * 	freeVector - free all memory allocated by a vector.
+ *
+ * 	printVector - print all members in a string vector.
+ *
+ *	getFileAge - get the age of a file or directory in minutes.
+ *
+ *	getBlockSize - find block size for a specific file
+ *
+ *	stripTrailingChar - strip a specific trailing character from a string
+ *
+ *	getFileLastAccess - returns last access time of a file as time_t
+ *
+ *	getFileLastMod - returns last modification for a file as time_t
+ *
+ *	getFileLastStatus - returns time of last status change of a file (name, perms, #links, etc)
+ *
+ *	splitFilenameExt - Separate filename from extension
+ *
+ *	getFileType - returns the type of a file using values from stat.h
+ *
+ *	reopenStdFile - close a specified file descriptor and reopen as a different file
+ *
+ *	removeExtension - remove extension from file name
+ *
+ * Author:
+ * 	Brian Rapp		Mar 3, 2012
+ *
+ * Modification History:
+ *	Modified by		Date
+ *	Description
+ *
+ ------------------------------------------------------------------------------ */
+#define _GNU_SOURCE
+
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <libgen.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
+#if defined(__APPLE__) || defined(__FreeBSD__)
+#	include <copyfile.h>
+#else
+#	include <sys/sendfile.h>
+#endif
+
+#include "stdclib.h"
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	fileExists
+ *
+ * Format
+ * 	int fileExists (const char *fname)
+ *
+ * Arguments
+ * 	fname
+ * 	A valid file specification (no wildcards). Read, write, or execute
+ * 	permission of the named file is not required, but you must be able to
+ * 	reach all directories listed in the file specification leading to the
+ * 	file.
+ *
+ * Description
+ * 	This function checks for the existence of the specified file, which can
+ * 	be an absolute or relative reference.  If the user does not have access
+ * 	rights to the file, the result is as though the file does not exist.
+ *
+ * Return Values
+ * 	0	Specified file does not exist
+ * 	1	Specified file does exist
+ *
+ * -------------------------------------------------------------------------- */
+
+int fileExists (const char *fname) {
+
+	struct stat	fattr;
+	char		*full_name;
+	int		retval;
+
+	if ((fname == NULL) || (*fname == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid file name passed\n", __FUNCTION__);
+		return FALSE;
+	}
+
+	full_name = strdup (fname);
+	stripTrailingChar(full_name, '/');
+
+	retval = (stat (full_name, &fattr) == 0);
+	free (full_name);
+	return retval;
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getFileType
+
+Prototype:
+	int getFileType (const char *fname)
+
+Arguments:
+
+	fname
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file path.
+
+Description:
+
+
+Return Values:
+	0		Unknown file type (file doesn't exist or isn't accessible)
+	A value from stat.h:
+	S_IFDIR		directory
+	S_IFCHR		character device
+	S_IFBLK		block device
+	S_IFREG		regular file
+	S_IFIFO		pipe
+	S_IFLNK		symbolic link
+	S_IFSOCK	socket
+
+------------------------------------------------------------------------------ */
+
+int getFileType (const char *fname) {
+
+	char		*full_name;
+	struct stat	statbuf;
+	int		retval;
+
+	if ((full_name = strdup (fname)) == NULL) {
+		return FALSE;
+	}
+
+	stripTrailingChar (full_name, '/');
+	if (stat (full_name, &statbuf) == -1) {
+		retval = FALSE;
+	} else {
+		retval = statbuf.st_mode & S_IFMT;
+	}
+
+	free (full_name);
+	return retval;
+
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getFileSize
+
+Prototype:
+	off_t getFileSize (const char *fname)
+
+Arguments:
+
+	fname
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file path.
+
+Description:
+	Returns size of named file in bytes or -1 on error.
+
+Return Values:
+	Size of file in bytes.
+
+------------------------------------------------------------------------------ */
+
+off_t getFileSize (const char *fname) {
+
+	char		*full_name;
+	struct stat	statbuf;
+	off_t		retval;
+
+	if ((full_name = strdup (fname)) == NULL) {
+		return FALSE;
+	}
+
+	stripTrailingChar (full_name, '/');
+	if (stat (full_name, &statbuf) == -1) {
+		retval = -1;
+	} else {
+		retval = statbuf.st_size;
+	}
+
+	free (full_name);
+	return retval;
+
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getFileLastAccess
+
+Prototype:
+	time_t getFileLastAccess (const char *fname)
+
+Arguments:
+
+	fname
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file path.
+
+Description:
+
+
+Return Values:
+	Time of last file access as time_t value.
+
+------------------------------------------------------------------------------ */
+
+time_t getFileLastAccess (const char *fname) {
+
+	char		*full_name;
+	struct stat	statbuf;
+	time_t		retval;
+
+	if ((full_name = strdup (fname)) == NULL) {
+		return FALSE;
+	}
+
+	stripTrailingChar (full_name, '/');
+	if (stat (full_name, &statbuf) == -1) {
+		retval = FALSE;
+	} else {
+#if defined __USE_XOPEN2K8
+		retval = statbuf.st_atim.tv_sec;
+#else
+		retval = statbuf.st_atime;
+#endif
+	}
+
+	free (full_name);
+	return retval;
+
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getFileLastMod
+
+Prototype:
+	time_t getFileLastMod (const char *fname)
+
+Arguments:
+
+	fname
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file path.
+
+Description:
+
+
+Return Values:
+	Time of last file modification as time_t value.
+
+------------------------------------------------------------------------------ */
+
+time_t getFileLastMod (const char *fname) {
+
+	char		*full_name;
+	struct stat	statbuf;
+	time_t		retval;
+
+	if ((full_name = strdup (fname)) == NULL) {
+		return FALSE;
+	}
+
+	stripTrailingChar (full_name, '/');
+	if (stat (full_name, &statbuf) == -1) {
+		retval = FALSE;
+	} else {
+#if defined __USE_XOPEN2K8
+		retval = statbuf.st_mtim.tv_sec;
+#else
+		retval = statbuf.st_mtime;
+#endif
+	}
+
+	free (full_name);
+	return retval;
+
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getFileLastStatus
+
+Prototype:
+	time_t getFileLastStatus (const char *fname)
+
+Arguments:
+
+	fname
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file path.
+
+Description:
+
+
+Return Values:
+	Time of last file status change as time_t value.
+
+------------------------------------------------------------------------------ */
+
+time_t getFileLastStatus (const char *fname) {
+
+	char		*full_name;
+	struct stat	statbuf;
+	time_t		retval;
+
+	if ((full_name = strdup (fname)) == NULL) {
+		return FALSE;
+	}
+
+	stripTrailingChar (full_name, '/');
+	if (stat (full_name, &statbuf) == -1) {
+		retval = FALSE;
+	} else {
+#if defined __USE_XOPEN2K8
+		retval = statbuf.st_ctim.tv_sec;
+#else
+		retval = statbuf.st_ctime;
+#endif
+	}
+
+	free (full_name);
+	return retval;
+
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	splitFilenameExt
+ *
+ * Format
+ *	int splitFilenameExt (const char *fname, char **ext)
+ *
+ * Arguments
+ * 	fname
+ *
+ *
+ * 	ext
+ *
+ * Description
+ *	Separate filename from extension, where the extension is defined as the
+ *	substring following the last '.'  This function will modify the input
+ *	string, so use a copy if you need to save the original.  In fname, the
+ *	final '.' will be replaced with a NUL character.  The ext argument will
+ *	point to the first character of the extension on return.  If there is
+ *	no extension, ext will be NULL.
+ *
+ *	This function does not perform any validation on the filename whatsoever.
+ *
+ * Return Values
+ * 	0		success
+ *	non-zero	failure
+ *
+ * -------------------------------------------------------------------------- */
+
+int splitFilenameExt (const char *fname, char **ext) {
+	if (!fname || !*ext) {
+		*ext = NULL;
+		return 1;
+	}
+
+	if (*fname == '\0') {
+		*ext = NULL;
+		return 1;
+	}
+
+	if ((*ext = rindex (fname, '.')) != NULL) {
+		**ext = '\0';
+		(*ext)++;
+	}
+
+	return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	raiseCase
+ *
+ * Format
+ *	char *raiseCase (char *string)
+ *
+ * Arguments
+ *	string
+ *	A nul-terminated string containing the text to be made upper case.
+ *	This is a read/write argument with the result be written in place.
+ *
+ * Description
+ *	This function takes a nul-terminated string and makes it all upper case.
+ *
+ * Return Values
+ *	Pointer to string.
+ *
+ * -------------------------------------------------------------------------- */
+
+char *raiseCase (char *string) {
+	int		i;
+
+	if (string == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL pointer passed\n", __FUNCTION__);
+		return NULL;
+	}
+
+	for (i = 0; i < strlen (string); i++) {
+		string[i] = toupper (string[i]);
+	}
+
+	return string;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	lowerCcase
+ *
+ * Format
+ *	char *lowerCase (char *string)
+ *
+ * Arguments
+ *	string
+ *	A nul-terminated string containing the text to be made lower case.
+ *	This is a read/write argument with the result be written in place.
+ *
+ * Description
+ *	This function takes a nul-terminated string and makes it all lower case.
+ *
+ * Return Values
+ *	Pointer to string.
+ *
+ * -------------------------------------------------------------------------- */
+
+char *lowerCase (char *string) {
+
+	int		i;
+
+	if (string == NULL) {
+		fprintf (stderr, "ERROR: %s - NULL pointer passed\n", __FUNCTION__);
+		return NULL;
+	}
+
+	for (i = 0; i < strlen (string); i++) {
+		string[i] = tolower (string[i]);
+	}
+
+	return string;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	isNumber
+ *
+ * Format
+ *	int isNumber (char *string)
+ *
+ * Arguments
+ *	string
+ *	A nul-terminated string.
+ *
+ * Description
+ *	This function examines every character in 'string' to see if it	is a
+ *	numeric character as defined by the 'isdigit' macro.
+ *
+ * Return Values
+ * 	TRUE	if all characters in 'string' are numeric.
+ * 	FALSE	if any of the characters in 'string' are not numeric, or if
+ * 		'string' is a NULL pointer or has zero length.
+ *
+ * -------------------------------------------------------------------------- */
+
+int isNumber (char *string) {
+
+	int		i;
+
+	if ((string == NULL) || (string[0] == '\0')) {
+		fprintf (stderr, "ERROR: %s - NULL pointer passed\n", __FUNCTION__);
+		return (FALSE);
+	}
+
+	for (i = 0; i < strlen (string); i++) {
+		if (!isdigit(string[i])) {
+			return (FALSE);
+		}
+	}
+
+	return (TRUE);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	moveFile
+ *
+ * Format
+ *	int moveFile (char *inpath, char *outpath)
+ *
+ * Arguments
+ *	inpath
+ *	A nul-terminated string containing an absolute or relative path to a file
+ *	or directory to be moved or renamed.
+ *
+ *	outpath
+ *	A nul-terminated string containing an absolute or relative path serving
+ *	as the destination for the 'inpath'.
+ *
+ * Description
+ *	This function executes the Unix command "mv <inpath> <outpath>", with
+ *	<inpath> and <outpath> being the two arguments to this function.
+ *
+ * Return Values
+ * 	0		success
+ *
+ *	ENOENT		if 'inpath' or 'outpath' are NULL pointers or are zero-
+ *			length, or if inpath does not exist.
+ *
+ *	EEXIST		destination already exists
+ *
+ *	Other values as returned by the 'mv' command.
+ *
+ * -------------------------------------------------------------------------- */
+
+int moveFile (char *inpath, char *outpath, int overwrite) {
+
+	int	retval;
+	char	*filename;
+	char	*tmp_string;
+	char	*fullname;
+
+	if ((inpath == NULL) || (*inpath == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid source path passed\n", __FUNCTION__);
+		return ENOENT;
+	}
+
+	if ((outpath == NULL) || (*outpath == '\0')) {
+		fprintf (stderr, "ERROR: %s Invalid destination path passed\n", __FUNCTION__);
+		return ENOENT;
+	}
+
+	if (!fileExists (inpath)) {
+		return ENOENT;
+	}
+
+	if (isRegularFile (inpath) && isDirectory (outpath)) {	/* Extract file name and append to outpath */
+		tmp_string = strdup (inpath);
+		filename = basename (tmp_string);
+		fullname = malloc (strlen (outpath) + strlen (filename) + 2);
+		sprintf (fullname, "%s/%s", outpath, filename);
+		free (tmp_string);
+	} else {
+		fullname = strdup (outpath);
+	}
+
+	if (isRegularFile (outpath)) {
+		if (overwrite) {
+			unlink (outpath);
+		} else {
+			free (fullname);
+			return EEXIST;
+		}
+	}
+
+	if ((retval = rename (inpath, fullname)) == -1) {
+		perror ("In moveFile");
+	}
+
+	free (fullname);
+	return retval;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	copyFile
+ *
+ * Format
+ *	int copyFile (const char* source, const char* destination)
+ *
+ * Arguments
+ *	path
+ *	A nul-terminated string containing the new desired working directory.
+ *
+ *	create
+ *	An integer value used to indicate the action to take if 'path' does not
+ *	exist. *
+ *
+ * Description
+ *	This function is used to create a copy of an existing file. While the
+ *	file is being copied, the copy is set to write-only by the owner to
+ *	prevent incomplete reading by a process that may be polling the directory
+ *	for input.
+ *
+ * Return Values
+ *	0		success
+ *	-1		an error occurred.  'errno' will be set appropriately.
+ *
+ * -------------------------------------------------------------------------- */
+
+int copyFile (const char* source, const char* destination) {
+
+	int		input;
+	int		output;
+	int		result;
+	struct stat	fileinfo		= { 0 };
+
+	if ((input = open (source, O_RDONLY)) == -1) {
+		return -1;
+	}
+	if ((output = open (destination, O_RDWR | O_CREAT, S_IWUSR)) == -1) {
+		close (input);
+		return -1;
+	}
+
+	if ((result = fstat (input, &fileinfo)) != 0) {
+		close (input);
+		close (output);
+		return result;
+	}
+
+	/* Here we use kernel-space copying for performance reasons */
+#if defined(__APPLE__) || defined(__FreeBSD__)
+	/* fcopyfile works on FreeBSD and OS X 10.5+ */
+	result = fcopyfile (input, output, 0, COPYFILE_ALL);
+#else
+	/* sendfile will work with non-socket output (i.e. regular file) on Linux 2.6.33+ */
+	off_t		bytesCopied		= 0;
+
+	result = sendfile (output, input, &bytesCopied, fileinfo.st_size);
+#endif
+
+	close (input);
+	close (output);
+
+	if (result == 0) {
+		result = chmod (destination, fileinfo.st_mode);
+	} else {
+		result = unlink (destination);
+	}
+
+	return result;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	changeDirectory
+ *
+ * Format
+ *	int changeDirectory (char *path, int create)
+ *
+ * Arguments
+ *	path
+ *	A nul-terminated string containing the new desired working directory.
+ *
+ *	create
+ *	An integer value used to indicate the action to take if 'path' does not
+ *	exist. *
+ *
+ * Description
+ *	This function is used to change the current working directory.  If the
+ *	specified directory does not exist and 'create' is non-zero, then the
+ *	specified directory will be created.
+ *
+ * Return Values
+ *	0		success
+ *	-1		an error occurred.  'errno' will be set appropriately.
+ *
+ * -------------------------------------------------------------------------- */
+
+int changeDirectory (char *path, int create) {
+
+	int retval = 0;
+
+	if ((path == NULL) || (*path == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid path passed\n", __FUNCTION__);
+		return (-1);
+	}
+
+	if (chdir (path) == -1) {
+		if (errno == ENOENT) { /* Create the directory if it doesn't exist */
+			if (create) {
+				if (mkdir (path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+					fprintf (stderr, "ERROR: %s Error %d while creating directory %s\n", __FUNCTION__, errno, path);
+					retval = -1;
+				} else if (chdir (path) == -1) {
+					fprintf (stderr, "ERROR: %s Error %d while changing directory to %s\n", __FUNCTION__, errno, path);
+					retval = -1;
+				}
+			} else {
+				fprintf (stderr, "ERROR: %s - Error %d while changing directory to %s\n", __FUNCTION__, errno, path);
+				retval = -1;
+			}
+		} else {
+			fprintf (stderr, "ERROR: %s - Error %d while changing directory to %s\n", __FUNCTION__, errno, path);
+			retval = -1;
+		}
+	}
+
+	return (retval);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	dirtok_r
+ *
+ * Format
+ *	char *dirtok_r (char *path, char **remdir)
+ *
+ * Arguments
+ *	path
+ *	On the first call, contains a nul-terminated string containing an
+ *	absolute or relative path.  On subsequent calls, must be NULL.
+ *
+ *	remdir
+ *	Pointer to string that will contain the remaining string.
+ *
+ * Description
+ *	Path
+ *
+ * Return Values
+ *	pointer to next directory string
+ *	NULL on error or when no more subdirectories remaining.
+ *
+ * -------------------------------------------------------------------------- */
+
+char *dirtok_r (char *path, char **rpath) {
+
+	char	*p;	/* Points to the beginning of the current subdir token */
+	char	*t;	/* points to the remainder of the string. */
+
+	if (path) {
+		if (path[strlen(path)-1] == '/') {	/* Get rid of trailing '/' */
+			path[strlen(path)-1] = '\0';
+		}
+		p = t = path;
+
+		/* Find the beginning of a name */
+		if (*t == '/') {
+			t++;
+		} else if (((*t == '.') || (*t == '~')) && (*(t+1) == '/')) {
+			t += 2;
+		} else if (((*t == '.') && (*(t+1) == '.') && (*(t+2) == '/'))) {
+			t += 3;
+		}
+
+	} else {
+		if (**rpath == '\0') {
+			return NULL;
+		}
+
+		p = t = *rpath;
+	}
+
+	while ((*t != '/') && (*t != '\0'))
+		t++;
+
+	if (*t == '/') {
+		*rpath = t+1;
+		*t = '\0';
+	} else {
+		*rpath = t;
+	}
+
+	return p;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	makeDirectory
+ *
+ * Format
+ *	int makeDirectory (char *path, int make_parent, unsigned in perms)
+ *
+ * Arguments
+ *	path
+ *	A nul-terminated string containing the new desired directory.
+ *
+ * Description
+ *	This function is used to create a new directory.  If the specified
+ *	already exists, then success is returned as if the directory was
+ *	successfully created.
+ *
+ * Return Values
+ *	0		success
+ *	-1		an error occurred.  'errno' will be set appropriately.
+ *
+ * -------------------------------------------------------------------------- */
+
+int makeDirectory (char *path, int make_parent, unsigned int perms) {
+
+	int	retval = 0;
+	mode_t	oldmask;
+
+	if ((path == NULL) || (*path == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid path passed\n", __FUNCTION__);
+		return (-1);
+	}
+
+	if (strcmp (path, "/") == 0) {
+		fprintf (stderr, "ERROR: %s - Tried to create directory '/'\n", __FUNCTION__);
+		return (-1);
+	}
+
+	if (perms == 0) {
+		fprintf (stderr, "ERROR: %s - Invalid directory permissions (0) passed\n", __FUNCTION__);
+		return (-1);
+	}
+
+	/* oldmask = umask (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); */
+	oldmask = umask (0);
+
+	if (make_parent) {
+		char	*tmpPath;
+		char	*subDir;
+		char	*remPath;
+		char	*buildPath = NULL;
+		int	retval;
+
+		if ((tmpPath = strdup (path)) == NULL) {
+			fprintf (stderr, "ERROR: %s - Call to strdup failed\n", __FUNCTION__);
+			umask (oldmask);
+			return (-1);
+		}
+
+		subDir = dirtok_r (tmpPath, &remPath);
+		while (subDir) {
+			if (!buildPath) {
+				buildPath = strdup (subDir);
+			} else {
+				buildPath = realloc (buildPath, strlen (buildPath) + strlen (subDir) + 2);
+				sprintf (buildPath, "%s/%s", buildPath, subDir);
+			}
+
+			retval = fileExists (buildPath);
+			if (retval != 1) {
+				if (mkdir (buildPath, perms) != 0) {
+					fprintf (stderr, "ERROR: %s - Error (%d) %s while creating directory %s\n", __FUNCTION__, errno, strerror (errno), buildPath);
+					free (buildPath);
+					free (tmpPath);
+					umask (oldmask);
+					return -1;
+				}
+			}
+
+			subDir = dirtok_r (NULL, &remPath);
+		}
+
+		free (buildPath);
+		free (tmpPath);
+	} else {
+
+		if (fileExists (path)) {
+			retval = -1;
+		} else if (mkdir (path, perms) != 0) {
+			fprintf (stderr, "ERROR: %s - Error %d while creating directory %s\n", __FUNCTION__, errno, path);
+			retval = -1;
+		}
+	}
+
+	umask (oldmask);
+	return (retval);
+}
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	freeVector
+ *
+ * Format
+ *	void freeVector (char **vector)
+ *
+ * Arguments
+ *
+ * Description
+ *	A vector is an array of pointers of indeterminate size.  The end of the
+ *	array is marked by the presence of a NULL pointer.
+ *
+ *	This function will free all memory in a dynamically allocated vector.
+ *
+ * Return Values
+ *	This function does not return any values.
+ *
+ * -------------------------------------------------------------------------- */
+
+void freeVector (char **vector) {
+
+	char	**pvtr;
+
+	if (vector == NULL) {
+		return;
+	}
+
+	for (pvtr = vector; *pvtr; pvtr++) {
+		free (*pvtr);
+	}
+
+	free (vector);
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	printStringVector
+ *
+ * Format
+ *	void printStringVector (char **vector)
+ *
+ * Arguments
+ *
+ * Description
+ *	A vector is an array of pointers of indeterminate size.  The end of the
+ *	array is marked by the presence of a NULL pointer.
+ *
+ *	This function assumes the input vector contains strings.  It will
+ *	output each element string to stdout and halt once the end is reached.
+ *
+ * Return Values
+ *	This function does not return any values.
+ *
+ * -------------------------------------------------------------------------- */
+
+void printVector (char **vector) {
+
+	char	**pvtr;
+
+	if (vector == NULL) {
+		return;
+	}
+
+	for (pvtr = vector; *pvtr; pvtr++) {
+		printf ("%s\n", *pvtr);
+	}
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	getFileAge
+ *
+ * Format
+ *	long getFileAge (char *filepath)
+ *
+ * Arguments
+ *	filepath
+ *	A nul-terminated string containing an absolute or relative file path.
+ *
+ * Description
+ *	This function finds the age of a file in minutes.  It uses the 'stat'
+ *	function to get file information and uses the mtime field to determine
+ *	its last modification time, which is interpreted (for better or worse)
+ *	as its creation time.
+ *
+ * Return Values
+ *	-1		if an error occurs.
+ *	non-negative	the age of the specified file in minutes.
+ *
+ * -------------------------------------------------------------------------- */
+
+long getFileAge (char *filepath) {
+	struct stat		statbuf;			/* Structure for storing file attributes */
+	long			file_age;
+
+	if ((filepath == NULL) || (*filepath == '\0')) {
+		fprintf (stderr, "ERROR: %s - Invalid file name passed\n", __FUNCTION__);
+		return (-1);
+	}
+
+	if (stat (filepath, &statbuf) == -1) {
+		fprintf (stderr, "ERROR: %s - Error %d while trying to stat %s\n", __FUNCTION__, errno, filepath);
+		return (-1);
+	}
+
+	file_age = (long) difftime (time (NULL), statbuf.st_mtime);
+	return (file_age / 60);
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	getBlockSize
+
+Prototype:
+	long getBlockSize (char *filename)
+
+Arguments:
+
+	filename
+	Type:		char *
+	Access:		read only
+
+	nul-terminated string containing a file name
+
+Description:
+
+Return Values:
+
+------------------------------------------------------------------------------ */
+
+long getBlockSize (char *filename) {
+
+	struct stat		statbuf;
+
+	if ((filename == NULL) || (strlen (filename) == 0)) {
+		return -1;
+	}
+
+	if (stat (filename, &statbuf) == -1) {
+		return -1;
+	}
+
+	return (long) statbuf.st_blksize;
+}
+
+/* ------------------------------------------------------------------------------
+
+Function Name:
+	stripTrailingChar
+
+Prototype:
+	void stripTrailingChar (char *string, char theChar)
+
+Arguments:
+
+	string
+	Type:		char *
+	Access:		read/write
+
+	nul-terminated string, possibly containing unwanted characters at the end.
+
+	theChar
+	Type:		char
+	Access:		read only
+
+	char to strip from the end of the 'string'.
+
+Description:
+
+Return Values:
+	N/A
+
+------------------------------------------------------------------------------ */
+
+char *stripTrailingChar (char *string, char theChar) {
+
+	while (string[strlen(string)-1] == theChar) {
+		string[strlen(string)-1] = '\0';
+	}
+
+	return string;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	reopenStdFile
+ *
+ * Format
+ *	int reopenStdFile (int fd, char *path)
+ *
+ * Arguments
+ *	fd
+ *	File descriptor to be reopened.
+ *
+ *	path
+ *	Path of file to be reopened.
+ *
+ * Description
+ *	This function is designed to be used to detach stdin, stdout, or
+ *	stderr from their associated terminal and reallocate them to
+ *	files.  For instance, to make stdout write to the file "myout.txt",
+ *	use:
+ *		reopenStdFile (1, "myout.txt");
+ *
+ * Return Values
+ *	0	Success
+ *	-1	opened file descriptor is not the same as the closed one.
+ *	On open or close error, the value of errno is returned.
+ *
+ * -------------------------------------------------------------------------- */
+
+ int reopenStdFile (int fd, char *path) {
+
+
+#define OPENPERMS		O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU
+#define OPENMODE		S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
+
+	int	rstat;
+
+	if ((rstat = close (fd)) == -1) {
+		return errno;
+	}
+
+	if ((rstat = open (path, OPENPERMS, OPENMODE)) == -1) {
+		return errno;
+	}
+
+	return (rstat == fd) ? 0 : -1;
+}
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ *	removeExtension
+ *
+ * Format
+ *	void removeExtension (char *fname)
+ *
+ * Arguments
+ *	fname
+ *	String containing file name
+ *
+ * Description
+ * 	Removes the file extension from the passed file name string.
+ *
+ * Return Values
+ * 	N/A
+ *
+ * -------------------------------------------------------------------------- */
+
+void removeExtension (char *fname) {
+	char	*lastdot;
+	char	*lastsep;
+
+	if (fname == NULL)
+		return;
+
+	lastdot = strrchr (fname, '.');
+	lastsep = strrchr (fname, '/');
+
+	/* If it has an extension separator. */
+
+	if (lastdot != NULL) {	/* and it's before the extension separator */
+		if (lastsep != NULL) {
+			if (lastsep < lastdot) {
+				*lastdot = '\0';
+			}
+		} else {	/* has extension separator with no path separator. */
+			*lastdot = '\0';
+		}
+	}
+}
diff --git a/fileIngest/stdclib.hin b/fileIngest/stdclib.hin
new file mode 100644
index 000000000..9933a13b1
--- /dev/null
+++ b/fileIngest/stdclib.hin
@@ -0,0 +1,61 @@
+/*
+ * mystdlib.h
+ *
+ *  Created on: Mar 3, 2012
+ *      Author: brapp
+ */
+
+#ifndef MYSTDLIB_H_
+#define MYSTDLIB_H_
+
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#define TRUE		(1)
+#define FALSE		(0)
+#define YES		(1)
+#define NO		(0)
+#define SUCCESS		(0)
+#define ERROR		(0)
+
+#define EVENT_SIZE	(sizeof (struct inotify_event))
+#define EVENT_BUF_LEN	(1024 * (EVENT_SIZE + 16))
+#define MAX_STR_LEN	1023
+
+#ifdef __GNUC__
+#define fatal(...)\
+{\
+    fprintf(stderr, "FATAL ERROR OCCURRED: ");\
+    fprintf(stderr, __VA_ARGS__);\
+    fprintf(stderr, ": %s\n", strerror(errno));\
+    exit(-1);\
+}
+
+#else /* __GNUC__ */
+void
+fatal(const char * fmt, ...)
+{
+	va_list list;
+
+	fprintf(stderr, "FATAL ERROR OCCURRED: ");
+	va_start(list, fmt);
+	vfprintf(stderr, fmt, list);
+	va_end(list);
+	fprintf(stderr, ": %s\n", strerror(errno));
+	exit(-1);
+}
+
+#endif /* __GNUC__ */
+
+#define isDirectory(fname)	(getFileType (fname) == S_IFDIR)
+#define isRegularFile(fname)	(getFileType (fname) == S_IFREG)
+#define isPipe(fname)		(getFileType (fname) == S_IFIFO)
+#define isSymLink(fname)	(getFileType (fname) == S_IFLNK)
+#define isSocket(fname)		(getFileType (fname) == S_IFSOCK)
+#define isCharDev(fname)	(getFileType (fname) == S_IFCHR)
+#define isBlockDev(fname)	(getFileType (fname) == S_IFBLK)
+
+@FUNCTION_DECLARATIONS@
+
+#endif /* MYSTDLIB_H_ */
diff --git a/fileIngest/validateXML.c b/fileIngest/validateXML.c
new file mode 100644
index 000000000..e7de1c20b
--- /dev/null
+++ b/fileIngest/validateXML.c
@@ -0,0 +1,63 @@
+/*
+ ============================================================================
+ Name        : xmlvalidation.c
+ ============================================================================
+ */
+
+#include <stdio.h>
+
+#define LIBXML_SCHEMAS_ENABLED
+#include <libxml/xmlschemastypes.h>
+
+int main () {
+	xmlDocPtr doc;
+	xmlSchemaPtr schema = NULL;
+	xmlSchemaParserCtxtPtr ctxt;
+	char *XMLFileName = "test.xml";
+	char *XSDFileName = "test.xsd";
+
+	xmlLineNumbersDefault (1);
+
+	ctxt = xmlSchemaNewParserCtxt (XSDFileName);
+
+	xmlSchemaSetParserErrors (ctxt, (xmlSchemaValidityErrorFunc) fprintf,
+	                (xmlSchemaValidityWarningFunc) fprintf, stderr);
+	schema = xmlSchemaParse (ctxt);
+	xmlSchemaFreeParserCtxt (ctxt);
+//xmlSchemaDump(stdout, schema); //To print schema dump
+
+	doc = xmlReadFile (XMLFileName, NULL, 0);
+
+	if (doc == NULL) {
+		fprintf (stderr, "Could not parse %s\n", XMLFileName);
+	} else {
+		xmlSchemaValidCtxtPtr ctxt;
+		int ret;
+
+		ctxt = xmlSchemaNewValidCtxt (schema);
+		xmlSchemaSetValidErrors (ctxt,
+		                (xmlSchemaValidityErrorFunc) fprintf,
+		                (xmlSchemaValidityWarningFunc) fprintf, stderr);
+		ret = xmlSchemaValidateDoc (ctxt, doc);
+		if (ret == 0) {
+			printf ("%s validates\n", XMLFileName);
+		} else if (ret > 0) {
+			printf ("%s fails to validate\n", XMLFileName);
+		} else {
+			printf ("%s validation generated an internal error\n",
+			                XMLFileName);
+		}
+		xmlSchemaFreeValidCtxt (ctxt);
+		xmlFreeDoc (doc);
+	}
+
+// free the resource
+	if (schema != NULL)
+		xmlSchemaFree (schema);
+
+	xmlSchemaCleanupTypes ();
+	xmlCleanupParser ();
+	xmlMemoryDump ();
+
+	return (0);
+}
diff --git a/fileIngest/xmlreader.c b/fileIngest/xmlreader.c
new file mode 100644
index 000000000..21f7d5f6b
--- /dev/null
+++ b/fileIngest/xmlreader.c
@@ -0,0 +1,103 @@
+/**
+ * section: xmlReader
+ * synopsis: Parse an XML file with an xmlReader
+ * purpose: Demonstrate the use of xmlReaderForFile() to parse an XML file
+ *          and dump the informations about the nodes found in the process.
+ *          (Note that the XMLReader functions require libxml2 version later
+ *          than 2.6.)
+ * usage: reader1 <filename>
+ * test: reader1 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+ * author: Daniel Veillard
+ * copy: see Copyright for the status of this software.
+ */
+
+#include <stdio.h>
+#include <libxml2/libxml/xmlreader.h>
+
+#ifdef LIBXML_READER_ENABLED
+
+/**
+ * processNode:
+ * @reader: the xmlReader
+ *
+ * Dump information about the current node
+ */
+static void processNode (xmlTextReaderPtr reader) {
+	const xmlChar *name, *value;
+
+	name = xmlTextReaderConstName (reader);
+	if (name == NULL)
+		name = BAD_CAST "--";
+
+	value = xmlTextReaderConstValue (reader);
+
+	printf ("%d %d %s %d %d", xmlTextReaderDepth (reader),
+	                xmlTextReaderNodeType (reader), name,
+	                xmlTextReaderIsEmptyElement (reader),
+	                xmlTextReaderHasValue (reader));
+	if (value == NULL)
+		printf ("\n");
+	else {
+		if (xmlStrlen (value) > 40)
+			printf (" %.40s...\n", value);
+		else
+			printf (" %s\n", value);
+	}
+}
+
+/**
+ * streamFile:
+ * @filename: the file name to parse
+ *
+ * Parse and print information about an XML file.
+ */
+static void streamFile (const char *filename) {
+	xmlTextReaderPtr reader;
+	int ret;
+
+	reader = xmlReaderForFile (filename, NULL, 0);
+	if (reader != NULL) {
+		ret = xmlTextReaderRead (reader);
+		while (ret == 1) {
+			processNode (reader);
+			ret = xmlTextReaderRead (reader);
+		}
+		xmlFreeTextReader (reader);
+		if (ret != 0) {
+			fprintf (stderr, "%s : failed to parse\n", filename);
+		}
+	} else {
+		fprintf (stderr, "Unable to open %s\n", filename);
+	}
+}
+
+int main (int argc, char **argv) {
+	if (argc != 2)
+		return (1);
+
+	/*
+	 * this initialize the library and check potential ABI mismatches
+	 * between the version it was compiled for and the actual shared
+	 * library used.
+	 */
+	LIBXML_TEST_VERSION
+
+	streamFile (argv[1]);
+
+	/*
+	 * Cleanup function for the XML library.
+	 */
+	xmlCleanupParser ();
+	/*
+	 * this is to debug memory for regression tests
+	 */
+	xmlMemoryDump ();
+	return (0);
+}
+
+#else
+int main(void) {
+	fprintf(stderr, "XInclude support not compiled in\n");
+	exit(1);
+}
+#endif
diff --git a/mcast_lib/FMTP b/mcast_lib/FMTP
deleted file mode 160000
index a2ed3b062..000000000
--- a/mcast_lib/FMTP
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2ed3b0628b4007f161eecb499a70159fb062c3b
diff --git a/noaaport/noaaportIngester.c b/noaaport/noaaportIngester.c
index b75b589df..24df8524e 100644
--- a/noaaport/noaaportIngester.c
+++ b/noaaport/noaaportIngester.c
@@ -149,7 +149,7 @@ decodeCommandLine(
                 break;
             case 's': {
 #ifdef RETRANS_SUPPORT
-                strcpy(sbn_channel_name, optarg);
+                strncpy(sbn_channel_name, optarg, 12);
                 if(!strcmp(optarg,NAME_SBN_TYP_GOES)) {
                     sbn_type = SBN_TYP_GOES;
                     break;
@@ -216,7 +216,7 @@ decodeCommandLine(
             }
             case 't':
 #ifdef RETRANS_SUPPORT
-                strcpy(transfer_type, optarg);
+                strncpy(transfer_type, optarg, 9);
                 if(!strcmp(transfer_type,"MHS") || !strcmp(transfer_type,"mhs")){
                      /** Using MHS for communication with NCF  **/
                 }else{
@@ -890,7 +890,7 @@ initRetransSupport(
     #ifdef RETRANS_SUPPORT
         if (isMcastInput && retrans_xmit_enable == OPTION_ENABLE) {
             // Copy mcastAddress needed to obtain the cpio entries
-            (void)strcpy(mcastAddr, mcastSpec);
+            (void)strncpy(mcastAddr, mcastSpec, 15);
         }
     #endif
 }
diff --git a/noaaport/nport.h b/noaaport/nport.h
index 75d8c6e38..796ba58d0 100644
--- a/noaaport/nport.h
+++ b/noaaport/nport.h
@@ -67,6 +67,7 @@
 #define NAME_PROD_TYPE_GOESR_WEST	"GOES_R_WEST"		/* name for GOES-R West product type	*/
 #define NAME_PROD_TYPE_POLAR_SAT	"POLAR_SAT"		/* name for (NPP/JPSS) product type	*/
 
+/*
 #define GET_PROD_TYPE_NAME(ptype)  \
 	((ptype==PROD_TYPE_GOES_EAST)?NAME_PROD_TYPE_GOES_EAST:\
 	(ptype==PROD_TYPE_GOES_WEST)?NAME_PROD_TYPE_GOES_WEST:\
@@ -83,6 +84,7 @@
 	(ptype==PROD_TYPE_GOESR_WEST)?NAME_PROD_TYPE_GOESR_WEST:\
 	(ptype==PROD_TYPE_POLAR_SAT)?NAME_PROD_TYPE_POLAR_SAT:\
 	(ptype==PROD_TYPE_RESERVE)?"RESERVE":"UNKNOWN")
+*/
 
 #define PROD_CAT_TEXT			1	/* text product cat		*/
 #define PROD_CAT_GRAPHIC		2	/* graphic product cat		*/
diff --git a/noaaport/productMaker.c b/noaaport/productMaker.c
index a34b5e37b..8ede951f9 100644
--- a/noaaport/productMaker.c
+++ b/noaaport/productMaker.c
@@ -3,7 +3,6 @@
  *   See file COPYRIGHT for copying and redistribution conditions.
  */
 #include <config.h>
-
 #include "fifo.h"
 #include "goes.h"
 #include "ldm.h"
@@ -56,6 +55,8 @@ extern void       process_prod(
     LdmProductQueue* const      lpq,
     psh_struct*                 psh,
     sbn_struct*                 sbn);
+static int	  inflateData (const char *inBuf, unsigned long inLen, const char *outBuf, unsigned long *outLen, unsigned int blk);
+static int	  deflateData (const char *inBuf, unsigned long inLen, const char *outBuf, unsigned long *outLen, unsigned int blk);
 static int        prod_get_WMO_nnnxxx_offset (char *wmo_buff, int max_search, int *p_len);
 static int        prod_get_WMO_offset (char *buf, size_t buflen, size_t *p_wmolen);
 static int        getIndex (char *arr, int pos, int sz);
@@ -303,10 +304,6 @@ int    nnnxxx_offset;
          buff_hdr = (BUFF_HDR *) malloc(sizeof(BUFF_HDR));
          if(init_buff_hdr(buff_hdr) < 0){
             log_error("Unable to initialize buffer header \n");
-            if (acq_tbl) {
-                        free(acq_tbl);
-            }
-
             if (p_prod_retrans_table) {
                   free(p_prod_retrans_table);
             }
@@ -456,8 +453,7 @@ int    nnnxxx_offset;
         log_info("SBN datastream %d command %d", sbn->datastream, sbn->command);
         log_debug("SBN version %d length offset %d", sbn->version, sbn->len);
 
-        if (((sbn->command != SBN_CMD_DATA) && (sbn->command != SBN_CMD_TIME)) ||
-                (sbn->version != 1)) {
+        if (((sbn->command != SBN_CMD_DATA) && (sbn->command != SBN_CMD_TIME)) || (sbn->version != 1)) {
             log_error("Unknown sbn command/version %d PUNT", sbn->command);
             continue;
         }
@@ -526,10 +522,8 @@ int    nnnxxx_offset;
         }
 
         log_debug("header length %ld [pshlen = %d]", pdh->len + pdh->pshlen, pdh->pshlen);
-        log_debug("blocks per record %ld records per block %ld\n", pdh->blocks_per_record,
-                pdh->records_per_block);
-        log_debug("product seqnumber %ld block number %ld data block size %ld", pdh->seqno,
-                pdh->dbno, pdh->dbsize);
+        log_debug("blocks per record %ld records per block %ld\n", pdh->blocks_per_record, pdh->records_per_block);
+        log_debug("product seqnumber %ld block number %ld data block size %ld", pdh->seqno, pdh->dbno, pdh->dbsize);
 
         /* Stop here if no psh */
         if ((pdh->pshlen == 0) && (pdh->transtype == 0)) {
@@ -545,15 +539,14 @@ int    nnnxxx_offset;
 #endif
         if (pdh->pshlen != 0) {
             if (fifo_getBytes(fifo, buf + sbn->len + pdh->len, pdh->pshlen) != 0) {
-                        log_error("problem reading psh");
+                log_error("problem reading psh");
                 continue;
             }
             log_debug("read psh %d", pdh->pshlen);
 
             /* Timing block */
             if (sbn->command == SBN_CMD_TIME) {
-                log_debug("Timing block recieved %ld %ld\0", psh->olen,
-                        pdh->len);
+                log_debug("Timing block recieved %ld %ld\0", psh->olen, pdh->len);
                 /*
                  * Don't step on our psh of a product struct of prod in
                  * progress.
@@ -574,8 +567,7 @@ int    nnnxxx_offset;
             log_debug("product header flag %d, version %d", psh->hflag, psh->version);
             log_debug("prodspecific data length %ld", psh->psdl);
             log_debug("bytes per record %ld", psh->bytes_per_record);
-            log_debug("Fragments = %ld category %d ptype %d code %d", psh->frags, psh->pcat,
-                    psh->ptype, psh->pcode);
+            log_debug("Fragments = %ld category %d ptype %d code %d", psh->frags, psh->pcat, psh->ptype, psh->pcode);
             if (psh->frags < 0)
                 log_error("check psh->frags %d", psh->frags);
             if (psh->origrunid != 0)
@@ -783,8 +775,7 @@ int    nnnxxx_offset;
                     PNGINIT = 0;
                 }
 
-                log_error("Product definition header version %d pdhlen %d", pdh->version,
-                        pdh->len);
+                log_error("Product definition header version %d pdhlen %d", pdh->version, pdh->len);
                 log_error("PDH transfer type %u", pdh->transtype);
 
                 if ((pdh->transtype & 8) > 0)
@@ -840,8 +831,7 @@ int    nnnxxx_offset;
             MD5Init(md5ctxp);
 
             if (GOES == 1) {
-                if (readpdb (buf + IOFF + sbn->len + pdh->len + pdh->pshlen, psh, pdb,
-                        PROD_COMPRESSED, pdh->dbsize) == -1) {
+                if (readpdb (buf + IOFF + sbn->len + pdh->len + pdh->pshlen, psh, pdb, PROD_COMPRESSED, pdh->dbsize) == -1) {
                     log_error ("Error reading pdb, punt");
                     continue;
                 }
@@ -943,8 +933,7 @@ int    nnnxxx_offset;
 
         if (GOES == 1) {
             if (pfrag->fragnum > 0) {
-                if (prod.tail && ((pfrag->fragnum != prod.tail->fragnum + 1) ||
-                        (pfrag->seqno != prod.seqno))) {
+                if (((prod.tail != NULL) && (pfrag->fragnum != prod.tail->fragnum + 1)) || (pfrag->seqno != prod.seqno)) {
                     log_error("Missing GOES fragment in sequence, "
                             "last %d/%d this %d/%d\0", prod.tail->fragnum,
                             prod.seqno, pfrag->fragnum, pfrag->seqno);
@@ -1228,6 +1217,7 @@ int    nnnxxx_offset;
                             pfrag->fragnum, pfrag->seqno);
 
 #ifdef RETRANS_SUPPORT
+
                                       if(retrans_xmit_enable == OPTION_ENABLE){
                                          acq_tbl->proc_acqtab_prodseq_errs++;
                         log_debug("do_prod_mismatch() proc_base_prod_seqno_last = %d \n",
@@ -1858,15 +1848,7 @@ static int deflateData(
 
 /*******************************************************************************
 FUNCTION NAME
-        int prod_get_WMO_offset(char *buf, size_t buflen, size_t *p_wmolen)
-
-FUNCTION DESCRIPTION
-        Parse the wmo heading from buffer and load the appropriate prod
-        info fields.  The following regular expressions will satisfy this
-        parser.  Note this parser is not case sensative.
-/*******************************************************************************
-FUNCTION NAME
-        int prod_get_WMO_offset(char *buf, size_t buflen, size_t *p_wmolen)
+        int prod_get_WMO_offset(char *buf, int buflen, int *p_wmolen)
 
 FUNCTION DESCRIPTION
         Parse the wmo heading from buffer and load the appropriate prod
@@ -1905,25 +1887,23 @@ RETURNS
         -1: otherwise
 *******************************************************************************/
 
-
-
-#define WMO_TTAAII_LEN          6
-#define WMO_CCCC_LEN            4
-#define WMO_DDHHMM_LEN          6
-#define WMO_DDHH_LEN            4
-#define WMO_BBB_LEN                     3
-
-#define WMO_T1  0
-#define WMO_T2  1
-#define WMO_A1  2
-#define WMO_A2  3
-#define WMO_I1  4
-#define WMO_I2  5
-
-#define NNN_LEN                 3
-#define XXX_LEN                 3
-#define AWIPSID_LEN             WMO_CCCC_LEN + NNN_LEN + XXX_LEN
-#define MAX_SECLINE_LEN         40
+#define WMO_TTAAII_LEN		6
+#define WMO_CCCC_LEN		4
+#define WMO_DDHHMM_LEN		6
+#define WMO_DDHH_LEN		4
+#define WMO_BBB_LEN		3
+
+#define WMO_T1			0
+#define WMO_T2			1
+#define WMO_A1			2
+#define WMO_A2			3
+#define WMO_I1			4
+#define WMO_I2			5
+
+#define NNN_LEN			3
+#define XXX_LEN			3
+#define AWIPSID_LEN		WMO_CCCC_LEN + NNN_LEN + XXX_LEN
+#define MAX_SECLINE_LEN		40
 
 
 static int prod_get_WMO_offset(char *buf, size_t buflen, size_t *p_wmolen)
diff --git a/noaaport/retrans/acq_ldm_ctl.c b/noaaport/retrans/acq_ldm_ctl.c
index 4875f6a5d..eaaa626b4 100644
--- a/noaaport/retrans/acq_ldm_ctl.c
+++ b/noaaport/retrans/acq_ldm_ctl.c
@@ -229,6 +229,9 @@ RETURNS
 
 #define SLEEP_SEMTAKE_WAIT 2 /* wait for semaphore */
 
+#define MAX_INPUT_STRING	256
+#define LEN_INPUT_OPTION	128
+
 /* setup shared memory parameters in this process */
 	ACQ_TABLE       *acq_table;	/* acquisition table ptr */
 
@@ -250,7 +253,7 @@ typedef struct		input {		/* user input options */
 	int		shutdown_flag;	/* operator shutdown acq flag */
 	int		NCF_only_flag;	/* sbn downlink flag */
 	int		kill_flag;	/* operator kill acq flag */
-	char	input_option[128];	/* operator input option string */
+	char	input_option[LEN_INPUT_OPTION+1];	/* operator input option string */
 }    INPUT;
 
 /**** prototypes ****/
@@ -302,7 +305,7 @@ main(argc, argv)	/* argument #1 is a test SHMnumber */
 
 	char 	*get_shm_ptr();
 	int		ii;
-	char	in_line[256];	/* operator input */
+	char	in_line[MAX_INPUT_STRING];	/* operator input */
 	int     shm_region;             /* shared mem region */
 	int		extend_flag=0;	/* extended acq_table flag */
 	ACQ_TABLE	*p_acqtable_tmp; 	/* pointer to acq_table */
@@ -404,7 +407,8 @@ main(argc, argv)	/* argument #1 is a test SHMnumber */
 		  } else {
 		  	printf("\n%s Select link(%d) option[0-%d]?", PNAME,global_i_cpiofd, LAST_COMMAND);
 		  }
-		  gets(in_line);
+		  fgets(in_line, MAX_INPUT_STRING, stdin);
+
 		  flag = 0;
 		  if((in_line[0]!='\0')) {
 		  	printf("Input command: %s", in_line);
@@ -465,7 +469,7 @@ main(argc, argv)	/* argument #1 is a test SHMnumber */
 static int acqctl_do_confirm(char *in_command, INPUT *p_input)
 {
 	const char FUNCNAME[] = "acqctl_do_confirm";
-	char	in_line[256];
+	char	in_line[MAX_INPUT_STRING];
 
 	in_line[0] = '\0';
 
@@ -475,7 +479,7 @@ static int acqctl_do_confirm(char *in_command, INPUT *p_input)
 
 	printf("%s Are you sure want to %s [Y/N]?",
 		PNAME, in_command);
-	gets(in_line);
+	fgets(in_line, MAX_INPUT_STRING, stdin);
 	printf("Returned confirmation is: %s",in_line);
 
 	if((in_line[0]!='Y') && in_line[0]!='y') {
@@ -500,7 +504,7 @@ static int acqctl_do_confirm(char *in_command, INPUT *p_input)
 static int acqctl_do_caution(char *in_command, INPUT *p_input)
 {
 	const char FUNCNAME[] = "acqctl_do_caution";
-	char	in_line[256];
+	char	in_line[MAX_INPUT_STRING];
 
 	in_line[0] = '\0';
 
@@ -512,7 +516,7 @@ static int acqctl_do_caution(char *in_command, INPUT *p_input)
 		PNAME);
 	printf("%s Are you sure want to %s [Y/N]?",
 		PNAME, in_command);
-	gets(in_line);
+	fgets(in_line, MAX_INPUT_STRING, stdin);
 	printf("Returned confirmation is: %s",in_line);
 
 	if((in_line[0]!='Y') && in_line[0]!='y') {
@@ -541,7 +545,7 @@ static int acqctl_get_response(
 		int *rtn_code)
 {
 	const char FUNCNAME[] = "acqctl_get_response";
-	char	in_line[256];
+	char	in_line[MAX_INPUT_STRING];
 
 	in_line[0] = '\0';
 
@@ -553,7 +557,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_YES_NO is: %s",in_line);
 		if((in_line[0]=='Y') || in_line[0]=='y') {
@@ -581,7 +585,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_YES_NO_DFLT_YES is: %s",in_line);
 		if((in_line[0]=='Y') || in_line[0]=='y') {
@@ -608,7 +612,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to question is: %s",in_line);
 		if((in_line[0]=='S') || in_line[0]=='s') {
@@ -637,7 +641,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to question is: %s",in_line);
 		if((in_line[0]=='S') || in_line[0]=='s') {
@@ -665,7 +669,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_DISCARD_RESUME is: %s",in_line);
 		if((in_line[0]=='D') || in_line[0]=='d') {
@@ -693,7 +697,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_ENABLE_DISABLE is: %s",in_line);
 		if((in_line[0]=='E') || in_line[0]=='e') {
@@ -721,7 +725,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_OPEN_CLOSE is: %s",in_line);
 		if((in_line[0]=='C') || in_line[0]=='c') {
@@ -749,7 +753,7 @@ static int acqctl_get_response(
 			strcpy(in_line, p_input->input_option);
 			printf("%s\n", in_line);
 		} else {
-			gets(in_line);
+			fgets(in_line, MAX_INPUT_STRING, stdin);
 		}
 		printf("Response to ASK_ADD_DROP is: %s",in_line);
 		if((in_line[0]=='D') || in_line[0]=='d') {
@@ -830,7 +834,7 @@ acqctl_do_action(
 
 	int		log_product_flag;		/* log product flag */	
 
-	char	in_line[256];		/* operator input */
+	char	in_line[MAX_INPUT_STRING];		/* operator input */
 	int	temp_i_cpiofd;		/* temp cpiofd */
 	int	temp_i_wait_connect_interval;	/* temp wait connect interval */
 	int	temp_i_wait_delay_xmit_interval;	/* temp wait xmit rqst interval */
@@ -1002,7 +1006,7 @@ acqctl_get_pid(
 	}
 
 	pclose(fp);
-	return last_pid;
+	return (int) last_pid;
 
 } /* end routine acqctl_get_pid */
 
@@ -1047,7 +1051,7 @@ cmd_line(
   	    printf("getopt returned %c\n", (char)c);
 	    switch(c) {
 		case 'i': {
-			strcpy(p_input->input_option,optarg);
+			strncpy(p_input->input_option,optarg, LEN_INPUT_OPTION);
 			break;
 		}
 		case 'k': {
@@ -1094,7 +1098,7 @@ cmd_line(
 			break;
 		}
 		case 'c': {
-			strcpy(input_string, optarg);
+			strncpy(input_string, optarg, 79);
 			printf(" input is %s\n", input_string);
 			/* strcpy(input_string, p_input->input_command); */
 			p_in_args = &input_string[0];
@@ -1161,6 +1165,7 @@ cmd_line(
 		}
 		case '?': {
 			usage();
+			break;
 		}
 		default:
 		        break; 
diff --git a/noaaport/retrans/acq_ldm_freeshm.c b/noaaport/retrans/acq_ldm_freeshm.c
index 4e140c6d1..381c32c7f 100644
--- a/noaaport/retrans/acq_ldm_freeshm.c
+++ b/noaaport/retrans/acq_ldm_freeshm.c
@@ -35,6 +35,7 @@ typedef struct	input 	{		/* user input options */
 /**** prototypes ****/
 void usage(void);
 int cmd_line(int argc, char *argv[], INPUT *p_input);
+int com_shmFree(int SHMnumber);
 
 char	PNAME[40];
 
diff --git a/noaaport/retrans/acq_ldm_getshm.c b/noaaport/retrans/acq_ldm_getshm.c
index e16e251e6..0615f96e0 100644
--- a/noaaport/retrans/acq_ldm_getshm.c
+++ b/noaaport/retrans/acq_ldm_getshm.c
@@ -51,34 +51,64 @@ int cmd_line(int argc, char *argv[], INPUT *p_input);
 
 #define VAR_GET_SHMEM(a,b,c,d)  VAR_LEAN_GET_SHMEM(a,b,c,d,SHM_REUSE_FLAG)
 
-void VAR_LEAN_GET_SHMEM(char *a,ACQ_TABLE ss, int z, int k, int r) { 
-    /* allocate and set a shared memory segment if required or requested */ 
-	long ii,iii;
-
-	a = (char *)NULL; 
-    if (!(r) || !com_shmIsAlloc(k)) { 
-        if ((a = (char *)com_shmAlloc((sizeof(ss)*z), k)) == (char *)NULL) { 
-            printf(" Key=%d ret(0x%lx) com_shmAlloc " "size(%ld bytes) FAILED\n", k, (unsigned long) a, (sizeof(ss)*z)); 
-            exit(99); 
-        } 
-        ii=(sizeof(ss)*z); 
-        iii=z; 
-        printf(" Key=%d alloc shm OK.. at(0x%lx) (%ld/%ld bytes) s[%d]\n", k,(unsigned long) a, (sizeof(ss)*z),ii/iii,z); 
-        /* fill it and detach it */ 
-        (char *)memset((char *)a,0,(size_t)(sizeof(ss)*z)); 
-        com_shmDetach(a); 
-    } else { 
-        if ((a = (char *)get_shm_ptr(k,a,DEBUGGETSHM)) == (char *)NULL) { 
-            printf(" KEY %d Get get_shm_ptr FAILED \n", k); 
-            exit(0); 
-        } else { 
-            printf(" KEY %d Get get_shm_ptr OK at (0x%lx)\n", k,(unsigned long) a); 
-		}
-        memset(a,0,(sizeof(ss)*z)); 
-        com_shmDetach(a); 
-    } 
+#define VAR_LEAN_GET_SHMEM(a, ss, z, k, r) { \
+    /* allocate and set a shared memory segment if required or requested */ \
+	a = (char *)NULL; \
+    if (!(r) || !com_shmIsAlloc(k)) { \
+        if ((a = \
+            (char *)com_shmAlloc((sizeof(ss)*z), k)) == (char *)NULL) { \
+            printf(" Key=%d ret(0x%p) com_shmAlloc size(%ld bytes) FAILED\n", \
+                    k, (void *) a, (sizeof(ss)*z)); \
+            exit(99); \
+        } \
+        ii=(sizeof(ss)*z); \
+        iii=z; \
+        printf(" Key=%d alloc shm OK at(0x%p) (%ld/%d bytes) s[%d]\n", \
+        k, (void *) a, (sizeof(ss)*z),ii/iii,z); \
+        /* fill it and detach it */ \
+        memset(a,0,(sizeof(ss)*z)); \
+        com_shmDetach(a); \
+    } else { \
+        if ((a = (char *)get_shm_ptr(k,#a,DEBUGGETSHM)) == (char *)NULL) { \
+            printf(" KEY %d Get get_shm_ptr FAILED \n", k); \
+            exit(0); \
+        } else { \
+            printf(" KEY %d Get get_shm_ptr OK at (0x%p)\n", k, (void *) a); \
+	}\
+        memset(a,0,(sizeof(ss)*z)); \
+        com_shmDetach(a); \
+    } \
 }
 
+//void VAR_LEAN_GET_SHMEM(char *a, ACQ_TABLE ss, int z, int k, int r) {
+//    /* allocate and set a shared memory segment if required or requested */
+//	long ii,iii;
+//
+//	a = (char *)NULL;
+//    if (!(r) || !com_shmIsAlloc(k)) {
+//        if ((a = (char *)com_shmAlloc((sizeof(ss)*z), k)) == (char *)NULL) {
+//            printf(" Key=%d ret(0x%lx) com_shmAlloc " "size(%ld bytes) FAILED\n", k, (unsigned long) a, (sizeof(ss)*z));
+//            exit(99);
+//        }
+//        ii=(sizeof(ss)*z);
+//        iii=z;
+//        printf(" Key=%d alloc shm OK.. at(0x%lx) (%ld/%ld bytes) s[%d]\n", k,(unsigned long) a, (sizeof(ss)*z),ii/iii,z);
+//        /* fill it and detach it */
+//        (char *)memset((char *)a,0,(size_t)(sizeof(ss)*z));
+//        com_shmDetach(a);
+//    } else {
+//        if ((a = (char *)get_shm_ptr(k,a,DEBUGGETSHM)) == (char *)NULL) {
+//            printf(" KEY %d Get get_shm_ptr FAILED \n", k);
+//            exit(0);
+//        } else {
+//            printf(" KEY %d Get get_shm_ptr OK at (0x%lx)\n", k,(unsigned long) a);
+//		}
+//        memset(a,0,(sizeof(ss)*z));
+//        com_shmDetach(a);
+//    }
+//}
+
+
 char	PNAME[40];
 int MaxLinks;
 
@@ -88,23 +118,14 @@ int argc;
 char **argv;
 {
 	INPUT   input;				/* user input options */
-	int 	SHMnumber;
 	char 	*address=NULL; 
-	char 	*address1; 
 	int		ii,iii,iiii;		/* loop counter */
 	long	tot_shmem;			/* total amount of shared memory */
 	long	new_shmem;			/* new amount of shared memory */
-	long	add_array_shmem;	/* add array amount of shared memory */
-	long	add_bytes_shmem;	/* add bytes amount of shared memory */
 	int		shm_region;			/* shm region */
 	int		new_key;			/* shm key */
 	ACQ_TABLE *acq_table;				/* acq table */
-	ACQ_TABLE	*p_acqtable;			/* acq table ptr */
 	ACQ_TABLE	*p_acqtable_link;		/* acq table link ptr */
-	int		extend_host_flag;	/* extended structure flag */
-	int		extend_group_flag;	/* extended structure flag */
-	int		size_of_acqtable;	/* size of acqtable per link */
-	int		size_of_group_info;	/* size of group_info per link */
 	ACQ_TABLE	acq_tbl;
 
 	strcpy(PNAME, "acq_getshm");
@@ -126,69 +147,60 @@ char **argv;
 	tot_shmem = 0;
 /* 	ACQ_TABLE         acquisition table */
 
-	 	MaxLinks = MAX_LINKS;
-
-		FIND_SHMKEY_REGION(new_key,ACQ_TABLE_SHMKEY,shm_region);
-		
-
-			VAR_LEAN_GET_SHMEM(address,acq_tbl,MAX_LINKS, new_key, SHM_REUSE_FLAG);
-			new_shmem = (sizeof(ACQ_TABLE) * MaxLinks);
-			tot_shmem += new_shmem;
-			printf("  acq_table tot=%ld(%d links x %ld per acq_tbl) bytes address=%lx\n",
-				new_shmem, MaxLinks, sizeof(ACQ_TABLE),(unsigned long)address);
-
-
-
-		/* Now update the internal acq_table value */
-		GET_SHMPTR_DEBUG(acq_table, ACQ_TABLE,
-			SHMKEY_REGION(ACQ_TABLE_SHMKEY ,shm_region), DebugShm);
-		/* tcq_table = address; */
-		printf("xxxxxxxxxxxxxxxx  = 0x%lx\n",(unsigned long) acq_table);
-		printf("yyyyyyyyyyyyyyyy  = 0x%lx\n",(unsigned long) &acq_table[0]);
-		p_acqtable = acq_table;
-		for(iiii=0; iiii< MaxLinks; iiii++) {
-				p_acqtable_link = &acq_table[iiii];
-				if(input.verbose) {
-					printf("  p_acqtable_link[%d]=0x%lx\n", 
-						iiii,(unsigned long) p_acqtable_link);
-				} else {
-					if((iiii <= 1) || (iiii == (MaxLinks -1))) {
-						printf("  p_acqtable_link[%d]=0x%lx\n", 
-							iiii,(unsigned long) p_acqtable_link);
-					}
-				}
-			p_acqtable_link->max_links = (unsigned char)MaxLinks; 
-			p_acqtable_link->link_id = (unsigned char)iiii; 
-			p_acqtable_link->pid = 0; 
-
-			p_acqtable_link->proc_base_prod_cat_last = 0;
-			p_acqtable_link->proc_base_prod_code_last = 0;
-			p_acqtable_link->proc_base_prod_type_last = 0;
-			p_acqtable_link->proc_base_prod_seqno_last = 0;
-			p_acqtable_link->proc_orig_prod_seqno_last = 0;
-			p_acqtable_link->read_distrib_enable = 0;
-
-			p_acqtable_link->proc_base_channel_type_last = SBN_TYP_NMC;
-			p_acqtable_link->proc_retransmit_ctl_flag = 0;
-			p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_GEN_RQST;
-			p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_XMIT_RQST;
-			p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_DUP_DISCARD;
-			p_acqtable_link->proc_retransmit_delay_send = DEFAULT_RETRANSMIT_DELAY_SEND; 
-	
-			p_acqtable_link->proc_prod_run_id = 0;
-			p_acqtable_link->proc_orig_prod_run_id= 0;
-
-			p_acqtable_link->proc_tot_prods_retrans_rcvd = 0;	
-			p_acqtable_link->proc_tot_prods_retrans_rcvd_lost = 0;	
-			p_acqtable_link->proc_tot_prods_retrans_rcvd_notlost = 0;
-			p_acqtable_link->proc_tot_prods_retrans_rqstd = 0;
-			
+	MaxLinks = MAX_LINKS;
+
+	FIND_SHMKEY_REGION(new_key,ACQ_TABLE_SHMKEY,shm_region);
+
+
+	VAR_LEAN_GET_SHMEM(address, acq_tbl, MAX_LINKS, new_key, SHM_REUSE_FLAG);
+	new_shmem = (sizeof(ACQ_TABLE) * MaxLinks);
+	tot_shmem += new_shmem;
+	printf("  acq_table tot=%ld(%d links x %ld per acq_tbl) bytes address=%lx\n",
+		new_shmem, MaxLinks, sizeof(ACQ_TABLE),(unsigned long)address);
+
+	/* Now update the internal acq_table value */
+	GET_SHMPTR_DEBUG(acq_table, ACQ_TABLE, SHMKEY_REGION(ACQ_TABLE_SHMKEY ,shm_region), DebugShm);
+	/* tcq_table = address; */
+	printf("xxxxxxxxxxxxxxxx  = 0x%lx\n",(unsigned long) acq_table);
+	printf("yyyyyyyyyyyyyyyy  = 0x%lx\n",(unsigned long) &acq_table[0]);
+	for(iiii=0; iiii< MaxLinks; iiii++) {
+		p_acqtable_link = &acq_table[iiii];
+		if(input.verbose) {
+			printf("  p_acqtable_link[%d]=0x%lx\n", iiii,(unsigned long) p_acqtable_link);
+		} else {
+			if((iiii <= 1) || (iiii == (MaxLinks -1))) {
+				printf("  p_acqtable_link[%d]=0x%lx\n", iiii,(unsigned long) p_acqtable_link);
+			}
 		}
-	
-		printf("  subtotal ACQ_TABLE key(0x%x)= %ld bytes\n", 
-			new_key, new_shmem);
 
+		p_acqtable_link->max_links = (unsigned char)MaxLinks;
+		p_acqtable_link->link_id = (unsigned char)iiii;
+		p_acqtable_link->pid = 0;
+
+		p_acqtable_link->proc_base_prod_cat_last = 0;
+		p_acqtable_link->proc_base_prod_code_last = 0;
+		p_acqtable_link->proc_base_prod_type_last = 0;
+		p_acqtable_link->proc_base_prod_seqno_last = 0;
+		p_acqtable_link->proc_orig_prod_seqno_last = 0;
+		p_acqtable_link->read_distrib_enable = 0;
+
+		p_acqtable_link->proc_base_channel_type_last = SBN_TYP_NMC;
+		p_acqtable_link->proc_retransmit_ctl_flag = 0;
+		p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_GEN_RQST;
+		p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_XMIT_RQST;
+		p_acqtable_link->proc_retransmit_ctl_flag |= ENABLE_RETRANS_DUP_DISCARD;
+		p_acqtable_link->proc_retransmit_delay_send = DEFAULT_RETRANSMIT_DELAY_SEND;
+	
+		p_acqtable_link->proc_prod_run_id = 0;
+		p_acqtable_link->proc_orig_prod_run_id= 0;
+	
+		p_acqtable_link->proc_tot_prods_retrans_rcvd = 0;
+		p_acqtable_link->proc_tot_prods_retrans_rcvd_lost = 0;
+		p_acqtable_link->proc_tot_prods_retrans_rcvd_notlost = 0;
+		p_acqtable_link->proc_tot_prods_retrans_rqstd = 0;
+	}
 	
+	printf("  subtotal ACQ_TABLE key(0x%x)= %ld bytes\n", new_key, new_shmem);
 	printf("acq_getshm Done OK get shmem total = %ld bytes\n", tot_shmem);
 
 	exit(0);
@@ -208,8 +220,7 @@ cmd_line(
 	char *argv[],
 	INPUT *p_input)
 {
-	int     c;
-	int		flag;
+	int	c;
 
 	/* input initialization */
 	p_input->verbose = 0;
diff --git a/noaaport/retrans/retrans.c b/noaaport/retrans/retrans.c
index b78db272a..f61844f15 100644
--- a/noaaport/retrans/retrans.c
+++ b/noaaport/retrans/retrans.c
@@ -60,8 +60,7 @@ int init_retrans(PROD_RETRANS_TABLE **pp_prod_retrans_table)
 
 	pl_prod_retrans_table = *pp_prod_retrans_table;
 
-	if(log_is_enabled_debug)
-		log_debug("%s Begin init retrans_table   base=0x%x\n", FNAME, pl_prod_retrans_table);
+	log_debug("%s Begin init retrans_table   base=0x%x\n", FNAME, pl_prod_retrans_table);
 
 	global_time_zone = (char *) utc_time;
 
@@ -79,10 +78,8 @@ int init_retrans(PROD_RETRANS_TABLE **pp_prod_retrans_table)
 		ii = 0; /* For now set to 0; Later can setup retrans table depending on the channel type */
 		pl_prod_retrans_table->entry_info[GET_RETRANS_TABLE_TYP(sbn_type)].
 			numb_entries = GET_RETRANS_CHANNEL_ENTRIES(sbn_type);
-	if(log_is_enabled_debug){
 		log_debug("%s Total retrans numb_entries for channel %s of sbn_type (%d) = %d \n",
                                FNAME, sbn_channel_name,sbn_type,pl_prod_retrans_table->entry_info[ii].numb_entries);
-	}
 
 		pl_prod_retrans_table->entry_info[GET_RETRANS_TABLE_TYP(sbn_type)].
 			retrans_entry_base_offset = (long)entry_base -
@@ -138,10 +135,8 @@ int init_retrans(PROD_RETRANS_TABLE **pp_prod_retrans_table)
 				p_retrans_entry[iii].entry_flag = 0;
 				p_retrans_entry[iii].WMO_hdr_abbrev[0] = '\0';
 			} /* end for each numb entries */
-		if(log_is_enabled_debug){
-			log_debug("%s  OK init retrans_table for channel [%s] numb_entries = %d\n",FNAME,
-						sbn_channel_name,pl_prod_retrans_table->entry_info[ii].numb_entries);
-		}
+		log_debug("%s  OK init retrans_table for channel [%s] numb_entries = %d\n",FNAME,
+				sbn_channel_name,pl_prod_retrans_table->entry_info[ii].numb_entries);
 
 	} /* end if pl_prod_retrans_table != NULL */
 
@@ -166,8 +161,7 @@ int init_retrans(PROD_RETRANS_TABLE **pp_prod_retrans_table)
 		log_notice(" OK open pipe[%d] for %s\n", global_retransmitpipe_fd,DEFAULT_RETRANSMIT_PIPENAME);
 	}
 
-	if(log_is_enabled_debug)
-		log_debug("%s Exiting  init retrans_table   base=0x%lx\n", FNAME,(unsigned long) pl_prod_retrans_table);
+	log_debug("%s Exiting  init retrans_table   base=0x%lx\n", FNAME,(unsigned long) pl_prod_retrans_table);
 	return(0);
 
 } /* end init_retrans */
@@ -317,15 +311,13 @@ int generate_retrans_rqst(ACQ_TABLE *p_acqtable,
 	p_pipe_requesthdr->pipe_request_cause = RETRANS_RQST_CAUSE_RCV_ERR;
 
 
-        if(log_is_enabled_debug){
-            log_debug("pipe_request_numb = %ld | ctl_flag = %d | link_id = %d | channel_type = %d | rqst cause = %d \n",
-            p_pipe_requesthdr->pipe_request_numb,p_pipe_requesthdr->pipe_ctl_flag,p_pipe_requesthdr->pipe_link_id,
-            p_pipe_requesthdr->pipe_channel_type,p_pipe_requesthdr->pipe_request_cause);
+	log_debug("pipe_request_numb = %ld | ctl_flag = %d | link_id = %d | channel_type = %d | rqst cause = %d \n",
+			p_pipe_requesthdr->pipe_request_numb,p_pipe_requesthdr->pipe_ctl_flag,p_pipe_requesthdr->pipe_link_id,
+			p_pipe_requesthdr->pipe_channel_type,p_pipe_requesthdr->pipe_request_cause);
 
-            log_debug("cpio addr = %ld | rqst time = %ld | first prod seqno = [%d-%ld] | last prod seqno = %ld | run number = %d | delay_send = %d \n",
-            p_pipe_requesthdr->pipe_cpio_addr, p_pipe_requesthdr->pipe_request_time,p_pipe_requesthdr->pipe_first_prod_seqno,first_prod_seqno,
-            p_pipe_requesthdr->pipe_last_prod_seqno,p_pipe_requesthdr->pipe_run_numb,p_pipe_requesthdr->pipe_delay_send);
-        }
+	log_debug("cpio addr = %ld | rqst time = %ld | first prod seqno = [%d-%ld] | last prod seqno = %ld | run number = %d | delay_send = %d \n",
+			p_pipe_requesthdr->pipe_cpio_addr, p_pipe_requesthdr->pipe_request_time,p_pipe_requesthdr->pipe_first_prod_seqno,first_prod_seqno,
+			p_pipe_requesthdr->pipe_last_prod_seqno,p_pipe_requesthdr->pipe_run_numb,p_pipe_requesthdr->pipe_delay_send);
 
 	/* Now write to pipe */
 	if((bytes_written = write(global_retransmitpipe_fd,
@@ -390,13 +382,8 @@ int prod_retrans_ck(ACQ_TABLE *p_acqtable, BUFF_HDR *p_buffhdr, time_t *orig_arr
 
 	if(p_acqtable->proc_orig_prod_seqno_last != 0) {
 
-		if (log_is_enabled_debug)/* Debug only */
-		{
-			log_debug("%s ok retrans channel_typ=%d tbl[%d] so ck more\n",
-				FNAME,
-				p_acqtable->proc_base_channel_type_last,
-				retrans_table_type);
-		}
+		log_debug("%s ok retrans channel_typ=%d tbl[%d] so ck more\n",
+			FNAME, p_acqtable->proc_base_channel_type_last, retrans_table_type);
 
 		/* Assume have retransmitted product do following */
 		p_acqtable->proc_tot_prods_retrans_rcvd++,
@@ -432,8 +419,7 @@ int prod_retrans_ck(ACQ_TABLE *p_acqtable, BUFF_HDR *p_buffhdr, time_t *orig_arr
 			
 		}
 
-		if (log_is_enabled_debug){
-			log_debug("%s %s duplicate run(%d) prod|orig(%ld|%ld) tbl[%d]=%ld\n",
+		log_debug("%s %s duplicate run(%d) prod|orig(%ld|%ld) tbl[%d]=%ld\n",
 			FNAME,
 			(match_value==PROD_DUPLICATE_MATCH)?"OK MATCH":"NO MATCH",
 			p_acqtable->proc_orig_prod_run_id,
@@ -442,7 +428,6 @@ int prod_retrans_ck(ACQ_TABLE *p_acqtable, BUFF_HDR *p_buffhdr, time_t *orig_arr
 			index_value,
 			p_retrans_entry[index_value].prod_seqno);
 	
-			}
 		/* Check if retransmit prod is within range of table entries */
 		orig_prod_seqno = (long)p_acqtable->proc_orig_prod_seqno_last;
 		now_prod_seqno = (long)p_buffhdr->proc_prod_seqno;
@@ -541,38 +526,35 @@ int prod_retrans_ck(ACQ_TABLE *p_acqtable, BUFF_HDR *p_buffhdr, time_t *orig_arr
 			RETRANS_ENTRY_FLAG_NEW_W_DUP:0), 0);
 
 	p_retrans_entry_info->index_last = index_value;
-	p_retrans_entry_info->run_id_last = 
-		p_acqtable->proc_prod_run_id; 
+	p_retrans_entry_info->run_id_last = p_acqtable->proc_prod_run_id;
 
 /* Debug only */
 
-	if(log_is_enabled_debug) {
-		if(match_value & PROD_NODUPLICATE) {
-	    	log_debug(" %s %s entry(%d) prod(%ld) code=%d %s[%d]\n",
-				FNAME,
-				GET_PROD_TYPE_NAME(p_buffhdr->proc_prod_type),
-				index_value,
-				p_buffhdr->proc_prod_seqno, 
-				p_buffhdr->proc_prod_code,
-				(match_value & PROD_NODUPLICATE)?"NO_DUPL":
-				(match_value & PROD_DUPLICATE_MATCH)?"DUPL_MATCH":
-				(match_value & PROD_DUPLICATE_NOMATCH)?"DUPL_NOMATCH":
-					"UNKNOWN",
-				match_value);
-		} else {
-	    	log_debug("%s %s entry(%d) prod|orig(%ld|%ld) code=%d %s[%d]\n",
-				FNAME,
-				GET_PROD_TYPE_NAME(p_buffhdr->proc_prod_type),
-				index_value,
-				p_buffhdr->proc_prod_seqno, 
-				p_acqtable->proc_orig_prod_seqno_last, 
-				p_buffhdr->proc_prod_code,
-				(match_value & PROD_NODUPLICATE)?"NO_DUPL":
-				(match_value & PROD_DUPLICATE_MATCH)?"DUPL_MATCH":
-				(match_value & PROD_DUPLICATE_NOMATCH)?"DUPL_NOMATCH":
-					"UNKNOWN",
-				match_value);
-		}
+	if(match_value & PROD_NODUPLICATE) {
+		log_debug(" %s %s entry(%d) prod(%ld) code=%d %s[%d]\n",
+			FNAME,
+			GET_PROD_TYPE_NAME(p_buffhdr->proc_prod_type),
+			index_value,
+			p_buffhdr->proc_prod_seqno,
+			p_buffhdr->proc_prod_code,
+			(match_value & PROD_NODUPLICATE)?"NO_DUPL":
+			(match_value & PROD_DUPLICATE_MATCH)?"DUPL_MATCH":
+			(match_value & PROD_DUPLICATE_NOMATCH)?"DUPL_NOMATCH":
+				"UNKNOWN",
+			match_value);
+	} else {
+		log_debug("%s %s entry(%d) prod|orig(%ld|%ld) code=%d %s[%d]\n",
+			FNAME,
+			GET_PROD_TYPE_NAME(p_buffhdr->proc_prod_type),
+			index_value,
+			p_buffhdr->proc_prod_seqno,
+			p_acqtable->proc_orig_prod_seqno_last,
+			p_buffhdr->proc_prod_code,
+			(match_value & PROD_NODUPLICATE)?"NO_DUPL":
+			(match_value & PROD_DUPLICATE_MATCH)?"DUPL_MATCH":
+			(match_value & PROD_DUPLICATE_NOMATCH)?"DUPL_NOMATCH":
+				"UNKNOWN",
+			match_value);
 	}
 /* Debug only */
 
@@ -596,9 +578,8 @@ int prod_retrans_update_entry(
 	
 
 /* Debug only */
-	if(log_is_enabled_debug) {
 		if(p_buffhdr != (BUFF_HDR *)NULL) {
-	    	log_debug("%s %s prod(%ld) code=%d %s[0x%x] update\n",
+			log_debug("%s %s prod(%ld) code=%d %s[0x%x] update\n",
 				FNAME,
 				GET_PROD_TYPE_NAME(p_buffhdr->proc_prod_type),
 				prod_seqno,
@@ -611,7 +592,7 @@ int prod_retrans_update_entry(
 				"UNKNOWN",
 				entry_flag);
 		} else {
-	    	log_debug("%s prod(%ld)  %s[0x%x] update\n",
+			log_debug("%s prod(%ld)  %s[0x%x] update\n",
 				FNAME,
 				prod_seqno,
 				(entry_flag & RETRANS_ENTRY_FLAG_AVAIL)?"AVAIL":
@@ -622,7 +603,6 @@ int prod_retrans_update_entry(
 				"UNKNOWN",
 				entry_flag);
 		}
-	}
 /* Debug only */
 
 	/* Check if entry is to be made available again */
@@ -637,8 +617,7 @@ int prod_retrans_update_entry(
 	if(entry_flag & RETRANS_ENTRY_FLAG_RETRANS_DUP){
 		p_retrans_entry->entry_flag |= RETRANS_ENTRY_FLAG_RETRANS_DUP; 
 		/* Also, update the arrival time */
-		p_retrans_entry->prod_arrive_time = 
-			p_acqtable->proc_prod_start_time;	
+		p_retrans_entry->prod_arrive_time = p_acqtable->proc_prod_start_time;
 		/* Note this does not change any other contents of the entry */
 		return(0);
 	}
@@ -648,8 +627,7 @@ int prod_retrans_update_entry(
 
 	/* Use last acqtable values for these */
 	p_retrans_entry->prod_run_id = in_run_id;
-	p_retrans_entry->prod_arrive_time = 
-		p_acqtable->proc_prod_start_time;	
+	p_retrans_entry->prod_arrive_time = p_acqtable->proc_prod_start_time;
 
 	/* Use current buffhdr values for these */
 	if(p_buffhdr != (BUFF_HDR *)NULL) {
@@ -705,25 +683,11 @@ int prod_retrans_get_addr(
 		return(ERROR);
 	}
 
-	if((retrans_table_typ = 
-		GET_RETRANS_TABLE_TYP(channel_type)) >= 0) {
-		p_retrans_entry_info = 
-			&prod_retrans_table->entry_info[retrans_table_typ];
-		p_retrans_entry = (PROD_RETRANS_ENTRY *)
-			(((long)&p_retrans_entry_info->retrans_entry_base_offset) +
-			 	p_retrans_entry_info->retrans_entry_base_offset);
-	} else {
-		/* have invalid table type */
-		*in_p_retrans_entry_info = (PROD_RETRANS_ENTRY_INFO *)NULL;
-		*in_p_retrans_entry = (PROD_RETRANS_ENTRY *)NULL;
-		*in_retrans_table_typ = 0;
-		/* so ignore lookup */
-		log_error("%s invalid channel_typ=%d tbl[%d] ignore\n",
-			FNAME,
-			channel_type,
-			retrans_table_typ);
-		return(ERROR);
-	}
+	retrans_table_typ = 0;
+	p_retrans_entry_info = &prod_retrans_table->entry_info[retrans_table_typ];
+	p_retrans_entry = (PROD_RETRANS_ENTRY *)
+			(((long) &p_retrans_entry_info->retrans_entry_base_offset) +
+				  p_retrans_entry_info->retrans_entry_base_offset);
 
 	*in_p_retrans_entry_info = p_retrans_entry_info;
 	*in_p_retrans_entry = p_retrans_entry;
@@ -843,7 +807,7 @@ char *get_date_time(const  struct tm *p_tm, char *tz)
 			strftime (buf, sizeof (buf), "%c", p_tm);
 			*/
 			strftime (buf, sizeof (buf), "%m/%d/%Y %T", p_tm);
-			if(strcmp(tz, "GMT") || strcmp(tz, "UTC")) {
+			if (!strcmp(tz, "GMT") || !strcmp(tz, "UTC")) {
 				/* Skip the GMT or UTC label for time */
 			} else {
 				ptr = (char *)(buf + strlen(buf));
@@ -851,7 +815,7 @@ char *get_date_time(const  struct tm *p_tm, char *tz)
 			}
 		} else {
 			strftime (buf, sizeof (buf), "%m/%d/%Y %T %Z", p_tm);
-			if(strstr(buf, "GMT") || strstr(buf, "UTC")) {
+			if (!strstr(buf, "GMT") && !strstr(buf, "UTC")) {
 				/* Skip the GMT or UTC label for time */
 				strftime (buf, sizeof (buf), "%m/%d/%Y %T", p_tm);
 			}
@@ -911,10 +875,10 @@ int do_prod_mismatch(ACQ_TABLE *p_acqtable, BUFF_HDR *p_buffhdr)
 					/* its a duplicate retrans and hence may get discarded */
 					/*  Note: This needs to be done only when retrans prod is in error again and again*/
 					if(p_acqtable->proc_orig_prod_seqno_last != 0){
-                                           if(log_is_enabled_debug)
 						log_debug(" Aborting orig seqno [%ld] in retrans table. Cuurent prod seqno [%ld] \n",
-                                                                                p_acqtable->proc_orig_prod_seqno_last,proc_prod_seqno);
-						prod_retrans_abort_entry(p_acqtable, p_acqtable->proc_orig_prod_seqno_last, RETRANS_RQST_CAUSE_RCV_ERR);
+							p_acqtable->proc_orig_prod_seqno_last,proc_prod_seqno);
+							prod_retrans_abort_entry(p_acqtable, p_acqtable->proc_orig_prod_seqno_last,
+							RETRANS_RQST_CAUSE_RCV_ERR);
 					}
 					
 				}
@@ -997,12 +961,10 @@ int prod_retrans_abort_entry (ACQ_TABLE *p_acqtable, long prod_seqno, int err_ca
 		index_value = 0;
 	}
 
-	if(log_is_enabled_info){
-		log_info("%s ok abort %s tbl[%d]=%ld\n",FNAME,
+	log_info("%s ok abort %s tbl[%d]=%ld\n",FNAME,
 		GET_SBN_TYP_NAME(p_acqtable->proc_base_channel_type_last),
 		index_value,
 		p_retrans_entry[index_value].prod_seqno);
-	}
 
 	prod_retrans_update_entry(p_acqtable, (BUFF_HDR *)NULL,
 		p_retrans_entry_info,
diff --git a/noaaport/retrans/retrans.h b/noaaport/retrans/retrans.h
index a8c7424d0..a03ae7981 100644
--- a/noaaport/retrans/retrans.h
+++ b/noaaport/retrans/retrans.h
@@ -42,15 +42,15 @@
 #define DEFAULT_RETRANS_ENTRIES_GOES 2000
 #define DEFAULT_RETRANS_ENTRIES_GOES_EAST 2000
 #define DEFAULT_RETRANS_ENTRIES_GOES_WEST 2000
-#define DEFAULT_RETRANS_ENTRIES_NMC 20000
-#define DEFAULT_RETRANS_ENTRIES_NMC2 100000
-#define DEFAULT_RETRANS_ENTRIES_NOAAPORT_OPT 50000
-#define DEFAULT_RETRANS_ENTRIES_NMC3 5000
+#define DEFAULT_RETRANS_ENTRIES_NMC 500000
+#define DEFAULT_RETRANS_ENTRIES_NMC2 200000
+#define DEFAULT_RETRANS_ENTRIES_NOAAPORT_OPT 100000
+#define DEFAULT_RETRANS_ENTRIES_NMC3 1000
 #define DEFAULT_RETRANS_ENTRIES_NMC1 5000
 #define DEFAULT_RETRANS_ENTRIES_NWWS 5000
-#define DEFAULT_RETRANS_ENTRIES_ADD  5000
-#define DEFAULT_RETRANS_ENTRIES_ENC  5000
-#define DEFAULT_RETRANS_ENTRIES_EXP  5000
+#define DEFAULT_RETRANS_ENTRIES_ADD  100000
+#define DEFAULT_RETRANS_ENTRIES_ENC  100000
+#define DEFAULT_RETRANS_ENTRIES_EXP  100000
 #define DEFAULT_RETRANS_ENTRIES_GRW  2000
 #define DEFAULT_RETRANS_ENTRIES_GRE  2000
 
@@ -498,7 +498,7 @@ typedef struct cpio_table_entry{
 
 typedef	CPIO_TABLE_ENTRY CPIO_TABLE[];
 
-#define NUM_CPIO_ENTRIES	11
+#define NUM_CPIO_ENTRIES	10
 
 ulong   total_prods_retrans_rcvd;     /* prods retrans rcvd by proc */
 ulong   total_prods_retrans_rcvd_lost; /* prods retrans rcvd lost */
diff --git a/noaaport/retrans/shmem_lib.c b/noaaport/retrans/shmem_lib.c
index 190b387e2..87decc4a5 100644
--- a/noaaport/retrans/shmem_lib.c
+++ b/noaaport/retrans/shmem_lib.c
@@ -25,7 +25,6 @@ RETURNS
 char *com_shmAttach(int SHMnumber);
 int com_shmIsAlloc(int SHMnumber);
 
-
 char *
 get_shm_ptr(SHMnumber,name,flag) 
 	int SHMnumber;		/* shared memory number to validate */
diff --git a/pqact/filel.c b/pqact/filel.c
index d7e5f9bc0..b486c9e35 100644
--- a/pqact/filel.c
+++ b/pqact/filel.c
@@ -653,6 +653,7 @@ typedef struct {
     void       (*action)(fl_entry*, int);
     const int    flag;
 } Option;
+static Option OPT_STRIPWMO    = {"removewmo", entry_setFlag,   FL_STRIPWMO};
 static Option OPT_CLOSE       = {"close",     entry_setFlag,   FL_CLOSE};
 static Option OPT_EDEX        = {"edex",      entry_setFlag,   FL_EDEX};
 static Option OPT_FLUSH       = {"flush",     entry_setFlag,   FL_FLUSH};
@@ -698,6 +699,247 @@ decodeOptions(
     return ac - argc;
 }
 
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	getWmoOffset
+ *
+ * Format
+ * 	int getWmoOffset (char *buf, size_t buflen, size_t *p_wmolen)
+ *
+ * Arguments
+ * 	Type			Name		I/O		Description
+ * 	char *			buf		I		buffer to parse for WMO
+ * 	size_t			buflen		I		length of data in buffer
+ * 	size_t *		p_wmolen	O		length of wmo header
+ *
+ * Description
+ * 	Parse the wmo heading from buffer and load the appropriate prod
+ * 	info fields.  The following regular expressions will satisfy this
+ * 	parser.  Note this parser is not case sensitive.
+ * 	The WMO format is supposed to be...
+ * 		TTAAii CCCC DDHHMM[ BBB]\r\r\n
+ * 		[NNNXXX\r\r\n]
+ *
+ * 	This parser is generous with the ii portion of the WMO and all spaces
+ * 	are optional.  The TTAAII, CCCC, and DDHHMM portions of the WMO are
+ * 	required followed by at least 1 <cr> or <lf> with no other unparsed
+ * 	intervening characters. The following quasi-grammar describe what
+ * 	is matched.
+ *
+ * 	WMO = "TTAAII CCCC DDHHMM [BBB] CRCRLF [NNNXXX CRCRLF]"
+ *
+ * 	TTAAII = "[A-Z]{4}[0-9]{0,1,2}" | "[A-Z]{4} [0-9]" | "[A-Z]{3}[0-9]{3} "
+ * 	CCCC = "[A-Z]{4}"
+ * 	DDHHMM = "[ 0-9][0-9]{3,5}"
+ * 	BBB = "[A-Z0-9]{0-3}"
+ * 	CRCRLF = "[\r\n]+"
+ * 	NNNXXX = "[A-Z0-9]{0,4-6}"
+ *
+ * 	Most of the WMO's that fail to be parsed seem to be missing the ii
+ * 	altogether or missing part or all of the timestamp (DDHHMM)
+ *
+ * Returns
+ * 	offset to WMO from buf[0]
+ * 	-1: otherwise
+ *
+ * -------------------------------------------------------------------------- */
+
+#define WMO_TTAAII_LEN		6
+#define WMO_CCCC_LEN		4
+#define WMO_DDHHMM_LEN		6
+#define WMO_DDHH_LEN		4
+#define WMO_BBB_LEN		3
+
+#define WMO_T1	0
+#define WMO_T2	1
+#define WMO_A1	2
+#define WMO_A2	3
+#define WMO_I1	4
+#define WMO_I2	5
+
+int getWmoOffset (char *buf, size_t buflen, size_t *p_wmolen) {
+	char *p_wmo;
+	int i_bbb;
+	int spaces;
+	int	ttaaii_found = 0;
+	int	ddhhmm_found = 0;
+	int	crcrlf_found = 0;
+	int	bbb_found = 0;
+	int wmo_offset = -1;
+
+	*p_wmolen = 0;
+
+	for (p_wmo = buf; p_wmo + WMO_I2 + 1 < buf + buflen; p_wmo++) {
+		if (isalpha(p_wmo[WMO_T1]) && isalpha(p_wmo[WMO_T2]) &&
+		    isalpha(p_wmo[WMO_A1]) && isalpha(p_wmo[WMO_A2])) {
+			/* 'TTAAII ' */
+			if (isdigit(p_wmo[WMO_I1]) && isdigit(p_wmo[WMO_I2]) &&
+			   (isspace(p_wmo[WMO_I2+1]) || isalpha(p_wmo[WMO_I2+1]))) {
+				ttaaii_found = 1;
+				wmo_offset = p_wmo - buf;
+				p_wmo += WMO_I2 + 1;
+				break;
+			}
+		} else if (!strncmp(p_wmo, "\r\r\n", 3)) {
+			/* got to EOH with no TTAAII found, check TTAA case below */
+			break;
+		}
+	}
+
+	/* skip spaces if present */
+	while (isspace(*p_wmo) && p_wmo < buf + buflen) {
+		p_wmo++;
+	}
+
+	if (p_wmo + WMO_CCCC_LEN > buf + buflen) {
+		return -1;
+	} else if (isalpha(*p_wmo) && isalnum(*(p_wmo+1)) &&
+		   isalpha(*(p_wmo+2)) && isalnum(*(p_wmo+3))) {
+		p_wmo += WMO_CCCC_LEN;
+	} else {
+		return -1;
+	}
+
+	/* skip spaces if present */
+	spaces = 0;
+	while (isspace(*p_wmo) && p_wmo < buf + buflen) {
+		p_wmo++;
+		spaces++;
+	}
+
+	/* case1: check for 6 digit date-time group */
+	if (p_wmo + 6 <= buf + buflen) {
+		if (isdigit(*p_wmo) && isdigit(*(p_wmo+1)) &&
+		    isdigit(*(p_wmo+2)) && isdigit(*(p_wmo+3)) &&
+		    isdigit(*(p_wmo+4)) && isdigit(*(p_wmo+5))) {
+			ddhhmm_found = 1;
+			p_wmo += 6;
+		}
+	}
+
+	/* Everything past this point is gravy, we'll return the current
+	   length if we don't get the expected [bbb] crcrlf
+ 	 */
+
+	/* check if we have a <cr> and/or <lf>, parse bbb if present */
+	while (p_wmo < buf + buflen) {
+		if ((*p_wmo == '\r') || (*p_wmo == '\n')) {
+			crcrlf_found++;
+			p_wmo++;
+			if (crcrlf_found == 3) {
+				/* assume this is our complete cr-cr-lf */
+				break;
+			}
+		} else if (crcrlf_found) {
+			/* pre-mature end of crcrlf */
+			p_wmo--;
+			break;
+		} else if (isalpha(*p_wmo)) {
+			if (bbb_found) {
+				/* already have a bbb, give up here */
+				return wmo_offset;
+			}
+			for (i_bbb = 1;	p_wmo + i_bbb < buf + buflen && i_bbb < WMO_BBB_LEN; i_bbb++) {
+				if (!isalpha(p_wmo[i_bbb])) {
+					break; /* out of bbb parse loop */
+				}
+			}
+			if (p_wmo + i_bbb < buf + buflen && isspace(p_wmo[i_bbb])) {
+				bbb_found = 1;
+				p_wmo += i_bbb;
+			} else {
+				/* bbb is too long or maybe not a bbb at all, give up */
+				return wmo_offset;
+			}
+		} else if (isspace(*p_wmo)) {
+			p_wmo++;
+		} else {
+			/* give up */
+			return wmo_offset;
+		}
+	}
+
+	/* Advance past NNNXXX, if found */
+	if (p_wmo + 9 <= buf + buflen) {
+		if (isalnum(p_wmo[0]) && isalnum(p_wmo[1]) && isalnum(p_wmo[2]) &&
+		    isalnum(p_wmo[3]) && isalnum(p_wmo[4]) && isalnum(p_wmo[5]) &&
+		    (p_wmo[6] == '\r') && (p_wmo[7] == '\r') && (p_wmo[8] == '\n')) {
+			p_wmo += 9;
+		}
+	}
+
+	/* update length to include bbb and crcrlf */
+	*p_wmolen = p_wmo - buf - wmo_offset;
+
+	return wmo_offset;
+}
+
+
+/* -----------------------------------------------------------------------------
+ * Function Name
+ * 	stripHeaders
+ *
+ * Format
+ * 	static void *stripHeaders (const void *data, size_t *sz)
+ *
+ * Arguments
+ * 	Type			Name		I/O		Description
+ * 	const void *		data		I		pointer to product in memory
+ * 	size_t			sz		I/O		product size in bytes - will
+ * 								be updated if headers are found
+ *
+ * Description
+ * 	Finds LDM and WMO headers in a product if either exists within the first 100 bytes.
+ * 	Adjusts the product size 'sz' to account for any headers found.  Returns a pointer
+ * 	to the beginning of the product data.  This function calls getWmoOffset() to find a
+ * 	WMO header, its offset, and length.
+ *
+ * Returns
+ * 	Pointer to start of actual product data past any headers found.
+ *
+ * -------------------------------------------------------------------------- */
+
+#define SIZE_SBN_HDR		11	/* noaaportIngester adds a header and trailer to products - header is 11 bytes */
+#define SIZE_SBN_TLR		4	/* trailer is 4 bytes - if there is a header, there will also be a trailer */
+#define CHECK_DEPTH		100	/* This is how far into each product to look for a WMO header */
+#define MIN_PRODUCT_SIZE	21	/* Ignore any files smaller than this since they are too small to contain a WMO header */
+
+static void *stripHeaders (const void *data, size_t *sz) {
+	size_t		wmo_len;
+	int		wmo_offset;
+	char		*dptr		= (char *) data;
+	size_t		isz		= *sz;
+	size_t		slen		= isz < CHECK_DEPTH ? isz : CHECK_DEPTH;
+
+	if (*sz < MIN_PRODUCT_SIZE) {	/* Don't check for a header in a product that's smaller than the minimum header size */
+		return dptr;
+	}
+
+	if (slen < *sz) {	/* Don't check beyond the end of the product */
+		slen = *sz;
+	}
+
+	if ((!memcmp (dptr, "\001\015\015\012", 4) &&
+	    isdigit(dptr[4]) && isdigit(dptr[5]) && isdigit(dptr[6]) &&
+	    !memcmp (&dptr[7], "\040\015\015\012", 4))) {
+		dptr += SIZE_SBN_HDR;
+		*sz -= (SIZE_SBN_HDR + SIZE_SBN_TLR);
+		log_debug("Stripping LDM header/trailer");
+	}
+
+	if ((wmo_offset = getWmoOffset (dptr, slen, &wmo_len)) >= 0) {
+		dptr += (wmo_offset + wmo_len);
+		*sz -= (wmo_offset + wmo_len);
+
+		log_debug("Stripping WMO header at offset %d, length %d with initial product size %d and final product size %d",
+			wmo_offset, wmo_len, isz, *sz);
+	} else {
+		log_debug("WMO header not found in product with length %d", *sz);
+	}
+
+	return (void *) dptr;
+}
+
 /* Begin UNIXIO */
 static int str_cmp(
         fl_entry*             entry,
@@ -739,7 +981,7 @@ static int unio_open(
     log_assert(*av[ac -1] != 0);
 
     unsigned nopt = decodeOptions(entry, ac, av, &OPT_OVERWRITE, &OPT_STRIP,
-            &OPT_METADATA, &OPT_LOG, &OPT_EDEX, &OPT_FLUSH, &OPT_CLOSE, NULL);
+            &OPT_METADATA, &OPT_LOG, &OPT_EDEX, &OPT_STRIPWMO, &OPT_FLUSH, &OPT_CLOSE, NULL);
     ac -= nopt;
     av += nopt;
 
@@ -842,7 +1084,7 @@ static int unio_put(
 {
     if (sz) {
         TO_HEAD(entry);
-        log_debug("%d", entry->handle.fd);
+        log_debug("handle: %d size: %d", entry->handle.fd, sz);
 
         do {
             ssize_t nwrote = write(entry->handle.fd, data, sz);
@@ -1036,8 +1278,9 @@ int unio_prodput(
         const void*                   ignored,
         const size_t                  also_ignored)
 {
-    int status = -1; /* failure */
-    fl_entry* entry = fl_getEntry(UNIXIO, argc, argv, NULL);
+    int		status = -1; /* failure */
+    fl_entry	*entry = fl_getEntry(UNIXIO, argc, argv, NULL);
+    char	must_free_data = 0;
 
     log_debug("%d %s", entry == NULL ? -1 : entry->handle.fd,
     prodp->info.ident);
@@ -1067,10 +1310,14 @@ int unio_prodput(
         }
 
         size_t sz = prodp->info.sz;
-        void*  data;
+        void*  data = prodp->data;
+
+        if (entry_isFlagSet (entry, FL_STRIPWMO)) {
+            data = stripHeaders (prodp->data, &sz);
+        }
 
         if (entry_isFlagSet(entry, FL_STRIP)) {
-            data = dupstrip(prodp->data, sz, &sz);
+            data = dupstrip(data, sz, &sz);
             if (data == NULL) {
                 log_add("Couldn't strip control-characters out of product "
                         "\"%s\"", prodp->info.ident);
@@ -1078,10 +1325,10 @@ int unio_prodput(
             }
             else {
                 status = 0;
+                must_free_data = 1;
             }
         }
         else {
-            data = prodp->data;
             status = 0;
         }
 
@@ -1122,7 +1369,7 @@ int unio_prodput(
                 }
             } /* data written */
 
-            if (data != prodp->data)
+            if (must_free_data)
                 free(data);
         } /* data != NULL */
 
@@ -1164,7 +1411,7 @@ static int stdio_open(
     entry->handle.stream = NULL;
 
     unsigned nopt = decodeOptions(entry, ac, av, &OPT_OVERWRITE, &OPT_STRIP,
-            &OPT_LOG, &OPT_FLUSH, &OPT_CLOSE, NULL);
+            &OPT_LOG, &OPT_STRIPWMO, &OPT_FLUSH, &OPT_CLOSE, NULL);
     ac -= nopt;
     av += nopt;
 
@@ -1302,17 +1549,32 @@ int stdio_prodput(
         const void* const restrict    ignored,
         const size_t                  also_ignored)
 {
-    int status = -1; /* failure */
-    fl_entry* entry = fl_getEntry(STDIO, argc, argv, NULL);
+    int		status = -1; /* failure */
+    fl_entry*	entry = fl_getEntry(STDIO, argc, argv, NULL);
+    char	must_free_data = 0;
 
     log_debug("%d %s",
             entry == NULL ? -1 : fileno(entry->handle.stream), prodp->info.ident);
 
     if (entry != NULL ) {
-        size_t sz = prodp->info.sz;
-        void* data =
-                (entry_isFlagSet(entry, FL_STRIP)) ?
-                        dupstrip(prodp->data, prodp->info.sz, &sz) : prodp->data;
+        size_t	sz = prodp->info.sz;
+        void	*data = prodp->data;
+
+        if (entry_isFlagSet (entry, FL_STRIPWMO)) {
+            data = stripHeaders (data, &sz);
+        }
+
+        if (entry_isFlagSet(entry, FL_STRIP)) {
+            data = dupstrip(data, sz, &sz);
+            if (data == NULL) {
+        	log_add("Couldn't strip control-characters out of product "
+                        "\"%s\"", prodp->info.ident);
+                status = -1;
+            } else {
+                status = 0;
+                must_free_data = 1;
+            }
+        }
 
         if (data != NULL ) {
             if (entry_isFlagSet(entry, FL_OVERWRITE)) {
@@ -1339,7 +1601,7 @@ int stdio_prodput(
                                     log_is_enabled_debug));
             } /* data written */
 
-            if (data != prodp->data)
+            if (must_free_data)
                 free(data);
         } /* data != NULL */
 
@@ -1457,7 +1719,7 @@ static int pipe_open(
     entry_setFlag(entry, FL_NOTRANSIENT);
 
     unsigned nopt = decodeOptions(entry, ac, av, &OPT_TRANSIENT, &OPT_STRIP,
-            &OPT_METADATA, &OPT_NODATA, &OPT_FLUSH, &OPT_CLOSE, NULL);
+            &OPT_METADATA, &OPT_NODATA, &OPT_STRIPWMO, &OPT_FLUSH, &OPT_CLOSE, NULL);
     // ac -= nopt; // not used
     av += nopt;
 
@@ -1879,10 +2141,11 @@ int pipe_prodput(
         const void* const restrict    ignored,
         const size_t                  also_ignored)
 {
-    int       status;
-    size_t    sz = prodp->info.sz;
-    bool      isNew;
-    fl_entry* entry = fl_getEntry(PIPE, argc, argv, &isNew);
+    int		status = 0;
+    size_t	sz = prodp->info.sz;
+    bool	isNew;
+    fl_entry*	entry = fl_getEntry(PIPE, argc, argv, &isNew);
+    char	must_free_data = 0;
 
     if (entry == NULL ) {
         log_add("Couldn't get entry for product \"%s\"", prodp->info.ident);
@@ -1893,23 +2156,23 @@ int pipe_prodput(
                 entry->handle.pbuf ? entry->handle.pbuf->pfd : -1,
                 prodp->info.ident);
 
-        void *data;
+        void	*data = prodp->data;
+
+        if (entry_isFlagSet (entry, FL_STRIPWMO)) {
+            data = stripHeaders (data, &sz);
+        }
 
         if (entry_isFlagSet(entry, FL_STRIP)) {
-            data = dupstrip(prodp->data, prodp->info.sz, &sz);
+            data = dupstrip(data, sz, &sz);
             if (data == NULL) {
                 log_add("Couldn't strip control-characters out of product "
                         "\"%s\"", prodp->info.ident);
                 status = -1;
-            }
-            else {
+            } else {
                 status = 0;
+                must_free_data = 1;
             }
         }
-        else {
-            data = prodp->data;
-            status = 0;
-        }
 
         if (0 == status) {
             status = pipe_out(entry, &prodp->info, data, sz);
@@ -1946,7 +2209,7 @@ int pipe_prodput(
                             entry->path);
             }
 
-            if (data != prodp->data)
+            if (must_free_data)
                 free(data);
         }       // `data` possibly allocated
 
diff --git a/pqact/filel.h b/pqact/filel.h
index 95eeb8774..37a0c2419 100644
--- a/pqact/filel.h
+++ b/pqact/filel.h
@@ -22,6 +22,7 @@
 #define FL_EDEX 512 /* send message to memory segment */
 #define FL_FLUSH 1024
 #define FL_CLOSE 2048
+#define FL_STRIPWMO 4096
 
 #ifdef __cplusplus
 extern "C" {