Add unix makefiles and make a few include file tweaks for unix compilation

network/Makefile

@@ -0,0 +1,30 @@
+#! gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+#  
+
+DEPTH	= ..
+
+DIRS	= \
+	cache		\
+	client		\
+	cnvts		\
+	main		\
+	protocol	\
+
+include $(DEPTH)/config/rules.mk
+

network/cache/Makefile

@@ -0,0 +1,36 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= netcache
+LIBRARY_NAME	= netcache
+
+CSRCS		= \
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+	$(NULL)
+
+EXPORTS= netcache.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl security layer img
+
+include $(DEPTH)/config/rules.mk
+

network/client/Makefile

@@ -0,0 +1,32 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= cnetinit
+LIBRARY_NAME	= cnetinit
+
+CSRCS		= \
+	cnetinit.c	\
+	$(NULL)
+
+EXPORTS= cnetinit.h
+
+REQUIRES	= network img layer fileurl httpurl ftpurl abouturl \
+	gophurl jsurl remoturl dataurl util
+
+include $(DEPTH)/config/rules.mk

network/cnvts/Makefile

@@ -0,0 +1,55 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= netcnvts
+LIBRARY_NAME	= netcnvts
+
+CSRCS		= \
+	cvactive.c	\
+	cvchunk.c	\
+	cvcolor.c	\
+	cvdisk.c	\
+	cvextcon.c	\
+	cvjscfg.c	\
+	cvmime.c	\
+	cvpics.c	\
+	cvsimple.c	\
+	cvunzip.c	\
+	cvview.c	\
+	txview.c	\
+	$(NULL)
+
+EXPORTS= \
+	cvview.h	\
+	cvproxy.h	\
+	cvextcon.h	\
+	txview.h	\
+    cvchunk.h   \
+    cvcolor.h   \
+    cvdisk.h    \
+    cvmime.h    \
+    cvpics.h    \
+    cvsimple.h  \
+    cvunzip.h   \
+    cvjscfg.h
+
+REQUIRES	= network img lay layer util parse pref js \
+	security marimurl style zlib
+
+include $(DEPTH)/config/rules.mk

network/cnvts/cvdisk.c

@@ -51,9 +51,9 @@ PRIVATE void net_SaveToDiskComplete (NET_StreamClass *stream)
 	DataObject *obj=stream->data_object;	
     fclose(obj->fp);
 
-    FREEIF(obj->filename);
+    XP_FREEIF(obj->filename);
 
-    FREE(obj);
+    XP_FREE(obj);
     return;
 }
 
@@ -65,7 +65,7 @@ PRIVATE void net_SaveToDiskAbort (NET_StreamClass *stream, int status)
     if(obj->filename)
       {
         remove(obj->filename);
-        FREE(obj->filename);
+        XP_FREE(obj->filename);
       }
 
     return;

network/cnvts/cvview.c

@@ -214,16 +214,16 @@ PRIVATE void net_ExtViewComplete (NET_StreamClass *stream)
 		TRACEMSG(("Invoking: %s", command));
 
         system(command);
-	    FREEIF(obj->command);
+	    XP_FREEIF(obj->command);
       }
 	else
       {
         pclose(obj->fp);
       }
 
-    FREEIF(obj->filename);
-	FREEIF(obj->url);
-    FREE(obj);
+    XP_FREEIF(obj->filename);
+	XP_FREEIF(obj->url);
+    XP_FREE(obj);
     return;
 }
 
@@ -237,13 +237,13 @@ PRIVATE void net_ExtViewAbort (NET_StreamClass *stream, int status)
     if(obj->filename)
       {
 	    remove(obj->filename);
-        FREE(obj->filename);
+        XP_FREE(obj->filename);
       }
 
-	FREEIF(obj->url);
-    FREEIF(obj->command);
+	XP_FREEIF(obj->url);
+    XP_FREEIF(obj->command);
 
-    FREE(obj);
+    XP_FREE(obj);
     
     return;
 }
@@ -418,14 +418,14 @@ NET_ExtViewerConverter   (int         format_out,
 				   );
 		  if (!FE_Confirm (window_id, msg))
 			{
-			  FREE (stream);
-			  FREE (obj);
-			  FREE (path);
-			  FREE (prog);
+			  XP_FREE (stream);
+			  XP_FREE (obj);
+			  XP_FREE (path);
+			  XP_FREE (prog);
 			  return(NULL);
 			}
 		}
-	  FREE (prog);
+	  XP_FREE (prog);
 	}
 #endif /* XP_UNIX */
 
@@ -445,9 +445,9 @@ NET_ExtViewerConverter   (int         format_out,
 
 		if(yes_stream == -1)
 		  {
-			FREE(stream);
-			FREE(obj);
-        	FREE(path);
+			XP_FREE(stream);
+			XP_FREE(obj);
+        	XP_FREE(path);
 			return(NULL);
 		  }
 	  }
