2003-09-18 Joel Sherrill <joel@OARcorp.com>

	PR 493/networking
	* dnstest/init.c, http/Makefile, http/init.c, http/system.h,
	netdemo/init.c, netlink/init.c, ntp/init.c, select/init.c,
	select/test.c, tftpTest/init.c, tftpTest/test.c, ttcp/init.c,
	ttcp/rtems_ttcp.c: Made all the tests compile and eliminated warnings
	except in the ttcp_orig code.
	* Makefile: New file.
	* netlink/system.h: Removed.

16 files changed, 44 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d816ae..9905f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-18	Joel Sherrill <joel@OARcorp.com>
+
+	PR 493/networking
+	* dnstest/init.c, http/Makefile, http/init.c, http/system.h,
+	netdemo/init.c, netlink/init.c, ntp/init.c, select/init.c,
+	select/test.c, tftpTest/init.c, tftpTest/test.c, ttcp/init.c,
+	ttcp/rtems_ttcp.c: Made all the tests compile and eliminated warnings
+	except in the ttcp_orig code.
+	* Makefile: New file.
+	* netlink/system.h: Removed.
+
 2003-07-03	Joel Sherrill <joel@OARcorp.com>
 
 	* VERSION: Updated to network-demos-4.6.0pre4.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..09c0cf3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+#
+#  $Id$
+#
+
+# rpc_demo requires an extra configuration file
+SUBDIRS=netdemo netlink dnstest http ntp select tftpTest ttcp
+
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+
+include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/directory.cfg
+
diff --git a/dnstest/init.c b/dnstest/init.c
index 57f93a2..e5bfd2c 100644
--- a/dnstest/init.c
+++ b/dnstest/init.c
@@ -42,6 +42,7 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include "../networkconfig.h"
 
diff --git a/http/Makefile b/http/Makefile
index 2343b60..c31caa3 100644
--- a/http/Makefile
+++ b/http/Makefile
@@ -50,7 +50,7 @@ NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS +=
+CLEAN_ADDITIONS += tarfile
 CLOBBER_ADDITIONS +=
 
 all:	${ARCH} $(SRCS) $(PGM)
diff --git a/http/init.c b/http/init.c
index 9ade8c4..e456e59 100644
--- a/http/init.c
+++ b/http/init.c
@@ -101,7 +101,8 @@ rtems_task Init(
 #if defined(USE_FTPD)
   rtems_initialize_ftpd();
 
-  status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
+  status = Untar_FromMemory(
+    (unsigned char *)(&TARFILE_START), (unsigned long)&TARFILE_SIZE);
 #endif
    
 #if defined(USE_HTTPD)
diff --git a/http/system.h b/http/system.h
index aa9e56c..3f66087 100644
--- a/http/system.h
+++ b/http/system.h
@@ -5,7 +5,6 @@
  *
  *  COPYRIGHT (c) 1989-1998.
  *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -14,7 +13,9 @@
  *  $Id$
  */
 
-#include <tmacros.h>
+#include <rtems.h>
+#include <rtems/untar.h>
+#include <bsp.h>
 
 /* functions */
 
@@ -28,6 +29,4 @@ rtems_task Init(
 
 /* global variables */
 
-TEST_EXTERN rtems_id Global_variable;    /* example global variable     */
-
 /* end of include file */
diff --git a/netdemo/init.c b/netdemo/init.c
index 5b6681b..7e2879e 100644
--- a/netdemo/init.c
+++ b/netdemo/init.c
@@ -42,6 +42,7 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include "../networkconfig.h"
 
diff --git a/netlink/init.c b/netlink/init.c
index 6847c4e..4ace7c7 100644
--- a/netlink/init.c
+++ b/netlink/init.c
@@ -6,6 +6,7 @@
  */
 
 #include <bsp.h>
+#include <rtems/untar.h>
 
 #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
@@ -92,14 +93,14 @@ rtems_task Init(
 
 #if INCLUDE_FTPD
   status = Untar_FromMemory((unsigned char *)(&_binary_tarfile_start),
-			    &_binary_tarfile_size);
+			    (unsigned long) &_binary_tarfile_size);
   rtems_initialize_ftpd();
 
 #endif
    
 #if INCLUDE_HTTPD
   status = Untar_FromMemory((unsigned char *)(&_binary_tarfile_start),
-			    &_binary_tarfile_size);
+			    (unsigned long) &_binary_tarfile_size);
   rtems_initialize_webserver();
 #endif 
 
diff --git a/netlink/system.h b/netlink/system.h
deleted file mode 100644
index aa9e56c..0000000
--- a/netlink/system.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;    /* example global variable     */
-
-/* end of include file */
diff --git a/ntp/init.c b/ntp/init.c
index 264d7e3..ca60f5c 100644
--- a/ntp/init.c
+++ b/ntp/init.c
@@ -42,6 +42,7 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/error.h>
 #include "../networkconfig.h"
diff --git a/select/init.c b/select/init.c
index a5b1dd1..20a03db 100644
--- a/select/init.c
+++ b/select/init.c
@@ -42,6 +42,7 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include "../networkconfig.h"
 
diff --git a/select/test.c b/select/test.c
index a04c1e9..3064b28 100644
--- a/select/test.c
+++ b/select/test.c
@@ -24,6 +24,7 @@
 #include <rtems/error.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/select.h>
 #include <netinet/in.h>
 
 #define BASE_PORT	24742
diff --git a/tftpTest/init.c b/tftpTest/init.c
index 0b36a07..a8fa143 100644
--- a/tftpTest/init.c
+++ b/tftpTest/init.c
@@ -43,6 +43,7 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/tftpTest/test.c b/tftpTest/test.c
index 75e4666..f99c5b2 100644
--- a/tftpTest/test.c
+++ b/tftpTest/test.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <rtems.h>
diff --git a/ttcp/init.c b/ttcp/init.c
index 07d1c42..6b0b21b 100644
--- a/ttcp/init.c
+++ b/ttcp/init.c
@@ -42,9 +42,12 @@ rtems_task Init (rtems_task_argument argument);
 #include <confdefs.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <rtems/rtems_bsdnet.h>
 #include "../networkconfig.h"
 
+void test_network(void);
+
 /*
  * RTEMS Startup Task
  */
diff --git a/ttcp/rtems_ttcp.c b/ttcp/rtems_ttcp.c
index 9fbd774..e06b4e5 100644
--- a/ttcp/rtems_ttcp.c
+++ b/ttcp/rtems_ttcp.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <rtems.h>
@@ -41,6 +42,7 @@ static int
 select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
 {
 	rtems_panic ("select()");
+	return 0;
 }
 
 static void