This commit was manufactured by cvs2svn to create branch

'NGLayoutStability2_BRACH'.

git-svn-id: svn://10.0.0.236/branches/NGLayoutStability2_BRACH@8199 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dom/jni/javaDOMGlobals.h

@@ -1,105 +0,0 @@
-/* 
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
- The Original Code is mozilla.org code.
-
- The Initial Developer of the Original Code is Sun Microsystems,
- Inc. Portions created by Sun are
- Copyright (C) 1999 Sun Microsystems, Inc. All
- Rights Reserved.
-
- Contributor(s): 
-*/
-
-#ifndef __JavaDOMGlobals_h__
-#define __JavaDOMGlobals_h__
-
-#include "jni.h"
-#include "prclist.h"
-#include "nsError.h"
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
-class nsISupports;
-class nsIDOMNode;
-struct PRLogModuleInfo;
-struct PRLock;
-
-class JavaDOMGlobals {
-
- public:
-  static jclass attrClass;
-  static jclass cDataSectionClass;
-  static jclass commentClass;
-  static jclass documentClass;
-  static jclass documentFragmentClass;
-  static jclass documentTypeClass;
-  static jclass domImplementationClass;
-  static jclass elementClass;
-  static jclass entityClass;
-  static jclass entityReferenceClass;
-  static jclass namedNodeMapClass;
-  static jclass nodeClass;
-  static jclass nodeListClass;
-  static jclass notationClass;
-  static jclass processingInstructionClass;
-  static jclass textClass;
-
-  static jfieldID nodePtrFID;
-  static jfieldID nodeListPtrFID;
-  static jfieldID domImplementationPtrFID;
-
-  static jfieldID nodeTypeAttributeFID;
-  static jfieldID nodeTypeCDataSectionFID;
-  static jfieldID nodeTypeCommentFID;
-  static jfieldID nodeTypeDocumentFragmentFID;
-  static jfieldID nodeTypeDocumentFID;
-  static jfieldID nodeTypeDocumentTypeFID;
-  static jfieldID nodeTypeElementFID;
-  static jfieldID nodeTypeEntityFID;
-  static jfieldID nodeTypeEntityReferenceFID;
-  static jfieldID nodeTypeNotationFID;
-  static jfieldID nodeTypeProcessingInstructionFID;
-  static jfieldID nodeTypeTextFID;
-
-  static jclass domExceptionClass;
-  static jmethodID domExceptionInitMID;
-  static jclass runtimeExceptionClass;
-  static jmethodID runtimeExceptionInitMID;
-
-  static const char* const DOM_EXCEPTION_MESSAGE[];
-
-  typedef enum ExceptionType { EXCEPTION_RUNTIME, 
-			       EXCEPTION_DOM } ExceptionType;
-  
-  static PRLogModuleInfo* log;
-  static PRCList garbage;
-  static PRLock* garbageLock;
-
-  static PRInt32 javaMaxInt;
-
-  static void Initialize(JNIEnv *env);
-  static void Destroy(JNIEnv *env);
-  static jobject CreateNodeSubtype(JNIEnv *env, 
-				   nsIDOMNode *node);
-
-  static void AddToGarbage(nsISupports* domObject);
-  static void TakeOutGarbage();
-
-  static void ThrowException(JNIEnv *env,
-                             const char * message = NULL,
-                             nsresult rv = NS_OK,
-                             ExceptionType exceptionType = EXCEPTION_RUNTIME);
-};
-  
-#endif /* __JavaDOMGlobals_h__ */

mozilla/modules/libimg/src/MANIFEST

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+PIMGCB.h
+PPSIMGCB.h

mozilla/modules/libimg/src/MIMGCB.c