@@ -497,8 +497,8 @@ NET_ExtViewerConverter   (int         format_out,
 
 		tmp_filename = WH_TempName(xpTemporary, "MO");
 		if (!tmp_filename) {
-			FREEIF(stream);
-			FREEIF(obj);
+			XP_FREEIF(stream);
+			XP_FREEIF(obj);
 			return NULL;
 		}
 		if (dot)
@@ -535,7 +535,7 @@ NET_ExtViewerConverter   (int         format_out,
 			  StrAllocCopy(obj->filename, tmp_filename);
 		  }
 		
-        FREE(path);
+        XP_FREE(path);
 		XP_FREE(tmp_filename);
 
 		obj->fp = XP_FileOpen(obj->filename, xpTemporary, XP_FILE_WRITE);

network/main/Makefile

@@ -0,0 +1,66 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= network
+LIBRARY_NAME	= network
+
+CPPSRCS= mkabook.cpp	
+
+CSRCS		= \
+	jscookie.c	\
+	mkautocf.c	\
+	mkconect.c	\
+	mkformat.c	\
+	mkfsort.c	\
+	mkgeturl.c	\
+	mkhelp.c	\
+	mkinit.c	\
+	mkmessag.c	\
+	mkpadpac.c	\
+	mkparse.c	\
+	mkselect.c	\
+	mksockrw.c	\
+	mksort.c	\
+	mkstream.c	\
+	mktrace.c	\
+	mkutils.c	\
+	prefetch.c	\
+	unix-dns.c	\
+	$(NULL)
+
+EXPORTS= mkstream.h mkformat.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
+	mkselect.h mktcp.h netutils.h mkpadpac.h mkautocf.h mkhelp.h
+
+
+REQUIRES	= jtools nspr2 dbm util js parse lay style pref htmldlgs java \
+	libfont netcache httpurl cnetinit security img layer netcnvts
+
+include $(DEPTH)/config/rules.mk
+
+TEST_LIBS	= $(LIBRARY) \
+		  $(DIST)/lib/liburl.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libdbm.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libxp.$(LIB_SUFFIX) \
+		  $(DIST)/lib/nspr.$(LIB_SUFFIX)
+
+test:
+	$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
+	$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS)
+

network/main/mkinit.c

@@ -26,6 +26,7 @@
 #ifdef MOZILLA_CLIENT
 #ifdef XP_UNIX  /* this whole module is ifdef'd UNIX */
 
+#include "mkgeturl.h"
 #include "mkstream.h"
 #include "mkformat.h"
 #include "net.h"

network/main/mkstream.c

@@ -732,6 +732,9 @@ NET_RegisterContentTypeConverter (char          * format_in,
 #ifdef MOZILLA_CLIENT
 #ifdef XP_UNIX
 
+#include "cvview.h"
+#include "cvextcon.h"
+
 /* register a mime type and a command to be executed
  *
  * if stream_block_size is zero then the data will be completely

network/main/netutils.h

@@ -23,6 +23,10 @@
 #define MAXHOSTNAMELEN 64
 #endif
 
+#ifndef CONST 
+#define CONST const
+#endif
+
 XP_BEGIN_PROTOS
 
 /*

network/protocol/Makefile

@@ -0,0 +1,33 @@
+#! gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+#  
+
+DEPTH	= ../..
+
+DIRS	= about	\
+	dataurl	\
+	file	\
+	ftp	\
+	gopher	\
+	http	\
+	js	\
+	marimba	\
+	remote
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/about/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= abouturl
+LIBRARY_NAME	= abouturl
+
+CSRCS		= \
+	mkabout.c	\
+	$(NULL)
+
+EXPORTS= abouturl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/certld/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= crtldurl
+LIBRARY_NAME	= crtldurl
+
+CSRCS		= \
+	mkcretld.c	\
+	$(NULL)
+
+EXPORTS= crtldurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/dataurl/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= dataurl
+LIBRARY_NAME	= dataurl
+
+CSRCS		= \
+	mkdaturl.c	\
+	$(NULL)
+
+EXPORTS= dataurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl netcnvts
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/file/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= fileurl
+LIBRARY_NAME	= fileurl
+
+CSRCS		= \
+	mkfile.c	\
+	$(NULL)
+
+EXPORTS= fileurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/ftp/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= ftpurl
+LIBRARY_NAME	= ftpurl
+
+CSRCS		= \
+	mkftp.c	\
+	$(NULL)
+
+EXPORTS= ftpurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/gopher/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= gophurl
+LIBRARY_NAME	= gophurl
+
+CSRCS		= \
+	mkgopher.c	\
+	$(NULL)
+
+EXPORTS= gophurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl remoturl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/http/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= httpurl
+LIBRARY_NAME	= httpurl
+
+CSRCS		= \
+	mkhttp.c	\
+	$(NULL)
+
+EXPORTS= httpurl.h httpauth.h cookies.h jscookie.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/js/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= jsurl
+LIBRARY_NAME	= jsurl
+
+CSRCS		= \
+	mkmocha.c	\
+	$(NULL)
+
+EXPORTS= jsurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl lay parse style
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/marimba/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= marimurl
+LIBRARY_NAME	= marimurl
+
+CPPSRCS		= \
+	mkmarimb.cpp	\
+	$(NULL)
+
+EXPORTS= marimurl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+

network/protocol/remote/Makefile

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+
+MODULE		= remoturl
+LIBRARY_NAME	= remoturl
+
+CSRCS		= \
+	mkremote.c	\
+	$(NULL)
+
+EXPORTS= remoturl.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl \
+	security layer img httpurl
+
+include $(DEPTH)/config/rules.mk
+