@@ -0,0 +1,142 @@
+/* -*- Mode: C; tab-width: 4; -*- */
+/*******************************************************************************
+ * Source date: 14 Jul 1998 19:28:58 GMT
+ * netscape/libimg/IMGCB module C stub file
+ * Generated by jmc version 1.8 -- DO NOT EDIT
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include "prmem.h"
+
+/* Include the implementation-specific header: */
+#include "PIMGCB.h"
+
+/* Include other interface headers: */
+
+/*******************************************************************************
+ * IMGCB Methods
+ ******************************************************************************/
+
+#ifndef OVERRIDE_IMGCB_getInterface
+JMC_PUBLIC_API(void*)
+_IMGCB_getInterface(struct IMGCB* self, jint op, const JMCInterfaceID* iid, JMCException* *exc)
+{
+	if (memcmp(iid, &IMGCB_ID, sizeof(JMCInterfaceID)) == 0)
+		return IMGCBImpl2IMGCB(IMGCB2IMGCBImpl(self));
+	return _IMGCB_getBackwardCompatibleInterface(self, iid, exc);
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_addRef
+JMC_PUBLIC_API(void)
+_IMGCB_addRef(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	IMGCBImplHeader* impl = (IMGCBImplHeader*)IMGCB2IMGCBImpl(self);
+	impl->refcount++;
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_release
+JMC_PUBLIC_API(void)
+_IMGCB_release(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	IMGCBImplHeader* impl = (IMGCBImplHeader*)IMGCB2IMGCBImpl(self);
+	if (--impl->refcount == 0) {
+		IMGCB_finalize(self, exc);
+	}
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_hashCode
+JMC_PUBLIC_API(jint)
+_IMGCB_hashCode(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	return (jint)self;
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_equals
+JMC_PUBLIC_API(jbool)
+_IMGCB_equals(struct IMGCB* self, jint op, void* obj, JMCException* *exc)
+{
+	return self == obj;
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_clone
+JMC_PUBLIC_API(void*)
+_IMGCB_clone(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	IMGCBImpl* impl = IMGCB2IMGCBImpl(self);
+	IMGCBImpl* newImpl = (IMGCBImpl*)malloc(sizeof(IMGCBImpl));
+	if (newImpl == NULL) return NULL;
+	memcpy(newImpl, impl, sizeof(IMGCBImpl));
+	((IMGCBImplHeader*)newImpl)->refcount = 1;
+	return newImpl;
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_toString
+JMC_PUBLIC_API(const char*)
+_IMGCB_toString(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	return NULL;
+}
+#endif
+
+#ifndef OVERRIDE_IMGCB_finalize
+JMC_PUBLIC_API(void)
+_IMGCB_finalize(struct IMGCB* self, jint op, JMCException* *exc)
+{
+	/* Override this method and add your own finalization here. */
+	PR_FREEIF(self);
+}
+#endif
+
+/*******************************************************************************
+ * Jump Tables
+ ******************************************************************************/
+
+const struct IMGCBInterface IMGCBVtable = {
+	_IMGCB_getInterface,
+	_IMGCB_addRef,
+	_IMGCB_release,
+	_IMGCB_hashCode,
+	_IMGCB_equals,
+	_IMGCB_clone,
+	_IMGCB_toString,
+	_IMGCB_finalize,
+	_IMGCB_NewPixmap,
+	_IMGCB_UpdatePixmap,
+	_IMGCB_ControlPixmapBits,
+	_IMGCB_DestroyPixmap,
+	_IMGCB_DisplayPixmap,
+	_IMGCB_DisplayIcon,
+	_IMGCB_GetIconDimensions
+};
+
+/*******************************************************************************
+ * Factory Operations
+ ******************************************************************************/
+
+JMC_PUBLIC_API(IMGCB*)
+IMGCBFactory_Create(JMCException* *exception)
+{
+	IMGCBImplHeader* impl = (IMGCBImplHeader*)PR_NEWZAP(IMGCBImpl);
+	IMGCB* self;
+	if (impl == NULL) {
+		JMC_EXCEPTION(exception, JMCEXCEPTION_OUT_OF_MEMORY);
+		return NULL;
+	}
+	self = IMGCBImpl2IMGCB(impl);
+	impl->vtableIMGCB = &IMGCBVtable;
+	impl->refcount = 1;
+	_IMGCB_init(self, exception);
+	if (JMC_EXCEPTION_RETURNED(exception)) {
+		PR_FREEIF(impl);
+		return NULL;
+	}
+	return self;
+}
+

mozilla/modules/libimg/src/MPSIMGCB.c

@@ -0,0 +1,142 @@
+/* -*- Mode: C; tab-width: 4; -*- */
+/*******************************************************************************
+ * Source date: 14 Jul 1998 19:28:58 GMT
+ * netscape/libimg/PSIMGCB module C stub file
+ * Generated by jmc version 1.8 -- DO NOT EDIT
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include "prmem.h"
+
+/* Include the implementation-specific header: */
+#include "PPSIMGCB.h"
+
+/* Include other interface headers: */
+
+/*******************************************************************************
+ * PSIMGCB Methods
+ ******************************************************************************/
+
+#ifndef OVERRIDE_PSIMGCB_getInterface
+JMC_PUBLIC_API(void*)
+_PSIMGCB_getInterface(struct PSIMGCB* self, jint op, const JMCInterfaceID* iid, JMCException* *exc)
+{
+	if (memcmp(iid, &PSIMGCB_ID, sizeof(JMCInterfaceID)) == 0)
+		return PSIMGCBImpl2PSIMGCB(PSIMGCB2PSIMGCBImpl(self));
+	return _PSIMGCB_getBackwardCompatibleInterface(self, iid, exc);
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_addRef
+JMC_PUBLIC_API(void)
+_PSIMGCB_addRef(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	PSIMGCBImplHeader* impl = (PSIMGCBImplHeader*)PSIMGCB2PSIMGCBImpl(self);
+	impl->refcount++;
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_release
+JMC_PUBLIC_API(void)
+_PSIMGCB_release(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	PSIMGCBImplHeader* impl = (PSIMGCBImplHeader*)PSIMGCB2PSIMGCBImpl(self);
+	if (--impl->refcount == 0) {
+		PSIMGCB_finalize(self, exc);
+	}
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_hashCode
+JMC_PUBLIC_API(jint)
+_PSIMGCB_hashCode(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	return (jint)self;
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_equals
+JMC_PUBLIC_API(jbool)
+_PSIMGCB_equals(struct PSIMGCB* self, jint op, void* obj, JMCException* *exc)
+{
+	return self == obj;
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_clone
+JMC_PUBLIC_API(void*)
+_PSIMGCB_clone(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	PSIMGCBImpl* impl = PSIMGCB2PSIMGCBImpl(self);
+	PSIMGCBImpl* newImpl = (PSIMGCBImpl*)malloc(sizeof(PSIMGCBImpl));
+	if (newImpl == NULL) return NULL;
+	memcpy(newImpl, impl, sizeof(PSIMGCBImpl));
+	((PSIMGCBImplHeader*)newImpl)->refcount = 1;
+	return newImpl;
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_toString
+JMC_PUBLIC_API(const char*)
+_PSIMGCB_toString(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	return NULL;
+}
+#endif
+
+#ifndef OVERRIDE_PSIMGCB_finalize
+JMC_PUBLIC_API(void)
+_PSIMGCB_finalize(struct PSIMGCB* self, jint op, JMCException* *exc)
+{
+	/* Override this method and add your own finalization here. */
+	PR_FREEIF(self);
+}
+#endif
+
+/*******************************************************************************
+ * Jump Tables
+ ******************************************************************************/
+
+const struct PSIMGCBInterface PSIMGCBVtable = {
+	_PSIMGCB_getInterface,
+	_PSIMGCB_addRef,
+	_PSIMGCB_release,
+	_PSIMGCB_hashCode,
+	_PSIMGCB_equals,
+	_PSIMGCB_clone,
+	_PSIMGCB_toString,
+	_PSIMGCB_finalize,
+	_PSIMGCB_NewPixmap,
+	_PSIMGCB_UpdatePixmap,
+	_PSIMGCB_ControlPixmapBits,
+	_PSIMGCB_DestroyPixmap,
+	_PSIMGCB_DisplayPixmap,
+	_PSIMGCB_DisplayIcon,
+	_PSIMGCB_GetIconDimensions
+};
+
+/*******************************************************************************
+ * Factory Operations
+ ******************************************************************************/
+
+JMC_PUBLIC_API(PSIMGCB*)
+PSIMGCBFactory_Create(JMCException* *exception)
+{
+	PSIMGCBImplHeader* impl = (PSIMGCBImplHeader*)PR_NEWZAP(PSIMGCBImpl);
+	PSIMGCB* self;
+	if (impl == NULL) {
+		JMC_EXCEPTION(exception, JMCEXCEPTION_OUT_OF_MEMORY);
+		return NULL;
+	}
+	self = PSIMGCBImpl2PSIMGCB(impl);
+	impl->vtablePSIMGCB = &PSIMGCBVtable;
+	impl->refcount = 1;
+	_PSIMGCB_init(self, exception);
+	if (JMC_EXCEPTION_RETURNED(exception)) {
+		PR_FREEIF(impl);
+		return NULL;
+	}
+	return self;
+}
+

mozilla/modules/libimg/src/Makefile

@@ -0,0 +1,118 @@
+#
+# 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.
+#
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
+
+DEPTH		= ../../..
+
+MODULE		= img
+LIBRARY_NAME	= img
+
+ifdef STANDALONE_IMAGE_LIB
+
+CPPSRCS		= ilNetReader.cpp \
+		  xpcompat.cpp \
+		  color.cpp \
+		  colormap.cpp \
+		  dither.cpp \
+		  gif.cpp \
+		  if.cpp \
+		  ilclient.cpp \
+		  il_util.cpp \
+		  jpeg.cpp \
+		  scale.cpp \
+		  xbm.cpp \
+		  ipng.cpp \
+		  png_png.cpp \
+		  $(NULL)
+
+EXPORTS		= PIMGCB.h PPSIMGCB.h
+
+REQUIRES	= zlib nspr jpeg util img png xpcom
+
+LOCAL_INCLUDES	= -I../png -I. -I$(DEPTH)/dist/public/zlib
+
+EXTRA_LIBS	= $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
+
+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"
+	@echo  "DIST		is $(DIST)"
+
+else
+CPPSRCS		= color.cpp \
+		  colormap.cpp \
+		  dither.cpp \
+		  dummy_nc.cpp \
+		  external.cpp \
+		  gif.cpp \
+		  if.cpp \
+		  ilclient.cpp \
+		  il_util.cpp \
+		  jpeg.cpp \
+		  scale.cpp \
+		  xbm.cpp \
+		  ipng.cpp \
+		  png_png.cpp \
+		  ilNetReader.cpp \
+		  $(NULL)
+
+EXPORTS		= PIMGCB.h PPSIMGCB.h
+
+REQUIRES	= jtools java nspr dbm util img layer js xpcom
+
+LOCAL_INCLUDES	= -I.
+EXTRA_LIBS	= 
+
+ifndef MOZ_NATIVE_JPEG
+REQUIRES	+= jpeg
+endif
+
+ifdef MOZ_NATIVE_PNG
+EXTRA_LIBS	+= -lpng
+else
+REQUIRES	+= png
+LOCAL_INCLUDES	+= -I../png
+EXTRA_LIBS	+= $(DIST)/lib/libpng.a
+endif
+
+ifdef MOZ_NATIVE_ZLIB
+EXTRA_LIBS	+= -lz
+else
+REQUIRES	+= zlib
+LOCAL_INCLUDES	+= -I$(DEPTH)/dist/public/zlib
+EXTRA_LIBS 	+= $(DIST)/lib/libzlib.a
+endif
+
+#
+# Generate MIMGCB.c (and similar sources) here.
+# MIMGCB.h is generated in ../public/_jmc/
+#
+JMC_GEN		= MIMGCB MPSIMGCB
+JMC_GEN_FLAGS	= -cimpl -noexc -module
+endif
+
+include $(DEPTH)/config/rules.mk
+
+#
+# This is about as far from the right way of doing things as you can get.
+# HACK larubbio fix me
+#
+ifdef STANDALONE_IMAGE_LIB
+CC = $(CCC)
+endif

mozilla/modules/libimg/src/Makefile.in

@@ -0,0 +1,121 @@
+#
+# 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.
+#
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= img
+LIBRARY_NAME	= img
+
+ifdef STANDALONE_IMAGE_LIB
+
+CPPSRCS		= ilNetReader.cpp \
+		  xpcompat.cpp \
+		  color.cpp \
+		  colormap.cpp \
+		  dither.cpp \
+		  gif.cpp \
+		  if.cpp \
+		  ilclient.cpp \
+		  il_util.cpp \
+		  jpeg.cpp \
+		  scale.cpp \
+		  xbm.cpp \
+		  ipng.cpp \
+		  png_png.cpp \
+		  $(NULL)
+
+EXPORTS		= PIMGCB.h PPSIMGCB.h
+
+REQUIRES	= zlib nspr jpeg util img png xpcom
+
+LOCAL_INCLUDES	= -I../png -I. -I$(DEPTH)/dist/public/zlib
+
+EXTRA_LIBS	= $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
+
+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"
+	@echo  "DIST		is $(DIST)"
+
+else
+CPPSRCS		= color.cpp \
+		  colormap.cpp \
+		  dither.cpp \
+		  dummy_nc.cpp \
+		  external.cpp \
+		  gif.cpp \
+		  if.cpp \
+		  ilclient.cpp \
+		  il_util.cpp \
+		  jpeg.cpp \
+		  scale.cpp \
+		  xbm.cpp \
+		  ipng.cpp \
+		  png_png.cpp \
+		  ilNetReader.cpp \
+		  $(NULL)
+
+EXPORTS		= PIMGCB.h PPSIMGCB.h
+
+REQUIRES	= jtools java nspr dbm util img layer js xpcom
+
+LOCAL_INCLUDES	= -I$(srcdir)/../png -I$(srcdir)/.
+
+EXTRA_LIBS	= 
+
+ifndef MOZ_NATIVE_JPEG
+REQUIRES	+= jpeg
+endif
+
+ifndef MOZ_NATIVE_ZLIB
+REQUIRES	+= zlib
+LOCAL_INCLUDES	+= -I$(DEPTH)/dist/public/zlib
+EXTRA_LIBS	+= $(DIST)/lib/libzlib.a
+endif
+
+ifndef MOZ_NATIVE_PNG
+REQUIRES	+= png
+EXTRA_LIBS	+= $(DIST)/lib/libpng.a
+endif
+
+#
+# Generate MIMGCB.c (and similar sources) here.
+# MIMGCB.h is generated in ../public/_jmc/
+#
+JMC_GEN		= MIMGCB MPSIMGCB
+JMC_GEN_FLAGS	= -cimpl -noexc -module
+endif
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+
+#
+# This is about as far from the right way of doing things as you can get.
+# HACK larubbio fix me
+#
+ifdef STANDALONE_IMAGE_LIB
+CC = $(CCC)
+endif

mozilla/network/main/MANIFEST

@@ -0,0 +1,17 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mkstream.h
+mkparse.h
+mkfsort.h
+mksort.h
+mkgeturl.h
+mkselect.h
+mktcp.h
+netutils.h
+mkpadpac.h
+mkautocf.h
+mkutils.h
+mktrace.h
+mkhelp.h

mozilla/network/main/MacBinSupport.c

@@ -0,0 +1,461 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+/* MacBinary support.c
+
+This file implements MacBinary (actually MacBinary II) support for the following:
+
+	-Determine the size of a file when encoded in MacBinary
+
+	-Inline encoding of a file in MacBinary format
+
+The MacBinary II format consists of a 128-byte header containing all the
+information necessary to reproduce the document's directory entry on the
+receiving Macintosh; followed by the document's Data Fork (if it has one),
+padded with nulls to a multiple of 128 bytes (if necessary); followed by the
+document's Resource Fork (again, padded if necessary). The lengths of these
+forks (either or both of which may be zero) are contained in the header. 
+
+The format of the header for MacBinary II is as follows:
+
+  Offset 000	Byte		old version number, must be kept at zero for compatibility
+  Offset 001	Byte		Length of filename (must be in the range 1-63)
+  Offset 002	1 to 63 chars, filename (only "length" bytes are significant).
+  Offset 065	Long	file type (normally expressed as four characters)
+  Offset 069	Long	file creator (normally expressed as four characters)
+  Offset 073	Byte		original Finder flags
+                                 Bit 7 - Locked.
+                                 Bit 6 - Invisible.
+                                 Bit 5 - Bundle.
+                                 Bit 4 - System.
+                                 Bit 3 - Bozo.
+                                 Bit 2 - Busy.
+                                 Bit 1 - Changed.
+                                 Bit 0 - Inited.
+  Offset 074	Byte	zero fill, must be zero for compatibility
+  Offset 075	Short	file's vertical position within its window.
+  Offset 077	Short	file's horizontal position within its window.
+  Offset 079	Short	file's window or folder ID.
+  Offset 081	Byte	"Protected" flag (in low order bit).
+  Offset 082	Byte	zero fill, must be zero for compatibility
+  Offset 083	Long	Data Fork length (bytes, zero if no Data Fork).
+  Offset 087	Long	Resource Fork length (bytes, zero if no R.F.).
+  Offset 091	Long	File's creation date
+  Offset 095	Long	File's "last modified" date.
+  Offset 099	Short	zero fill (was file comment length which is not supported)
+  Offset 101	Byte	Finder Flags, bits 0-7. (Bits 8-15 are already in byte 73)
+  Offset 116	Long	Length of total files when packed files are unpacked.
+			             This is only used by programs that pack and unpack on the fly,
+			             mimicing a standalone utility such as PackIt.  A program that is
+			             uploading a single file must zero this location when sending a
+			             file.  Programs that do not unpack/uncompress files when
+			             downloading may ignore this value.
+  Offset 120	Short	zero fill (was length of a secondary header which is not supported)
+  Offset 122	Byte	Version number of Macbinary II that the uploading program
+             				is written for (the version begins at 129)
+  Offset 123	Byte	Minimum MacBinary II version needed to read this file
+             				(start this value at 129)
+  Offset 124	Short	CRC of previous 124 bytes
+
+All values are stored in normal 68000 order, with Most Significant Byte
+appearing first then the file.  Any bytes in the header not defined above
+should be set to zero.
+
+
+MacBinary header creation and CRC calculation based on Erny Tontlinger's free 'Terminal' source
+
+*/
+
+#include "xp.h"
+
+#include "MacBinSupport.h"
+
+#include "MoreFilesExtras.h"
+
+enum
+{
+	kMB_SendingHeader,			/* Data from read is MB header */
+	kMB_SetupDataFork,			/* Finished sending MB header so prepare data fork */
+	kMB_SendingDataFork,		/* Data from read is file's data fork */
+	kMB_SetupResFork,			/* Finished sending data fork so prepare res fork */
+	kMB_SendingResFork,			/* Data from read is file's data fork */
+	kMB_FinishedFile			/* Nothing left to send - file finished */
+	
+};
+
+static Byte fillerBuf[kMBHeaderLength];
+
+static unsigned short CalcMacBinaryCRC(Byte *ptr, unsigned long count)
+{
+	unsigned short crc;
+	unsigned short i;
+
+	crc = 0;
+	while (count-- > 0) {
+		crc = crc ^ (unsigned short)*ptr++ << 8;
+		for (i = 0; i < 8; ++i)
+			if (crc & 0x8000)
+				crc = crc << 1 ^ 0x1021;
+			else
+				crc = crc << 1;
+	}
+	return crc;
+}
+
+static OSErr InitMacBinaryHeader(MB_FileSpec *mbFileSpec)
+{
+#define	MB_VersionNumber	129
+#define MBH_name			1
+#define MBH_info1			65
+#define MBH_protected		81
+#define MBH_dLength			83
+#define MBH_rLength			87
+#define MBH_creation		91
+#define MBH_modification	95
+#define MBH_getInfoLength	99
+#define MBH_info2			101
+#define MBH_filesLength		116
+#define MBH_sHeaderLength	120
+#define MBH_newVersion		122
+#define MBH_minimumVersion	123
+#define MBH_crc				124
+
+	OSErr 			theErr;
+	unsigned short	crc;
+	HParamBlockRec	param;
+
+	XP_MEMSET(&param, 0, sizeof(param));
+	param.fileParam.ioNamePtr = (StringPtr)mbFileSpec->theFileSpec.name;
+	param.fileParam.ioVRefNum = mbFileSpec->theFileSpec.vRefNum;
+	param.fileParam.ioDirID = mbFileSpec->theFileSpec.parID;
+	theErr = PBHGetFInfoSync(&param);
+	if (theErr != noErr)
+		return (theErr);
+
+	XP_MEMSET(mbFileSpec->mbHeader, 0, kMBHeaderLength);
+
+	XP_MEMCPY(
+		&mbFileSpec->mbHeader[MBH_name],
+		mbFileSpec->theFileSpec.name, mbFileSpec->theFileSpec.name[0] + 1);
+	mbFileSpec->mbHeader[MBH_info2] = param.fileParam.ioFlFndrInfo.fdFlags & 0x00FF;
+	param.fileParam.ioFlFndrInfo.fdFlags &= 0xFF00;
+	*(long *)&param.fileParam.ioFlFndrInfo.fdLocation = 0;
+	param.fileParam.ioFlFndrInfo.fdFldr = 0;
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_info1], (void *)&param.fileParam.ioFlFndrInfo, 16);
+	mbFileSpec->mbHeader[MBH_protected] = (Byte)(param.fileParam.ioFlAttrib) & 0x01;
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_dLength], (void *)&param.fileParam.ioFlLgLen, 4);
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_rLength], (void *)&param.fileParam.ioFlRLgLen, 4);
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_creation], (void *)&param.fileParam.ioFlCrDat, 4);
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_modification], (void *)&param.fileParam.ioFlMdDat, 4);
+	mbFileSpec->mbHeader[MBH_newVersion] = MB_VersionNumber;
+	mbFileSpec->mbHeader[MBH_minimumVersion] = MB_VersionNumber;
+	crc = CalcMacBinaryCRC(mbFileSpec->mbHeader, 124);
+	XP_MEMCPY(&mbFileSpec->mbHeader[MBH_crc], (void *)&crc, 2);
+	
+	mbFileSpec->dataForkLength = param.fileParam.ioFlLgLen;
+	mbFileSpec->resForkLength = param.fileParam.ioFlRLgLen;
+	
+	return (noErr);
+}
+
+static long PadBufferToMacBinBlock(char *buf, long bytesInBuf)
+{
+	long	paddingNeeded = 0;
+	
+	if (bytesInBuf % kMBHeaderLength)
+	{
+		paddingNeeded = kMBHeaderLength - (bytesInBuf % kMBHeaderLength);
+		XP_MEMCPY(&buf[bytesInBuf], fillerBuf, paddingNeeded);
+	}
+	
+	return (bytesInBuf + paddingNeeded);
+}
+
+/* MB_Stat
+
+	Returns the size of the file when encoded in MacBinary format
+	
+	This is computed as 128 bytes for the MacBinary header + the size of the data fork
+	rounded up to a multiple of 128 bytes + the size of the resource fork rounded up to
+	a multiple of 128 bytes.
+*/
+
+int MB_Stat( const char* name, XP_StatStruct * outStat,  XP_FileType type )
+{
+	int		result = -1;
+	long	totalFileSize = 0;
+	char	*newName = WH_FileName( name, type );
+	FSSpec	fileSpec = {0, 0, "\p"};
+	OSErr	theErr;
+	long	dataSize;
+	long	rsrcSize;
+	long	sizeRemainder;
+	
+	/* See if we managed to copy the name */
+	if (!newName)
+		return (result);
+	
+	/* Now see if we can find out something about the file */
+	theErr = FSSpecFromPathname_CWrapper(newName, &fileSpec);
+	if (theErr == noErr)
+	{
+		theErr = FSpGetFileSize(&fileSpec, &dataSize, &rsrcSize);
+		if (theErr == noErr)
+		{
+			result = 0;				/* Set the result code to success */
+			
+			totalFileSize = kMBHeaderLength;	/* 128 bytes for the MacBin header */
+			
+			/* Make sure data and rsrc sizes are multiples of 128 bytes
+				before adding them to totalFileSize */
+			sizeRemainder = dataSize % kMBHeaderLength;
+			if (sizeRemainder)
+			{
+				dataSize += (kMBHeaderLength - sizeRemainder);
+			}
+			totalFileSize += dataSize;
+			
+			sizeRemainder = rsrcSize % kMBHeaderLength;
+			if (sizeRemainder)
+			{
+				rsrcSize += (kMBHeaderLength - sizeRemainder);
+			}
+			totalFileSize += rsrcSize;
+			
+			/* Stuff the calculated file size into the appropriate stat field */
+			outStat->st_size = totalFileSize;
+		}
+	}
+	
+	XP_FREE(newName);
+	
+	return (result);
+}
+
+/* MB_Open
+
+	Prepares a file for inline encoding in the MacBinary format.  It builds the
+	MacBinary header and initializes the state machine for the encoding process.
+	
+	
+	Get file info
+	Build MacBinary header
+	Set state machine to kMB_SendingHeader
+
+*/
+
+OSErr MB_Open(const char *name, MB_FileSpec *mbFileSpec)
+{
+	char	*newName = WH_FileName( name, xpFileToPost );
+	OSErr	theErr = noErr;
+
+	/* See if we managed to copy the name */
+	if (!newName)
+		return (fnfErr);
+	
+	/* Now see if we can find make an FSSpec for the file */
+	theErr = FSSpecFromPathname_CWrapper(newName, &mbFileSpec->theFileSpec);
+	if (theErr == noErr)
+	{
+		theErr = InitMacBinaryHeader(mbFileSpec);
+		if (theErr == noErr)
+		{
+			// Set up the rest of the MB_FileSpec info
+			mbFileSpec->fileState = kMB_SendingHeader;
+			mbFileSpec->fileRefNum = -1;
+			mbFileSpec->dataBytesRead = 0;
+			mbFileSpec->resBytesRead = 0;
+		}
+	}
+	
+	/* Make sure our filler buffer is cleared */
+	XP_MEMSET(fillerBuf, 0, kMBHeaderLength);
+
+	return (theErr);
+}
+
+/* MB_Read
+
+	Provides a MacBinary encoded version of a file.  All reads are done to the supplied
+	buffer.  The MB_Read function just returns how many bytes have been placed in the
+	buffer.
+	
+	Switch on state
+		kMB_SendingHeader
+			set state to kMB_SetupDataFork
+			Return the # of bytes in an MB header
+		kMB_SetupDataFork
+			If hasDataFork
+				Open the data fork of the file
+				Set the state to kMB_SendingDataFork
+				GOTO kMB_SendingDataFork
+			else
+				GOTO kMB_SetupResFork
+		kMB_SendingDataFork
+			Read a buffer's worth of data
+				Make sure buffer is padded to MB block boundary
+				If EOF set state to kMB_SetupResFork
+			Return the # of bytes in buffer
+		kMB_SetupResFork
+			Close data fork if open
+			If hasResFork
+				Open the resource fork of the file
+				Set the state to kMB_SendingResFork
+				GOTO kMB_SendingResFork
+			else
+				GOTO kMB_FinishedFile
+		kMB_SendingResFork
+			Read a buffer's worth of data
+				Make sure buffer is padded to MB block boundary
+				If EOF set state to kMB_FinishedFile
+			Return the # of bytes in buffer
+		kMB_FinishedFile
+			Close resource fork if open
+			Set the state to kMB_FinishedFile
+		
+*/
+int32	MB_Read(char *buf, int bufSize, MB_FileSpec *mbFileSpec)
+{
+	long	bytesInBuf = 0;
+	OSErr	theErr = noErr;
+	long	count = bufSize;
+	
+	switch (mbFileSpec->fileState)
+	{
+		case kMB_SendingHeader:
+			XP_MEMCPY(buf, mbFileSpec->mbHeader, kMBHeaderLength);
+			bytesInBuf = kMBHeaderLength;
+			mbFileSpec->fileState = kMB_SetupDataFork;
+			break;
+		
+		case kMB_SetupDataFork:
+			if (mbFileSpec->dataForkLength)
+			{
+				theErr = FSpOpenDF(&mbFileSpec->theFileSpec, fsRdPerm, &mbFileSpec->fileRefNum);
+				if (theErr == noErr)
+				{
+					mbFileSpec->fileState = kMB_SendingDataFork;
+					
+					/* Now that the data fork is open jump into the read state */
+					goto SendingDataFork;
+				}
+				else
+				{	/* Couldn't open the data fork so exit the state machine */
+					goto FinishedFile;
+				}
+			}
+			else
+			{	/* Apparently no data fork so go ahead and try the res fork */
+				goto SetupResFork;
+			}
+			break;
+
+		case kMB_SendingDataFork:
+SendingDataFork:
+			theErr = FSRead(mbFileSpec->fileRefNum, &count, buf);
+			if (theErr == noErr || theErr == eofErr)
+			{
+				bytesInBuf = PadBufferToMacBinBlock(buf, count);
+				mbFileSpec->dataBytesRead += count;
+				
+				/* See if we've reached EOF for the data */
+				if (mbFileSpec->dataBytesRead == mbFileSpec->dataForkLength)
+					mbFileSpec->fileState = kMB_SetupResFork;
+			}
+			else
+			{	/* Got some sort of error reading the data fork so exit the state machine */
+				goto FinishedFile;
+			}
+			break;
+		
+		case kMB_SetupResFork:
+SetupResFork:
+			/* Close the data fork */
+			if (mbFileSpec->fileRefNum != -1)
+			{
+				FSClose(mbFileSpec->fileRefNum);
+				mbFileSpec->fileRefNum = -1;
+			}
+			
+			/* See if we have a res fork to send */
+			if (mbFileSpec->resForkLength)
+			{
+				theErr = FSpOpenRF(&mbFileSpec->theFileSpec, fsRdPerm, &mbFileSpec->fileRefNum);
+				if (theErr == noErr)
+				{
+					mbFileSpec->fileState = kMB_SendingResFork;
+					/* Now that the res fork is open jump into the read state */
+					goto SendingResFork;
+				}
+				else
+				{	/* Couldn't open the res fork so exit the state machine */
+					goto FinishedFile;
+				}
+			}
+			else
+			{	/* Apparently no res fork so go ahead and exite the state machine */
+				goto FinishedFile;
+			}
+
+		case kMB_SendingResFork:
+SendingResFork:
+			theErr = FSRead(mbFileSpec->fileRefNum, &count, buf);
+			if (theErr == noErr || theErr == eofErr)
+			{
+				bytesInBuf = PadBufferToMacBinBlock(buf, count);
+				mbFileSpec->resBytesRead += count;
+				
+				/* See if we've reached EOF for the res fork */
+				if (mbFileSpec->resBytesRead == mbFileSpec->resForkLength)
+					mbFileSpec->fileState = kMB_FinishedFile;
+			}
+			else
+			{	/* Got some sort of error reading the res fork so exit the state machine */
+				goto FinishedFile;
+			}
+			break;
+		
+		case kMB_FinishedFile:
+FinishedFile:
+			/* If we're here then we're done with the file */
+			mbFileSpec->fileState = kMB_FinishedFile;
+			
+			/* If we have a fork open, close it */
+			if (mbFileSpec->fileRefNum != -1)
+			{
+				FSClose(mbFileSpec->fileRefNum);
+				mbFileSpec->fileRefNum = -1;
+			}
+			break;
+	}
+	
+	return ((int32)bytesInBuf);
+}
+
+/* MB_Close
+
+	Nothing really to do since the file forks are actually closed in the MB_Read
+	routine after they have been sent.
+*/
+void MB_Close(MB_FileSpec *mbFileSpec)
+{
+	if (mbFileSpec->fileRefNum != -1)
+		FSClose(mbFileSpec->fileRefNum);
+	
+	mbFileSpec->fileState = kMB_FinishedFile;
+}