Removendo codigo nao usado, ajustando plugins para o novo nome das flags

perry.werneck@gmail.com
1 parent e0dfd10d
Showing 7 changed files with 1029 additions and 1031 deletions Show diff stats
latest/pw3270.cbp
latest/src/include/lib3270/api.h
latest/src/jni/pw3270_jni.c
latest/src/lib/Makefile.in
latest/src/lib/icmd.c
latest/src/lib/icmd.c.unused
latest/src/plugins/rexx/screen.c
@@ -9,8 +9,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters="--program-data=.  --model=5 --plugin-path=./bin/Debug/plugins" />
@@ -19,8 +19,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin\Release\g3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output=".bin/Release/g3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -32,7 +32,7 @@
 			</Target>
 			<Target title="libtest">
 				<Option output="testprogram" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -48,17 +48,17 @@
 		<Unit filename="Makefile.in" />
 		<Unit filename="bootstrap.sh" />
 		<Unit filename="configure.ac" />
-		<Unit filename="debian\control-base.in" />
-		<Unit filename="debian\lib3270.install">
+		<Unit filename="debian/control-base.in" />
+		<Unit filename="debian/lib3270.install">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="debian\pw3270-plugin-java.install">
+		<Unit filename="debian/pw3270-plugin-java.install">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="debian\pw3270-plugin-rexx.install">
+		<Unit filename="debian/pw3270-plugin-rexx.install">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="debian\pw3270.install">
+		<Unit filename="debian/pw3270.install">
 			<Option target="Release" />
 		</Unit>
 		<Unit filename="makegtkruntime.sh">
@@ -66,724 +66,721 @@
 		</Unit>
 		<Unit filename="pw3270.nsi.in" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="rexx\sample.rex" />
+		<Unit filename="rexx/sample.rex" />
 		<Unit filename="scripts.conf.in" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\Ambiguous.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\Defaulted.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\GetDirectPropertyTolerantResult.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\GetPropertyTolerantResult.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\IllegalTypeException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\IntrospectionException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\MethodConcept.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\NamedValue.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\NotRemoveableException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\Optional.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\Pair.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\Property.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyAttribute.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyChangeEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyConcept.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyExistException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertySetInfoChange.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertySetInfoChangeEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyState.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyStateChangeEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyValue.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyValues.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\PropertyVetoException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\SetPropertyTolerantFailed.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\StringPair.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\TolerantPropertySetResultType.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\UnknownPropertyException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XExactName.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XFastPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XHierarchicalPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XHierarchicalPropertySetInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XIntroTest.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XIntrospection.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XIntrospectionAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XMaterialHolder.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XMultiHierarchicalPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XMultiPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XMultiPropertyStates.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertiesChangeListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertiesChangeNotifier.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XProperty.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyChangeListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertySetInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertySetInfoChangeListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertySetInfoChangeNotifier.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyState.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyStateChangeListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XPropertyWithState.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XTolerantMultiPropertySet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\beans\XVetoableChangeListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\Acceptor.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\AlreadyAcceptingException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\ConnectionSetupException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\Connector.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\NoConnectException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\SocketPermission.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\XAcceptor.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\XConnection.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\XConnection2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\XConnectionBroadcaster.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\connection\XConnector.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\ContainerEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\ElementExistException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\NoSuchElementException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XChild.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XComponentEnumeration.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XComponentEnumerationAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContainerApproveBroadcaster.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContainerApproveListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContainerListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContainerQuery.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XContentEnumerationAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XElementAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XEnumeration.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XEnumerationAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XHierarchicalName.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XHierarchicalNameAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XHierarchicalNameContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XHierarchicalNameReplace.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIdentifierAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIdentifierContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIdentifierReplace.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XImplicitIDAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XImplicitIDContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XImplicitIDReplace.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIndexAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIndexContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XIndexReplace.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XNameAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XNameContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XNameReplace.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XNamed.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XSet.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XStringKeyMap.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\container\XUniqueIDAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\CorbaString8.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\CorbaUnion.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\LogicalThreadID.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\ObjectKey.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\ObjectSystemID.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\OneThreadID.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\OpaqueData.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\TCKind.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\ThreadIDs.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\CancelRequestHeader.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\FragmentHeader_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\IORAddressingInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\LocateReplyHeader_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\LocateRequestHeader_1_0.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\LocateRequestHeader_1_1.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\LocateStatusType_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\MessageHeader_1_0.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\MessageHeader_1_1.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\MessageHeader_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\MsgType_1_1.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\ReplyHeader_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\ReplyStatusType_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\RequestHeader_1_0.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\RequestHeader_1_1.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\RequestHeader_1_2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\SystemExceptionReplyBody.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\TargetAddress.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\TargetAddressGroup.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\giop\Version.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\BiDirIIOPServiceContext.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\ListenPoint.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\ListenPointList.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\ProfileBody_1_0.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\ProfileBody_1_1.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iiop\Version.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ComponentId.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\IOR.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\MultipleComponentProfile.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ProfileId.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ProfileIdGroup.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ServiceContext.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ServiceContextList.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ServiceId.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\ServiceIdGroup.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\TaggedComponent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\corba\iop\TaggedProfile.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\AlreadyConnectedException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\BufferSizeExceededException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\ConnectException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\DataTransferEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\FilePermission.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\IOException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\NoRouteToHostException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\NotConnectedException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\SequenceInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\SequenceOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\SocketException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\TempFile.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\UnexpectedEOFException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\UnknownHostException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\WrongFormatException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XActiveDataControl.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XActiveDataSink.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XActiveDataSource.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XActiveDataStreamer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XAsyncOutputMonitor.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XConnectable.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XDataExporter.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XDataImporter.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XDataInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XDataOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XDataTransferEventListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XInputStreamProvider.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XMarkableStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XObjectInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XObjectOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XPersist.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XPersistObject.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XSeekable.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XSeekableInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XSequenceOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XStreamListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XTempFile.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XTextInputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XTextOutputStream.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XTruncate.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\io\XXMLExtractor.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\ArrayIndexOutOfBoundsException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\ClassNotFoundException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\DisposedException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\EventObject.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\IllegalAccessException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\IllegalArgumentException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\IndexOutOfBoundsException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\InvalidListenerException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\ListenerExistException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\Locale.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\NoSuchFieldException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\NoSuchMethodException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\NoSupportException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\NotInitializedException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\NullPointerException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\ServiceNotRegisteredException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\SystemDependent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\WrappedTargetException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\WrappedTargetRuntimeException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XComponent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XConnectionPoint.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XConnectionPointContainer.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XEventListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XInitialization.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XLocalizable.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XMain.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XMultiComponentFactory.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XMultiServiceFactory.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XServiceDisplayName.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XServiceInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XServiceName.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XSingleComponentFactory.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XSingleServiceFactory.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XTypeProvider.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\lang\XUnoTunnel.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\loader\CannotActivateFactoryException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\loader\XImplementationLoader.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\FieldAccessMode.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\InvocationTargetException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\MethodMode.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\ParamInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\ParamMode.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XIdlArray.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XIdlClass.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XIdlField.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XIdlMember.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XIdlMethod.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XMethodParameter.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\reflection\XPublished.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\CannotRegisterImplementationException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\InvalidRegistryException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\InvalidValueException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\MergeConflictException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\RegistryKeyType.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\RegistryValueType.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\XImplementationRegistration.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\XImplementationRegistration2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\XRegistryKey.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\registry\XSimpleRegistry.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\AllEventObject.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\ArrayWrapper.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\BasicErrorException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\CannotConvertException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\CannotCreateAdapterException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\ContextInformation.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\FailReason.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\FinishEngineEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\FinishReason.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\InterruptEngineEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\InterruptReason.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\InvocationInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\MemberType.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\ScriptEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\ScriptEventDescriptor.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XAllListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XAllListenerAdapterService.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XDebugging.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XDefaultMethod.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XDefaultProperty.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XEngine.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XEngineListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XEventAttacher.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XEventAttacherManager.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XInvocation.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XInvocation2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XInvocationAdapterFactory.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XInvocationAdapterFactory2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XLibraryAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XScriptEventsAttacher.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XScriptEventsSupplier.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XScriptListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XStarBasicAccess.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XStarBasicDialogInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XStarBasicLibraryInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XStarBasicModuleInfo.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\script\XTypeConverter.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\AccessControlException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\AllPermission.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\RuntimePermission.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\XAccessControlContext.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\XAccessController.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\XAction.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\security\XPolicy.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\TestEvent.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\XSimpleTest.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\XTest.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\XTestListener.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\TestData.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\TestDataElements.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\TestElement.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\TestEnum.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\TestSimple.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\XBridgeTest.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\XBridgeTest2.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\XBridgeTestBase.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\bridge\XRecursiveCall.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\performance\ComplexTypes.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\performance\SimpleTypes.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\test\performance\XPerformanceTest.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\DeploymentException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\Exception.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\RuntimeException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\SecurityException.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\TypeClass.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\Uik.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XAdapter.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XAggregation.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XComponentContext.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XCurrentContext.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XInterface.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XNamingService.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XReference.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XUnloadingPreference.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\uno\XWeak.hpp" />
-		<Unit filename="src\extensions\uno\com\sun\star\util\XVeto.hpp" />
-		<Unit filename="src\extensions\uno\src\Ooo3270.idl" />
-		<Unit filename="src\extensions\uno\src\actions.cxx" />
-		<Unit filename="src\extensions\uno\src\config.hpp" />
-		<Unit filename="src\extensions\uno\src\connection.cxx" />
-		<Unit filename="src\extensions\uno\src\main.cxx" />
-		<Unit filename="src\extensions\uno\src\ooo3270.hpp" />
-		<Unit filename="src\extensions\uno\src\screen.cxx" />
-		<Unit filename="src\extensions\uno\src\test_program.cxx" />
-		<Unit filename="src\gtk2\Makefile.in" />
-		<Unit filename="src\gtk2\action_calls.c">
+		<Unit filename="src/extensions/uno/com/sun/star/beans/Ambiguous.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/Defaulted.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/GetDirectPropertyTolerantResult.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/GetPropertyTolerantResult.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/IllegalTypeException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/IntrospectionException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/MethodConcept.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/NamedValue.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/NotRemoveableException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/Optional.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/Pair.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/Property.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyAttribute.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyChangeEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyConcept.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyExistException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertySetInfoChange.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertySetInfoChangeEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyState.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyStateChangeEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyValue.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyValues.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/PropertyVetoException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/SetPropertyTolerantFailed.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/StringPair.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/TolerantPropertySetResultType.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/UnknownPropertyException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XExactName.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XFastPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XHierarchicalPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XHierarchicalPropertySetInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XIntroTest.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XIntrospection.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XIntrospectionAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XMaterialHolder.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XMultiHierarchicalPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XMultiPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XMultiPropertyStates.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertiesChangeListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertiesChangeNotifier.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XProperty.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyChangeListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertySetInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertySetInfoChangeListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyState.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyStateChangeListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XPropertyWithState.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XTolerantMultiPropertySet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/beans/XVetoableChangeListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/Acceptor.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/AlreadyAcceptingException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/ConnectionSetupException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/Connector.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/NoConnectException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/SocketPermission.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/XAcceptor.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/XConnection.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/XConnection2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/XConnectionBroadcaster.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/connection/XConnector.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/ContainerEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/ElementExistException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/NoSuchElementException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XChild.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XComponentEnumeration.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XComponentEnumerationAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContainerApproveBroadcaster.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContainerApproveListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContainerListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContainerQuery.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XContentEnumerationAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XElementAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XEnumeration.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XEnumerationAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XHierarchicalName.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XHierarchicalNameAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XHierarchicalNameContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XHierarchicalNameReplace.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIdentifierAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIdentifierContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIdentifierReplace.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XImplicitIDAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XImplicitIDContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XImplicitIDReplace.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIndexAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIndexContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XIndexReplace.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XNameAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XNameContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XNameReplace.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XNamed.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XSet.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XStringKeyMap.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/container/XUniqueIDAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/CorbaString8.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/CorbaUnion.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/LogicalThreadID.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/ObjectKey.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/ObjectSystemID.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/OneThreadID.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/OpaqueData.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/TCKind.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/ThreadIDs.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/CancelRequestHeader.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/FragmentHeader_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/IORAddressingInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/LocateReplyHeader_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/LocateRequestHeader_1_0.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/LocateRequestHeader_1_1.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/LocateStatusType_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/MessageHeader_1_0.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/MessageHeader_1_1.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/MessageHeader_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/MsgType_1_1.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/ReplyHeader_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/ReplyStatusType_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/RequestHeader_1_0.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/RequestHeader_1_1.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/RequestHeader_1_2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/SystemExceptionReplyBody.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/TargetAddress.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/TargetAddressGroup.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/giop/Version.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/BiDirIIOPServiceContext.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/ListenPoint.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/ListenPointList.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/ProfileBody_1_0.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/ProfileBody_1_1.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iiop/Version.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ComponentId.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/IOR.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/MultipleComponentProfile.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ProfileId.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ProfileIdGroup.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ServiceContext.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ServiceContextList.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ServiceId.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/ServiceIdGroup.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/TaggedComponent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/corba/iop/TaggedProfile.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/AlreadyConnectedException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/BufferSizeExceededException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/ConnectException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/DataTransferEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/FilePermission.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/IOException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/NoRouteToHostException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/NotConnectedException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/SequenceInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/SequenceOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/SocketException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/TempFile.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/UnexpectedEOFException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/UnknownHostException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/WrongFormatException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XActiveDataControl.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XActiveDataSink.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XActiveDataSource.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XActiveDataStreamer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XAsyncOutputMonitor.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XConnectable.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XDataExporter.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XDataImporter.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XDataInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XDataOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XDataTransferEventListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XInputStreamProvider.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XMarkableStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XObjectInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XObjectOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XPersist.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XPersistObject.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XSeekable.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XSeekableInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XSequenceOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XStreamListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XTempFile.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XTextInputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XTextOutputStream.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XTruncate.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/io/XXMLExtractor.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/ArrayIndexOutOfBoundsException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/ClassNotFoundException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/DisposedException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/EventObject.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/IllegalAccessException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/IllegalArgumentException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/IndexOutOfBoundsException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/InvalidListenerException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/ListenerExistException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/Locale.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/NoSuchFieldException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/NoSuchMethodException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/NoSupportException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/NotInitializedException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/NullPointerException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/ServiceNotRegisteredException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/SystemDependent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/WrappedTargetException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/WrappedTargetRuntimeException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XComponent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XConnectionPoint.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XConnectionPointContainer.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XEventListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XInitialization.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XLocalizable.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XMain.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XMultiComponentFactory.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XMultiServiceFactory.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XServiceDisplayName.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XServiceInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XServiceName.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XSingleComponentFactory.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XSingleServiceFactory.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XTypeProvider.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/lang/XUnoTunnel.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/loader/CannotActivateFactoryException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/loader/XImplementationLoader.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/FieldAccessMode.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/InvocationTargetException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/MethodMode.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/ParamInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/ParamMode.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XIdlArray.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XIdlClass.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XIdlField.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XIdlMember.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XIdlMethod.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XMethodParameter.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/reflection/XPublished.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/CannotRegisterImplementationException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/InvalidRegistryException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/InvalidValueException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/MergeConflictException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/RegistryKeyType.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/RegistryValueType.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/XImplementationRegistration.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/XImplementationRegistration2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/XRegistryKey.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/registry/XSimpleRegistry.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/AllEventObject.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/ArrayWrapper.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/BasicErrorException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/CannotConvertException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/CannotCreateAdapterException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/ContextInformation.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/FailReason.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/FinishEngineEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/FinishReason.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/InterruptEngineEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/InterruptReason.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/InvocationInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/MemberType.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/ScriptEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/ScriptEventDescriptor.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XAllListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XAllListenerAdapterService.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XDebugging.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XDefaultMethod.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XDefaultProperty.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XEngine.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XEngineListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XEventAttacher.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XEventAttacherManager.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XInvocation.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XInvocation2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XInvocationAdapterFactory.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XInvocationAdapterFactory2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XLibraryAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XScriptEventsAttacher.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XScriptEventsSupplier.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XScriptListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XStarBasicAccess.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XStarBasicDialogInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XStarBasicLibraryInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XStarBasicModuleInfo.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/script/XTypeConverter.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/AccessControlException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/AllPermission.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/RuntimePermission.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/XAccessControlContext.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/XAccessController.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/XAction.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/security/XPolicy.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/TestEvent.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/XSimpleTest.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/XTest.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/XTestListener.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/TestData.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/TestDataElements.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/TestElement.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/TestEnum.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/TestSimple.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/XBridgeTest.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/XBridgeTest2.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/XBridgeTestBase.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/bridge/XRecursiveCall.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/performance/ComplexTypes.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/performance/SimpleTypes.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/test/performance/XPerformanceTest.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/DeploymentException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/Exception.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/RuntimeException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/SecurityException.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/TypeClass.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/Uik.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XAdapter.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XAggregation.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XComponentContext.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XCurrentContext.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XInterface.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XNamingService.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XReference.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XUnloadingPreference.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/uno/XWeak.hpp" />
+		<Unit filename="src/extensions/uno/com/sun/star/util/XVeto.hpp" />
+		<Unit filename="src/extensions/uno/src/Ooo3270.idl" />
+		<Unit filename="src/extensions/uno/src/actions.cxx" />
+		<Unit filename="src/extensions/uno/src/config.hpp" />
+		<Unit filename="src/extensions/uno/src/connection.cxx" />
+		<Unit filename="src/extensions/uno/src/main.cxx" />
+		<Unit filename="src/extensions/uno/src/ooo3270.hpp" />
+		<Unit filename="src/extensions/uno/src/screen.cxx" />
+		<Unit filename="src/extensions/uno/src/test_program.cxx" />
+		<Unit filename="src/gtk2/Makefile.in" />
+		<Unit filename="src/gtk2/action_calls.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\action_table.h" />
-		<Unit filename="src\gtk2\actions.c">
+		<Unit filename="src/gtk2/action_table.h" />
+		<Unit filename="src/gtk2/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\actions.h" />
-		<Unit filename="src\gtk2\actions1.c">
+		<Unit filename="src/gtk2/actions.h" />
+		<Unit filename="src/gtk2/actions1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\clipboard.c">
+		<Unit filename="src/gtk2/clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\colors.c">
+		<Unit filename="src/gtk2/colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\commands.c">
+		<Unit filename="src/gtk2/commands.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\config.c">
+		<Unit filename="src/gtk2/config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\cursor.c">
+		<Unit filename="src/gtk2/cursor.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\draw.c">
+		<Unit filename="src/gtk2/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\filetransfer.c">
+		<Unit filename="src/gtk2/filetransfer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\fonts.c">
+		<Unit filename="src/gtk2/fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\fonts.h" />
-		<Unit filename="src\gtk2\gui.h" />
-		<Unit filename="src\gtk2\iocallback.c">
+		<Unit filename="src/gtk2/fonts.h" />
+		<Unit filename="src/gtk2/gui.h" />
+		<Unit filename="src/gtk2/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\main.c">
+		<Unit filename="src/gtk2/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\mouse.c">
+		<Unit filename="src/gtk2/mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\oia.c">
+		<Unit filename="src/gtk2/oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\oia.h" />
-		<Unit filename="src\gtk2\plugin.c">
+		<Unit filename="src/gtk2/oia.h" />
+		<Unit filename="src/gtk2/plugin.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\print.c">
+		<Unit filename="src/gtk2/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\resources.rc.in" />
-		<Unit filename="src\gtk2\screen.c">
+		<Unit filename="src/gtk2/resources.rc.in" />
+		<Unit filename="src/gtk2/screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\script.c">
+		<Unit filename="src/gtk2/script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\terminal.c">
+		<Unit filename="src/gtk2/terminal.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\toggle.c">
+		<Unit filename="src/gtk2/toggle.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\topwindow.c">
+		<Unit filename="src/gtk2/topwindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\topwindow1.c">
+		<Unit filename="src/gtk2/topwindow1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\tracewindow.c">
+		<Unit filename="src/gtk2/tracewindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\ui_parse.c">
+		<Unit filename="src/gtk2/ui_parse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\ui_parse.h" />
-		<Unit filename="src\gtk2\uiparser1.c">
+		<Unit filename="src/gtk2/ui_parse.h" />
+		<Unit filename="src/gtk2/uiparser1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk2\uiparser1.h" />
-		<Unit filename="src\gtk2\version.c.in" />
-		<Unit filename="src\gui\resources.rc.in" />
-		<Unit filename="src\gui\version.c.in" />
-		<Unit filename="src\include\X11\keysym.h" />
-		<Unit filename="src\include\lib3270.h" />
-		<Unit filename="src\include\lib3270\3270ds.h" />
-		<Unit filename="src\include\lib3270\action_table.h" />
-		<Unit filename="src\include\lib3270\actions.h" />
-		<Unit filename="src\include\lib3270\api.h" />
-		<Unit filename="src\include\lib3270\config.h" />
-		<Unit filename="src\include\lib3270\config.h.in" />
-		<Unit filename="src\include\lib3270\macros.h" />
-		<Unit filename="src\include\lib3270\plugins.h.in" />
-		<Unit filename="src\include\lib3270\toggle.h" />
-		<Unit filename="src\java\lib3270_jni.h" />
-		<Unit filename="src\java\terminal.java">
+		<Unit filename="src/gtk2/uiparser1.h" />
+		<Unit filename="src/gtk2/version.c.in" />
+		<Unit filename="src/gui/resources.rc.in" />
+		<Unit filename="src/gui/version.c.in" />
+		<Unit filename="src/include/X11/keysym.h" />
+		<Unit filename="src/include/lib3270.h" />
+		<Unit filename="src/include/lib3270/3270ds.h" />
+		<Unit filename="src/include/lib3270/action_table.h" />
+		<Unit filename="src/include/lib3270/actions.h" />
+		<Unit filename="src/include/lib3270/api.h" />
+		<Unit filename="src/include/lib3270/config.h" />
+		<Unit filename="src/include/lib3270/config.h.in" />
+		<Unit filename="src/include/lib3270/macros.h" />
+		<Unit filename="src/include/lib3270/plugins.h.in" />
+		<Unit filename="src/include/lib3270/toggle.h" />
+		<Unit filename="src/java/lib3270_jni.h" />
+		<Unit filename="src/java/terminal.java">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\jni\Makefile.in" />
-		<Unit filename="src\jni\pw3270_jni.c">
+		<Unit filename="src/jni/Makefile.in" />
+		<Unit filename="src/jni/pw3270_jni.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\Makefile.in" />
-		<Unit filename="src\lib\XtGlue.c">
+		<Unit filename="src/lib/Makefile.in" />
+		<Unit filename="src/lib/XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\actions.c">
+		<Unit filename="src/lib/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\actionsc.h" />
-		<Unit filename="src\lib\ansi.c">
+		<Unit filename="src/lib/actionsc.h" />
+		<Unit filename="src/lib/ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\ansic.h" />
-		<Unit filename="src\lib\apl.c">
+		<Unit filename="src/lib/ansic.h" />
+		<Unit filename="src/lib/apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\aplc.h" />
-		<Unit filename="src\lib\appres.h" />
-		<Unit filename="src\lib\arpa_telnet.h" />
-		<Unit filename="src\lib\cg.h" />
-		<Unit filename="src\lib\charset.c">
+		<Unit filename="src/lib/aplc.h" />
+		<Unit filename="src/lib/appres.h" />
+		<Unit filename="src/lib/arpa_telnet.h" />
+		<Unit filename="src/lib/cg.h" />
+		<Unit filename="src/lib/charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\charsetc.h" />
-		<Unit filename="src\lib\childc.h" />
-		<Unit filename="src\lib\ctlr.c">
+		<Unit filename="src/lib/charsetc.h" />
+		<Unit filename="src/lib/childc.h" />
+		<Unit filename="src/lib/ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\ctlr.h" />
-		<Unit filename="src\lib\ctlrc.h" />
-		<Unit filename="src\lib\dialogc.h" />
-		<Unit filename="src\lib\ft.c">
+		<Unit filename="src/lib/ctlr.h" />
+		<Unit filename="src/lib/ctlrc.h" />
+		<Unit filename="src/lib/dialogc.h" />
+		<Unit filename="src/lib/ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\ft_cut.c">
+		<Unit filename="src/lib/ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\ft_cut_ds.h" />
-		<Unit filename="src\lib\ft_cutc.h" />
-		<Unit filename="src\lib\ft_dft.c">
+		<Unit filename="src/lib/ft_cut_ds.h" />
+		<Unit filename="src/lib/ft_cutc.h" />
+		<Unit filename="src/lib/ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\ft_dft_ds.h" />
-		<Unit filename="src\lib\ft_dftc.h" />
-		<Unit filename="src\lib\ftc.h" />
-		<Unit filename="src\lib\globals.h" />
-		<Unit filename="src\lib\glue.c">
+		<Unit filename="src/lib/ft_dft_ds.h" />
+		<Unit filename="src/lib/ft_dftc.h" />
+		<Unit filename="src/lib/ftc.h" />
+		<Unit filename="src/lib/globals.h" />
+		<Unit filename="src/lib/glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\gluec.h" />
-		<Unit filename="src\lib\host.c">
+		<Unit filename="src/lib/gluec.h" />
+		<Unit filename="src/lib/host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\hostc.h" />
-		<Unit filename="src\lib\icmd.c">
+		<Unit filename="src/lib/hostc.h" />
+		<Unit filename="src/lib/icmdc.h" />
+		<Unit filename="src/lib/keypadc.h" />
+		<Unit filename="src/lib/kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\icmdc.h" />
-		<Unit filename="src\lib\keypadc.h" />
-		<Unit filename="src\lib\kybd.c">
+		<Unit filename="src/lib/kybdc.h" />
+		<Unit filename="src/lib/localdefs.h" />
+		<Unit filename="src/lib/log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\kybdc.h" />
-		<Unit filename="src\lib\localdefs.h" />
-		<Unit filename="src\lib\log.c">
+		<Unit filename="src/lib/macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\macros.c">
+		<Unit filename="src/lib/menubarc.h" />
+		<Unit filename="src/lib/mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\menubarc.h" />
-		<Unit filename="src\lib\mkfb.c">
+		<Unit filename="src/lib/objects.h" />
+		<Unit filename="src/lib/paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\objects.h" />
-		<Unit filename="src\lib\paste.c">
+		<Unit filename="src/lib/popupsc.h" />
+		<Unit filename="src/lib/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\popupsc.h" />
-		<Unit filename="src\lib\print.c">
+		<Unit filename="src/lib/printc.h" />
+		<Unit filename="src/lib/printer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\printc.h" />
-		<Unit filename="src\lib\printer.c">
+		<Unit filename="src/lib/printerc.h" />
+		<Unit filename="src/lib/proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\printerc.h" />
-		<Unit filename="src\lib\proxy.c">
+		<Unit filename="src/lib/proxyc.h" />
+		<Unit filename="src/lib/resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\proxyc.h" />
-		<Unit filename="src\lib\resolver.c">
+		<Unit filename="src/lib/resolverc.h" />
+		<Unit filename="src/lib/resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\resolverc.h" />
-		<Unit filename="src\lib\resources.c">
+		<Unit filename="src/lib/resources.h" />
+		<Unit filename="src/lib/rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\resources.h" />
-		<Unit filename="src\lib\rpq.c">
+		<Unit filename="src/lib/savec.h" />
+		<Unit filename="src/lib/screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\savec.h" />
-		<Unit filename="src\lib\screen.c">
+		<Unit filename="src/lib/screen.h" />
+		<Unit filename="src/lib/screenc.h" />
+		<Unit filename="src/lib/scrollc.h" />
+		<Unit filename="src/lib/see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\screen.h" />
-		<Unit filename="src\lib\screenc.h" />
-		<Unit filename="src\lib\scrollc.h" />
-		<Unit filename="src\lib\see.c">
+		<Unit filename="src/lib/seec.h" />
+		<Unit filename="src/lib/selectc.h" />
+		<Unit filename="src/lib/session.h" />
+		<Unit filename="src/lib/sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\seec.h" />
-		<Unit filename="src\lib\selectc.h" />
-		<Unit filename="src\lib\session.h" />
-		<Unit filename="src\lib\sf.c">
+		<Unit filename="src/lib/sfc.h" />
+		<Unit filename="src/lib/shlobj_missing.h" />
+		<Unit filename="src/lib/statusc.h" />
+		<Unit filename="src/lib/tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\sfc.h" />
-		<Unit filename="src\lib\shlobj_missing.h" />
-		<Unit filename="src\lib\statusc.h" />
-		<Unit filename="src\lib\tables.c">
+		<Unit filename="src/lib/tablesc.h" />
+		<Unit filename="src/lib/telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\tablesc.h" />
-		<Unit filename="src\lib\telnet.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src\lib\telnetc.h" />
-		<Unit filename="src\lib\testprogram.c">
+		<Unit filename="src/lib/telnetc.h" />
+		<Unit filename="src/lib/testprogram.c">
 			<Option compilerVar="CC" />
 			<Option target="libtest" />
 		</Unit>
-		<Unit filename="src\lib\tn3270e.h" />
-		<Unit filename="src\lib\toggles.c">
+		<Unit filename="src/lib/tn3270e.h" />
+		<Unit filename="src/lib/toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\togglesc.h" />
-		<Unit filename="src\lib\trace_ds.c">
+		<Unit filename="src/lib/togglesc.h" />
+		<Unit filename="src/lib/trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\trace_dsc.h" />
-		<Unit filename="src\lib\utf8.c">
+		<Unit filename="src/lib/trace_dsc.h" />
+		<Unit filename="src/lib/utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\utf8c.h" />
-		<Unit filename="src\lib\util.c">
+		<Unit filename="src/lib/utf8c.h" />
+		<Unit filename="src/lib/util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\utilc.h" />
-		<Unit filename="src\lib\w3misc.c">
+		<Unit filename="src/lib/utilc.h" />
+		<Unit filename="src/lib/w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\w3miscc.h" />
-		<Unit filename="src\lib\wide.c">
+		<Unit filename="src/lib/w3miscc.h" />
+		<Unit filename="src/lib/wide.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\widec.h" />
-		<Unit filename="src\lib\winvers.c">
+		<Unit filename="src/lib/widec.h" />
+		<Unit filename="src/lib/winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\winversc.h" />
-		<Unit filename="src\lib\xio.c">
+		<Unit filename="src/lib/winversc.h" />
+		<Unit filename="src/lib/xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib\xioc.h" />
-		<Unit filename="src\lib\xl.h" />
-		<Unit filename="src\oxt\actions.cxx">
+		<Unit filename="src/lib/xioc.h" />
+		<Unit filename="src/lib/xl.h" />
+		<Unit filename="src/oxt/actions.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\connection.cxx">
+		<Unit filename="src/oxt/connection.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\description.txt">
+		<Unit filename="src/oxt/description.txt">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\description.xml.in">
+		<Unit filename="src/oxt/description.xml.in">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\globals.hpp">
+		<Unit filename="src/oxt/globals.hpp">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\main.cxx">
+		<Unit filename="src/oxt/main.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\manifest.xml.in">
+		<Unit filename="src/oxt/manifest.xml.in">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\ooo3270.hpp">
+		<Unit filename="src/oxt/ooo3270.hpp">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\pw3270.idl">
+		<Unit filename="src/oxt/pw3270.idl">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\screen.cxx">
+		<Unit filename="src/oxt/screen.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\status.cxx">
+		<Unit filename="src/oxt/status.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\oxt\testprogram.cxx">
+		<Unit filename="src/oxt/testprogram.cxx">
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\plugins\java\Makefile.in" />
-		<Unit filename="src\plugins\java\control.in" />
-		<Unit filename="src\plugins\java\j3270plugin.c">
+		<Unit filename="src/plugins/java/Makefile.in" />
+		<Unit filename="src/plugins/java/control.in" />
+		<Unit filename="src/plugins/java/j3270plugin.c">
 			<Option compilerVar="CC" />
 			<Option target="Debug" />
 			<Option target="libtest" />
 		</Unit>
-		<Unit filename="src\plugins\pipectl\Makefile.in" />
-		<Unit filename="src\plugins\pipectl\commands.c">
+		<Unit filename="src/plugins/pipectl/Makefile.in" />
+		<Unit filename="src/plugins/pipectl/commands.c">
 			<Option compilerVar="CC" />
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src\plugins\pipectl\init.c">
+		<Unit filename="src/plugins/pipectl/init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\pipectl\pipeclient.c">
+		<Unit filename="src/plugins/pipectl/pipeclient.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\pipectl\pipectl.h" />
-		<Unit filename="src\plugins\pipectl\pipesource.c">
+		<Unit filename="src/plugins/pipectl/pipectl.h" />
+		<Unit filename="src/plugins/pipectl/pipesource.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\Makefile.in" />
-		<Unit filename="src\plugins\rexx\actions.c">
+		<Unit filename="src/plugins/rexx/Makefile.in" />
+		<Unit filename="src/plugins/rexx/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\calls.h" />
-		<Unit filename="src\plugins\rexx\common_start.c">
+		<Unit filename="src/plugins/rexx/calls.h" />
+		<Unit filename="src/plugins/rexx/common_start.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\control.in" />
-		<Unit filename="src\plugins\rexx\dialogs.c">
+		<Unit filename="src/plugins/rexx/control.in" />
+		<Unit filename="src/plugins/rexx/dialogs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\filetransfer.c">
+		<Unit filename="src/plugins/rexx/filetransfer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\gui.c">
+		<Unit filename="src/plugins/rexx/gui.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\init.c">
+		<Unit filename="src/plugins/rexx/init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\network.c">
+		<Unit filename="src/plugins/rexx/network.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\plg_start.c">
+		<Unit filename="src/plugins/rexx/plg_start.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\rx3270.cls" />
-		<Unit filename="src\plugins\rexx\rx3270.h" />
-		<Unit filename="src\plugins\rexx\screen.c">
+		<Unit filename="src/plugins/rexx/rx3270.cls" />
+		<Unit filename="src/plugins/rexx/rx3270.h" />
+		<Unit filename="src/plugins/rexx/screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\std_start.c">
+		<Unit filename="src/plugins/rexx/std_start.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\toggle.c">
+		<Unit filename="src/plugins/rexx/toggle.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\plugins\rexx\tools.c">
+		<Unit filename="src/plugins/rexx/tools.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\xml2pot.c">
+		<Unit filename="src/xml2pot.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="ui\debug.xml" />
-		<Unit filename="ui\default.xml" />
-		<Unit filename="ui\functions.xml" />
-		<Unit filename="ui\hosts.xml" />
-		<Unit filename="ui\keypad.xml" />
-		<Unit filename="ui\rexx.xml" />
+		<Unit filename="ui/debug.xml" />
+		<Unit filename="ui/default.xml" />
+		<Unit filename="ui/functions.xml" />
+		<Unit filename="ui/hosts.xml" />
+		<Unit filename="ui/keypad.xml" />
+		<Unit filename="ui/rexx.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
@@ -256,7 +256,6 @@
 			char 				  ssl_host;
 			char 				  ever_3270;
-
 			// Widget info
 			void				* widget;
@@ -66,7 +66,7 @@
 #define CHECK_FOR_TERMINAL_STATUS	if(!PCONNECTED) \
 										return ENOTCONN; \
-									else if(query_3270_terminal_status() != STATUS_CODE_BLANK) \
+									else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK) \
 										return EBUSY;
@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_Connect(JNIEnv *env, jobject obj, js
 		while(time(0) < tm)
 		{
-			if( (CONNECTED) && query_3270_terminal_status() == STATUS_CODE_BLANK)
+			if( (CONNECTED) && query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 				return 0;
 			RunPendingEvents(1);
@@ -177,7 +177,7 @@ JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isConnected(JNIEnv *env, jobject
 JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isTerminalReady(JNIEnv *env, jobject obj)
 {
-	if(!CONNECTED || query_3270_terminal_status() != STATUS_CODE_BLANK)
+	if(!CONNECTED || query_3270_terminal_status() != LIB3270_STATUS_BLANK)
 		return JNI_FALSE;
 	return JNI_TRUE;
 }
@@ -312,7 +312,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForTerminalReady(JNIEnv *env, jo
 		{
 			return ENOTCONN;
 		}
-		else if(query_3270_terminal_status() == STATUS_CODE_BLANK)
+		else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 		{
 			return 0;
 		}
@@ -349,7 +349,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForStringAt(JNIEnv *env, jobject
 			// Disconnected, ret
 			rc = ENOTCONN;
 		}
-		else if(query_3270_terminal_status() == STATUS_CODE_BLANK)
+		else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 		{
 			// Screen contents are ok. Check.
 			if(last != query_screen_change_counter())
@@ -68,11 +68,13 @@ SDK_LDFLAGS=
 #---[ Sources ]----------------------------------------------------------------
 SOURCES =	version.c XtGlue.c actions.c ansi.c apl.c charset.c ctlr.c \
-		ft.c ft_cut.c ft_dft.c glue.c host.c icmd.c kybd.c \
+		ft.c ft_cut.c ft_dft.c glue.c host.c kybd.c \
 		print.c printer.c proxy.c resources.c rpq.c screen.c see.c \
 		sf.c tables.c telnet.c toggles.c trace_ds.c utf8.c util.c \
 		xio.c resolver.c log.c paste.c macros.c @LIB_SRCS@
+# icmd.c
+
 #---[ Rules ]------------------------------------------------------------------
 $(OBJDIR)/Debug/lib/$(MODULE_NAME)/%@OBJEXT@: %.c *.h $(SRCDIR)/include/*.h $(SRCDIR)/include/lib3270/*.h
@@ -1,482 +0,0 @@
-/* 
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
- * 
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- * 
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- * 
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- * 
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA, 02111-1307, USA
- * 
- * Este programa está nomeado como icmd.c e possui 482 linhas de código.
- * 
- * Contatos: 
- * 
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- * licinio@bb.com.br		(Licínio Luis Branco)
- * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
- * macmiranda@bb.com.br		(Marco Aurélio Caldas Miranda)
- *
- */
-
-/*
- *	icmd.c
- *		A curses-based 3270 Terminal Emulator
- *		Interactive commands
- */
-
-#include "globals.h"
-
-#include "icmdc.h"
-
-/* Support functions for interactive commands. */
-
-/*
- * Get a buffer full of input.
- * Trims white space in the result.
- * Returns NULL if there is an input error or if the input is 'quit'.
- */
-static char *
-get_input(char *buf, int size)
-{
-    	int sl;
-	char *s;
-
-	fflush(stdout);
-
-	/* Get the raw input. */
-    	if (fgets(buf, size, stdin) == NULL)
-	    	return NULL;
-
-	/* Trim trailing white space. */
-	sl = strlen(buf);
-	while (sl && isspace(buf[sl - 1]))
-	    	buf[--sl] = '\0';
-
-	/* Trim leading white space. */
-	s = buf;
-	while (*s && isspace(*s)) {
-	    	s++;
-		sl--;
-	}
-	if (s != buf)
-	    	memmove(buf, s, sl + 1);
-
-	/* Check for 'quit'. */
-	if (!strcasecmp(buf, "quit"))
-	    	return NULL;
-
-	return buf;
-}
-
-/* Get a yes, no or quit.  Returns 0 for no, 1 for yes, -1 for quit or error. */
-static int
-getyn(int defval)
-{
-    	char buf[64];
-
-	for (;;) {
-	    	if (get_input(buf, sizeof(buf)) == NULL)
-		    	return -1;
-		if (!buf[0])
-		    	return defval;
-		if (!strncasecmp(buf, "yes", strlen(buf)))
-		    	return 1;
-		else if (!strncasecmp(buf, "no", strlen(buf)))
-		    	return 0;
-		else {
-		    	printf("Please answer 'yes', 'no' or 'quit': ");
-		}
-	}
-}
-
-/*
- * Get a numeric value.  Returns the number for good input, -1 for quit or
- * error.
- */
-static int
-getnum(int defval)
-{
-    	char buf[64];
-	unsigned long u;
-	char *ptr;
-
-	for (;;) {
-	    	if (get_input(buf, sizeof(buf)) == NULL)
-		    	return -1;
-		if (!buf[0])
-		    	return defval;
-		u = strtoul(buf, &ptr, 10);
-		if (*ptr == '\0')
-		    	return (int)u;	
-		printf("Please enter a number or 'quit': ");
-	}
-}
-
-/*
- * Interactive file transfer command.
- * Called from Transfer_action.  Returns a new set of params.
- * Returns 0 for success, -1 for failure.
- */
-int
-interactive_transfer(String **params, Cardinal *num_params)
-{
-    	char inbuf[1024];
-	static String kw_ret[14];
-	static char kw[13][1024];
-	char hostfile[1024];
-	char localfile[1024];
-	int kw_ix = 0;
-	int receive = 1;
-	int tso = 1;
-	int ascii = 1;
-	int n;
-	enum { CR_REMOVE, CR_ADD, CR_KEEP } cr_mode = CR_REMOVE;
-	enum { FE_KEEP, FE_REPLACE, FE_APPEND } fe_mode = FE_KEEP;
-	enum { RF_NONE, RF_FIXED, RF_VARIABLE, RF_UNDEFINED } rf_mode = RF_NONE;
-	enum { AT_NONE, AT_TRACKS, AT_CYLINDERS, AT_AVBLOCK } at_mode = AT_NONE;
-	int lrecl = 0;
-	int primary_space = 0, secondary_space = 0;
-	int i;
-
-    	printf("\n\
-File Transfer\n\
-\n\
-Type 'quit' at any prompt to abort this dialog.\n\
-\n\
-Note: In order to initiate a file transfer, the 3270 cursor must be\n\
-positioned on an input field that can accept the IND$FILE command, i.e.,\n\
-at VM/CMS or TSO command prompt.\n");
-
-	printf("\nContinue? (y/n) [y] ");
-	if (getyn(1) <= 0)
-		return -1;
-
-	printf(" 'send' means copy a file from this workstation to the host.\n");
-	printf(" 'receive' means copy a file from the host to this workstation.\n");
-	for (;;) {
-	    	printf("Direction (send/receive) [receive]: ");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (!inbuf[0] || !strncasecmp(inbuf, "receive", strlen(inbuf)))
-		    	break;
-		if (!strncasecmp(inbuf, "send", strlen(inbuf))) {
-		    	strcpy(kw[kw_ix++], "Direction=send");
-			receive = 0;
-			break;
-		}
-	}
-
-	for (;;) {
-	    	printf("Name of source file on %s: ",
-			receive? "the host": "this workstation");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (inbuf[0]) {
-		    	if (receive) {
-				sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
-				strcpy(hostfile, inbuf);
-			} else {
-				sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
-				strcpy(localfile, inbuf);
-			}
-			break;
-		}
-	}
-
-	for (;;) {
-	    	printf("Name of destination file on %s: ",
-			receive? "this workstation": "the host");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (inbuf[0]) {
-		    	if (receive) {
-				sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
-				strcpy(localfile, inbuf);
-			} else {
-				sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
-				strcpy(hostfile, inbuf);
-			}
-			break;
-		}
-	}
-
-	for (;;) {
-	    	printf("Host type: (tso/vm) [tso] ");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (!inbuf[0] || !strncasecmp(inbuf, "tso", strlen(inbuf)))
-		    	break;
-		if (!strncasecmp(inbuf, "vm", strlen(inbuf))) {
-		    	strcpy(kw[kw_ix++], "Host=vm");
-			tso = 0;
-			break;
-		}
-	}
-
-	printf("\
- An 'ascii' transfer does automatic translation between EBCDIC on the host and\n\
-ASCII on the workstation.\n\
- A 'binary' transfer does no data translation.\n");
-
-	for (;;) {
-	    	printf("Transfer mode: (ascii/binary) [ascii] ");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (!inbuf[0] || !strncasecmp(inbuf, "ascii", strlen(inbuf)))
-		    	break;
-		if (!strncasecmp(inbuf, "binary", strlen(inbuf))) {
-		    	strcpy(kw[kw_ix++], "Mode=binary");
-			ascii = 0;
-			break;
-		}
-	}
-
-	if (ascii) {
-	    	printf("\
- For ASCII transfers, carriage return (CR) characters can be handled specially.\n\
-  'remove' means that CRs will be removed during the transfer.\n\
-  'add' means that CRs will be added to each record during the transfer.\n\
-  'keep' means that no special action is taken with CRs.\n");
-		for (;;) {
-			printf("CR handling: (remove/add/keep) [remove] ");
-			if (get_input(inbuf, sizeof(inbuf)) == NULL)
-				return -1;
-			if (!inbuf[0] || !strncasecmp(inbuf, "remove", strlen(inbuf)))
-				break;
-			if (!strncasecmp(inbuf, "add", strlen(inbuf))) {
-				strcpy(kw[kw_ix++], "Cr=add");
-				cr_mode = CR_ADD;
-				break;
-			}
-			if (!strncasecmp(inbuf, "keep", strlen(inbuf))) {
-				strcpy(kw[kw_ix++], "Cr=keep");
-				cr_mode = CR_KEEP;
-				break;
-			}
-		}
-	}
-
-	printf("\
- If the destination file exists, you can choose to keep it (and abort the\n\
- transfer), replace it, or append the source file to it.\n");
-	for (;;) {
-	    	printf("Action if destination file exists: (keep/replace/append) [keep] ");
-		if (get_input(inbuf, sizeof(inbuf)) == NULL)
-		    	return -1;
-		if (!inbuf[0] || !strncasecmp(inbuf, "keep", strlen(inbuf)))
-		    	break;
-		if (!strncasecmp(inbuf, "replace", strlen(inbuf))) {
-		    	strcpy(kw[kw_ix++], "Exist=replace");
-			fe_mode = FE_REPLACE;
-			break;
-		}
-		if (!strncasecmp(inbuf, "append", strlen(inbuf))) {
-		    	strcpy(kw[kw_ix++], "Exist=append");
-			fe_mode = FE_APPEND;
-			break;
-		}
-	}
-
-	if (!receive) {
-		for (;;) {
-			printf("[optional] Destinaton file record format (fixed/variable/undefined): ");
-			if (get_input(inbuf, sizeof(inbuf)) == NULL)
-				return -1;
-			if (!inbuf[0])
-				break;
-			if (!strncasecmp(inbuf, "fixed", strlen(inbuf))) {
-				sprintf(kw[kw_ix++], "Recfm=fixed");
-				rf_mode = RF_FIXED;
-				break;
-			}
-			if (!strncasecmp(inbuf, "variable", strlen(inbuf))) {
-				sprintf(kw[kw_ix++], "Recfm=variable");
-				rf_mode = RF_VARIABLE;
-				break;
-			}
-			if (!strncasecmp(inbuf, "undefined", strlen(inbuf))) {
-				sprintf(kw[kw_ix++], "Recfm=undefined");
-				rf_mode = RF_UNDEFINED;
-				break;
-			}
-		}
-
-		printf("[optional] Destination file logical record length: ");
-		n = getnum(0);
-		if (n < 0)
-		    	return -1;
-		if (n > 0) {
-		    	sprintf(kw[kw_ix++], "Lrecl=%d", n);
-			lrecl = n;
-		}
-
-		if (tso) {
-
-			printf("[optional] Destination file block size: ");
-			n = getnum(0);
-			if (n < 0)
-				return -1;
-			if (n > 0)
-				sprintf(kw[kw_ix++], "Blksize=%d", n);
-
-			for (;;) {
-				printf("[optional] Destination file allocation type (tracks/cylinders/avblock): ");
-				if (get_input(inbuf, sizeof(inbuf)) == NULL)
-					return -1;
-				if (!inbuf[0])
-					break;
-				if (!strncasecmp(inbuf, "tracks", strlen(inbuf))) {
-				    	strcpy(kw[kw_ix++], "Allocation=tracks");
-					at_mode = AT_TRACKS;
-					break;
-				}
-				if (!strncasecmp(inbuf, "cylinders", strlen(inbuf))) {
-				    	strcpy(kw[kw_ix++], "Allocation=cylinders");
-					at_mode = AT_CYLINDERS;
-					break;
-				}
-				if (!strncasecmp(inbuf, "avblock", strlen(inbuf))) {
-				    	strcpy(kw[kw_ix++], "Allocation=avblock");
-					at_mode = AT_AVBLOCK;
-					break;
-				}
-			}
-
-			printf("[optional] Destination file primary space: ");
-			n = getnum(0);
-			if (n < 0)
-				return -1;
-			if (n > 0) {
-				sprintf(kw[kw_ix++], "PrimarySpace=%d", n);
-				primary_space = n;
-			}
-
-			printf("[optional] Destination file secondary space: ");
-			n = getnum(0);
-			if (n < 0)
-				return -1;
-			if (n > 0) {
-				sprintf(kw[kw_ix++], "SecondarySpace=%d", n);
-				secondary_space = n;
-			}
-
-		}
-
-	}
-
-	printf("\nFile Transfer Summary:\n");
-	if (receive) {
-	    	printf(" Source file on Host: %s\n", hostfile);
-	    	printf(" Destination file on Workstation: %s\n", localfile);
-	} else {
-	    	printf(" Source file on workstation: %s\n", localfile);
-	    	printf(" Destination file on Host: %s\n", hostfile);
-	}
-	printf(" Transfer mode: %s", ascii? "ASCII": "Binary");
-	if (ascii) {
-		switch (cr_mode) {
-		case CR_REMOVE:
-		    	printf(", remove CRs\n");
-			break;
-		case CR_ADD:
-		    	printf(", add CRs\n");
-			break;
-		case CR_KEEP:
-			break;
-		}
-	}
-	printf(" If destination file exists, ");
-	switch (fe_mode) {
-	case FE_KEEP:
-	    	printf("abort the transfer\n");
-		break;
-	case FE_REPLACE:
-	    	printf("replace it\n");
-		break;
-	case FE_APPEND:
-	    	printf("append to it\n");
-		break;
-	}
-	if (!receive &&
-		(rf_mode != RF_NONE || lrecl ||
-		 primary_space || secondary_space)) {
-
-	    	printf(" Destination file:\n");
-
-	    	switch (rf_mode) {
-		case RF_NONE:
-		    	break;
-	        case RF_FIXED:
-			printf("  Record format: fixed\n");
-		    	break;
-		case RF_VARIABLE:
-			printf("  Record format: variable\n");
-		    	break;
-		case RF_UNDEFINED:
-			printf("  Record format: undefined\n");
-		    	break;
-		}
-		if (lrecl)
-			printf("  Logical record length: %d\n",
-				lrecl);
-		if (primary_space || secondary_space) {
-		    	printf("  Allocation:");
-			if (primary_space)
-				printf(" primary %d", primary_space);
-			if (secondary_space)
-				printf(" secondary %d", secondary_space);
-		    	switch (at_mode) {
-			case AT_NONE:
-				break;
-			case AT_TRACKS:
-				printf(" tracks");
-				break;
-			case AT_CYLINDERS:
-				printf(" cylinders");
-				break;
-			case AT_AVBLOCK:
-				printf(" avblock");
-				break;
-			}
-			printf("\n");
-		}
-	}
-
-	printf("\nContinue? (y/n) [y] ");
-	if (getyn(1) <= 0)
-		return -1;
-
-	/* Let it go. */
-#if defined(FT_DEBUG) /*[*/
-	printf("transfer");
-#endif /*]*/
-	for (i = 0; i < kw_ix; i++) {
-	    	kw_ret[i] = (String)kw[i];
-#if defined(FT_DEBUG) /*[*/
-		if (strchr(kw_ret[i], ' ') != NULL)
-			printf(" \"%s\"", kw_ret[i]);
-		else
-			printf(" %s", kw_ret[i]);
-#endif /*]*/
-	}
-#if defined(FT_DEBUG) /*[*/
-	printf("\n");
-	fflush(stdout);
-#endif /*]*/
-	kw_ret[i] = NULL;
-	*params = kw_ret;
-	*num_params = kw_ix;
-	return 0;
-}
@@ -0,0 +1,482 @@
+/* 
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
+ * 
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ * 
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ * 
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ * 
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA, 02111-1307, USA
+ * 
+ * Este programa está nomeado como icmd.c e possui 482 linhas de código.
+ * 
+ * Contatos: 
+ * 
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ * licinio@bb.com.br		(Licínio Luis Branco)
+ * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
+ * macmiranda@bb.com.br		(Marco Aurélio Caldas Miranda)
+ *
+ */
+
+/*
+ *	icmd.c
+ *		A curses-based 3270 Terminal Emulator
+ *		Interactive commands
+ */
+
+#include "globals.h"
+
+#include "icmdc.h"
+
+/* Support functions for interactive commands. */
+
+/*
+ * Get a buffer full of input.
+ * Trims white space in the result.
+ * Returns NULL if there is an input error or if the input is 'quit'.
+ */
+static char *
+get_input(char *buf, int size)
+{
+    	int sl;
+	char *s;
+
+	fflush(stdout);
+
+	/* Get the raw input. */
+    	if (fgets(buf, size, stdin) == NULL)
+	    	return NULL;
+
+	/* Trim trailing white space. */
+	sl = strlen(buf);
+	while (sl && isspace(buf[sl - 1]))
+	    	buf[--sl] = '\0';
+
+	/* Trim leading white space. */
+	s = buf;
+	while (*s && isspace(*s)) {
+	    	s++;
+		sl--;
+	}
+	if (s != buf)
+	    	memmove(buf, s, sl + 1);
+
+	/* Check for 'quit'. */
+	if (!strcasecmp(buf, "quit"))
+	    	return NULL;
+
+	return buf;
+}
+
+/* Get a yes, no or quit.  Returns 0 for no, 1 for yes, -1 for quit or error. */
+static int
+getyn(int defval)
+{
+    	char buf[64];
+
+	for (;;) {
+	    	if (get_input(buf, sizeof(buf)) == NULL)
+		    	return -1;
+		if (!buf[0])
+		    	return defval;
+		if (!strncasecmp(buf, "yes", strlen(buf)))
+		    	return 1;
+		else if (!strncasecmp(buf, "no", strlen(buf)))
+		    	return 0;
+		else {
+		    	printf("Please answer 'yes', 'no' or 'quit': ");
+		}
+	}
+}
+
+/*
+ * Get a numeric value.  Returns the number for good input, -1 for quit or
+ * error.
+ */
+static int
+getnum(int defval)
+{
+    	char buf[64];
+	unsigned long u;
+	char *ptr;
+
+	for (;;) {
+	    	if (get_input(buf, sizeof(buf)) == NULL)
+		    	return -1;
+		if (!buf[0])
+		    	return defval;
+		u = strtoul(buf, &ptr, 10);
+		if (*ptr == '\0')
+		    	return (int)u;	
+		printf("Please enter a number or 'quit': ");
+	}
+}
+
+/*
+ * Interactive file transfer command.
+ * Called from Transfer_action.  Returns a new set of params.
+ * Returns 0 for success, -1 for failure.
+ */
+int
+interactive_transfer(String **params, Cardinal *num_params)
+{
+    	char inbuf[1024];
+	static String kw_ret[14];
+	static char kw[13][1024];
+	char hostfile[1024];
+	char localfile[1024];
+	int kw_ix = 0;
+	int receive = 1;
+	int tso = 1;
+	int ascii = 1;
+	int n;
+	enum { CR_REMOVE, CR_ADD, CR_KEEP } cr_mode = CR_REMOVE;
+	enum { FE_KEEP, FE_REPLACE, FE_APPEND } fe_mode = FE_KEEP;
+	enum { RF_NONE, RF_FIXED, RF_VARIABLE, RF_UNDEFINED } rf_mode = RF_NONE;
+	enum { AT_NONE, AT_TRACKS, AT_CYLINDERS, AT_AVBLOCK } at_mode = AT_NONE;
+	int lrecl = 0;
+	int primary_space = 0, secondary_space = 0;
+	int i;
+
+    	printf("\n\
+File Transfer\n\
+\n\
+Type 'quit' at any prompt to abort this dialog.\n\
+\n\
+Note: In order to initiate a file transfer, the 3270 cursor must be\n\
+positioned on an input field that can accept the IND$FILE command, i.e.,\n\
+at VM/CMS or TSO command prompt.\n");
+
+	printf("\nContinue? (y/n) [y] ");
+	if (getyn(1) <= 0)
+		return -1;
+
+	printf(" 'send' means copy a file from this workstation to the host.\n");
+	printf(" 'receive' means copy a file from the host to this workstation.\n");
+	for (;;) {
+	    	printf("Direction (send/receive) [receive]: ");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (!inbuf[0] || !strncasecmp(inbuf, "receive", strlen(inbuf)))
+		    	break;
+		if (!strncasecmp(inbuf, "send", strlen(inbuf))) {
+		    	strcpy(kw[kw_ix++], "Direction=send");
+			receive = 0;
+			break;
+		}
+	}
+
+	for (;;) {
+	    	printf("Name of source file on %s: ",
+			receive? "the host": "this workstation");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (inbuf[0]) {
+		    	if (receive) {
+				sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
+				strcpy(hostfile, inbuf);
+			} else {
+				sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
+				strcpy(localfile, inbuf);
+			}
+			break;
+		}
+	}
+
+	for (;;) {
+	    	printf("Name of destination file on %s: ",
+			receive? "this workstation": "the host");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (inbuf[0]) {
+		    	if (receive) {
+				sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
+				strcpy(localfile, inbuf);
+			} else {
+				sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
+				strcpy(hostfile, inbuf);
+			}
+			break;
+		}
+	}
+
+	for (;;) {
+	    	printf("Host type: (tso/vm) [tso] ");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (!inbuf[0] || !strncasecmp(inbuf, "tso", strlen(inbuf)))
+		    	break;
+		if (!strncasecmp(inbuf, "vm", strlen(inbuf))) {
+		    	strcpy(kw[kw_ix++], "Host=vm");
+			tso = 0;
+			break;
+		}
+	}
+
+	printf("\
+ An 'ascii' transfer does automatic translation between EBCDIC on the host and\n\
+ASCII on the workstation.\n\
+ A 'binary' transfer does no data translation.\n");
+
+	for (;;) {
+	    	printf("Transfer mode: (ascii/binary) [ascii] ");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (!inbuf[0] || !strncasecmp(inbuf, "ascii", strlen(inbuf)))
+		    	break;
+		if (!strncasecmp(inbuf, "binary", strlen(inbuf))) {
+		    	strcpy(kw[kw_ix++], "Mode=binary");
+			ascii = 0;
+			break;
+		}
+	}
+
+	if (ascii) {
+	    	printf("\
+ For ASCII transfers, carriage return (CR) characters can be handled specially.\n\
+  'remove' means that CRs will be removed during the transfer.\n\
+  'add' means that CRs will be added to each record during the transfer.\n\
+  'keep' means that no special action is taken with CRs.\n");
+		for (;;) {
+			printf("CR handling: (remove/add/keep) [remove] ");
+			if (get_input(inbuf, sizeof(inbuf)) == NULL)
+				return -1;
+			if (!inbuf[0] || !strncasecmp(inbuf, "remove", strlen(inbuf)))
+				break;
+			if (!strncasecmp(inbuf, "add", strlen(inbuf))) {
+				strcpy(kw[kw_ix++], "Cr=add");
+				cr_mode = CR_ADD;
+				break;
+			}
+			if (!strncasecmp(inbuf, "keep", strlen(inbuf))) {
+				strcpy(kw[kw_ix++], "Cr=keep");
+				cr_mode = CR_KEEP;
+				break;
+			}
+		}
+	}
+
+	printf("\
+ If the destination file exists, you can choose to keep it (and abort the\n\
+ transfer), replace it, or append the source file to it.\n");
+	for (;;) {
+	    	printf("Action if destination file exists: (keep/replace/append) [keep] ");
+		if (get_input(inbuf, sizeof(inbuf)) == NULL)
+		    	return -1;
+		if (!inbuf[0] || !strncasecmp(inbuf, "keep", strlen(inbuf)))
+		    	break;
+		if (!strncasecmp(inbuf, "replace", strlen(inbuf))) {
+		    	strcpy(kw[kw_ix++], "Exist=replace");
+			fe_mode = FE_REPLACE;
+			break;
+		}
+		if (!strncasecmp(inbuf, "append", strlen(inbuf))) {
+		    	strcpy(kw[kw_ix++], "Exist=append");
+			fe_mode = FE_APPEND;
+			break;
+		}
+	}
+
+	if (!receive) {
+		for (;;) {
+			printf("[optional] Destinaton file record format (fixed/variable/undefined): ");
+			if (get_input(inbuf, sizeof(inbuf)) == NULL)
+				return -1;
+			if (!inbuf[0])
+				break;
+			if (!strncasecmp(inbuf, "fixed", strlen(inbuf))) {
+				sprintf(kw[kw_ix++], "Recfm=fixed");
+				rf_mode = RF_FIXED;
+				break;
+			}
+			if (!strncasecmp(inbuf, "variable", strlen(inbuf))) {
+				sprintf(kw[kw_ix++], "Recfm=variable");
+				rf_mode = RF_VARIABLE;
+				break;
+			}
+			if (!strncasecmp(inbuf, "undefined", strlen(inbuf))) {
+				sprintf(kw[kw_ix++], "Recfm=undefined");
+				rf_mode = RF_UNDEFINED;
+				break;
+			}
+		}
+
+		printf("[optional] Destination file logical record length: ");
+		n = getnum(0);
+		if (n < 0)
+		    	return -1;
+		if (n > 0) {
+		    	sprintf(kw[kw_ix++], "Lrecl=%d", n);
+			lrecl = n;
+		}
+
+		if (tso) {
+
+			printf("[optional] Destination file block size: ");
+			n = getnum(0);
+			if (n < 0)
+				return -1;
+			if (n > 0)
+				sprintf(kw[kw_ix++], "Blksize=%d", n);
+
+			for (;;) {
+				printf("[optional] Destination file allocation type (tracks/cylinders/avblock): ");
+				if (get_input(inbuf, sizeof(inbuf)) == NULL)
+					return -1;
+				if (!inbuf[0])
+					break;
+				if (!strncasecmp(inbuf, "tracks", strlen(inbuf))) {
+				    	strcpy(kw[kw_ix++], "Allocation=tracks");
+					at_mode = AT_TRACKS;
+					break;
+				}
+				if (!strncasecmp(inbuf, "cylinders", strlen(inbuf))) {
+				    	strcpy(kw[kw_ix++], "Allocation=cylinders");
+					at_mode = AT_CYLINDERS;
+					break;
+				}
+				if (!strncasecmp(inbuf, "avblock", strlen(inbuf))) {
+				    	strcpy(kw[kw_ix++], "Allocation=avblock");
+					at_mode = AT_AVBLOCK;
+					break;
+				}
+			}
+
+			printf("[optional] Destination file primary space: ");
+			n = getnum(0);
+			if (n < 0)
+				return -1;
+			if (n > 0) {
+				sprintf(kw[kw_ix++], "PrimarySpace=%d", n);
+				primary_space = n;
+			}
+
+			printf("[optional] Destination file secondary space: ");
+			n = getnum(0);
+			if (n < 0)
+				return -1;
+			if (n > 0) {
+				sprintf(kw[kw_ix++], "SecondarySpace=%d", n);
+				secondary_space = n;
+			}
+
+		}
+
+	}
+
+	printf("\nFile Transfer Summary:\n");
+	if (receive) {
+	    	printf(" Source file on Host: %s\n", hostfile);
+	    	printf(" Destination file on Workstation: %s\n", localfile);
+	} else {
+	    	printf(" Source file on workstation: %s\n", localfile);
+	    	printf(" Destination file on Host: %s\n", hostfile);
+	}
+	printf(" Transfer mode: %s", ascii? "ASCII": "Binary");
+	if (ascii) {
+		switch (cr_mode) {
+		case CR_REMOVE:
+		    	printf(", remove CRs\n");
+			break;
+		case CR_ADD:
+		    	printf(", add CRs\n");
+			break;
+		case CR_KEEP:
+			break;
+		}
+	}
+	printf(" If destination file exists, ");
+	switch (fe_mode) {
+	case FE_KEEP:
+	    	printf("abort the transfer\n");
+		break;
+	case FE_REPLACE:
+	    	printf("replace it\n");
+		break;
+	case FE_APPEND:
+	    	printf("append to it\n");
+		break;
+	}
+	if (!receive &&
+		(rf_mode != RF_NONE || lrecl ||
+		 primary_space || secondary_space)) {
+
+	    	printf(" Destination file:\n");
+
+	    	switch (rf_mode) {
+		case RF_NONE:
+		    	break;
+	        case RF_FIXED:
+			printf("  Record format: fixed\n");
+		    	break;
+		case RF_VARIABLE:
+			printf("  Record format: variable\n");
+		    	break;
+		case RF_UNDEFINED:
+			printf("  Record format: undefined\n");
+		    	break;
+		}
+		if (lrecl)
+			printf("  Logical record length: %d\n",
+				lrecl);
+		if (primary_space || secondary_space) {
+		    	printf("  Allocation:");
+			if (primary_space)
+				printf(" primary %d", primary_space);
+			if (secondary_space)
+				printf(" secondary %d", secondary_space);
+		    	switch (at_mode) {
+			case AT_NONE:
+				break;
+			case AT_TRACKS:
+				printf(" tracks");
+				break;
+			case AT_CYLINDERS:
+				printf(" cylinders");
+				break;
+			case AT_AVBLOCK:
+				printf(" avblock");
+				break;
+			}
+			printf("\n");
+		}
+	}
+
+	printf("\nContinue? (y/n) [y] ");
+	if (getyn(1) <= 0)
+		return -1;
+
+	/* Let it go. */
+#if defined(FT_DEBUG) /*[*/
+	printf("transfer");
+#endif /*]*/
+	for (i = 0; i < kw_ix; i++) {
+	    	kw_ret[i] = (String)kw[i];
+#if defined(FT_DEBUG) /*[*/
+		if (strchr(kw_ret[i], ' ') != NULL)
+			printf(" \"%s\"", kw_ret[i]);
+		else
+			printf(" %s", kw_ret[i]);
+#endif /*]*/
+	}
+#if defined(FT_DEBUG) /*[*/
+	printf("\n");
+	fflush(stdout);
+#endif /*]*/
+	kw_ret[i] = NULL;
+	*params = kw_ret;
+	*num_params = kw_ix;
+	return 0;
+}
@@ -65,7 +65,7 @@
 	Trace("Status: %d",query_3270_terminal_status());
- 	if(query_3270_terminal_status() != STATUS_CODE_BLANK)
+ 	if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
 		return RetValue(Retstr,EINVAL);
 	switch(Argc)
@@ -100,7 +100,7 @@
 	Trace("Status: %d",query_3270_terminal_status());
-	return RetValue(Retstr,query_3270_terminal_status() == STATUS_CODE_BLANK ? 0 : EINVAL);
+	return RetValue(Retstr,query_3270_terminal_status() == LIB3270_STATUS_BLANK ? 0 : EINVAL);
  }
  RexxReturnCode REXXENTRY rx3270FindFieldAttribute(PSZ Name, LONG Argc, RXSTRING Argv[],PSZ Queuename, PRXSTRING Retstr)
@@ -307,7 +307,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
 		{
 			rc = ECANCELED;
 		}
-		else if(query_3270_terminal_status() == STATUS_CODE_BLANK)
+		else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 		{
 			screen_read(buffer,start,sz);
 			*(buffer+sz) = 0;
@@ -445,7 +445,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
 	if(!PCONNECTED)
 		rc = ENOTCONN;
-	else if(query_3270_terminal_status() != STATUS_CODE_BLANK)
+	else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
 		rc = EINVAL;
 	else
 		rc = lib3270_enter();
@@ -477,7 +477,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
 	if(!PCONNECTED)
 		rc = ENOTCONN;
-	else if(query_3270_terminal_status() != STATUS_CODE_BLANK)
+	else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
 		rc = EINVAL;
 	else
 		rc = lib3270_pfkey(atoi(Argv[0].strptr));
@@ -649,7 +649,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
 		{
 			rc = ECANCELED;
 		}
-		else if(query_3270_terminal_status() == STATUS_CODE_BLANK)
+		else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 		{
 			screen_read(buffer,pos,sz);
 			*(buffer+(sz+1)) = 0;
@@ -685,7 +685,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg
     if(Argc)
 		return RXFUNC_BADCALL;
-	if(!CONNECTED || query_3270_terminal_status() != STATUS_CODE_BLANK)
+	if(!CONNECTED || query_3270_terminal_status() != LIB3270_STATUS_BLANK)
 	{
 		ReturnValue(0);
 	}
@@ -735,7 +735,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg
             rc = ENOTCONN;
 		else if(IsHalted())
 			rc = ECANCELED;
-		else if(query_3270_terminal_status() == STATUS_CODE_BLANK)
+		else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
 			rc = 0;
 	}
	@@ -256,7 +256,6 @@		@@ -256,7 +256,6 @@
256	char ssl_host;	256	char ssl_host;
257	char ever_3270;	257	char ever_3270;
258		258
259	-
260	// Widget info	259	// Widget info
261	void * widget;	260	void * widget;
262		261
	@@ -66,7 +66,7 @@		@@ -66,7 +66,7 @@
66		66
67	#define CHECK_FOR_TERMINAL_STATUS if(!PCONNECTED) \	67	#define CHECK_FOR_TERMINAL_STATUS if(!PCONNECTED) \
68	return ENOTCONN; \	68	return ENOTCONN; \
69	- else if(query_3270_terminal_status() != STATUS_CODE_BLANK) \	69	+ else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK) \
70	return EBUSY;	70	return EBUSY;
71		71
72		72
	@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_Connect(JNIEnv *env, jobject obj, js		@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_Connect(JNIEnv *env, jobject obj, js
145		145
146	while(time(0) < tm)	146	while(time(0) < tm)
147	{	147	{
148	- if( (CONNECTED) && query_3270_terminal_status() == STATUS_CODE_BLANK)	148	+ if( (CONNECTED) && query_3270_terminal_status() == LIB3270_STATUS_BLANK)
149	return 0;	149	return 0;
150		150
151	RunPendingEvents(1);	151	RunPendingEvents(1);
	@@ -177,7 +177,7 @@ JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isConnected(JNIEnv *env, jobject		@@ -177,7 +177,7 @@ JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isConnected(JNIEnv *env, jobject
177		177
178	JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isTerminalReady(JNIEnv *env, jobject obj)	178	JNIEXPORT jboolean JNICALL Java_pw3270_terminal_isTerminalReady(JNIEnv *env, jobject obj)
179	{	179	{
180	- if(!CONNECTED \|\| query_3270_terminal_status() != STATUS_CODE_BLANK)	180	+ if(!CONNECTED \|\| query_3270_terminal_status() != LIB3270_STATUS_BLANK)
181	return JNI_FALSE;	181	return JNI_FALSE;
182	return JNI_TRUE;	182	return JNI_TRUE;
183	}	183	}
	@@ -312,7 +312,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForTerminalReady(JNIEnv *env, jo		@@ -312,7 +312,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForTerminalReady(JNIEnv *env, jo
312	{	312	{
313	return ENOTCONN;	313	return ENOTCONN;
314	}	314	}
315	- else if(query_3270_terminal_status() == STATUS_CODE_BLANK)	315	+ else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
316	{	316	{
317	return 0;	317	return 0;
318	}	318	}
	@@ -349,7 +349,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForStringAt(JNIEnv *env, jobject		@@ -349,7 +349,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForStringAt(JNIEnv *env, jobject
349	// Disconnected, ret	349	// Disconnected, ret
350	rc = ENOTCONN;	350	rc = ENOTCONN;
351	}	351	}
352	- else if(query_3270_terminal_status() == STATUS_CODE_BLANK)	352	+ else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
353	{	353	{
354	// Screen contents are ok. Check.	354	// Screen contents are ok. Check.
355	if(last != query_screen_change_counter())	355	if(last != query_screen_change_counter())
	@@ -1,482 +0,0 @@	@@ -1,482 +0,0 @@
1	-/*
2	- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
3	- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4	- * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
5	- *
6	- * Copyright (C) <2008> <Banco do Brasil S.A.>
7	- *
8	- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
9	- * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
10	- * Free Software Foundation.
11	- *
12	- * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
13	- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
14	- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
15	- * obter mais detalhes.
16	- *
17	- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
18	- * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
19	- * Place, Suite 330, Boston, MA, 02111-1307, USA
20	- *
21	- * Este programa está nomeado como icmd.c e possui 482 linhas de código.
22	- *
23	- * Contatos:
24	- *
25	- * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26	- * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
27	- * licinio@bb.com.br (Licínio Luis Branco)
28	- * kraucer@bb.com.br (Kraucer Fernandes Mazuco)
29	- * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda)
30	- *
31	- */
32	-
33	-/*
34	- * icmd.c
35	- * A curses-based 3270 Terminal Emulator
36	- * Interactive commands
37	- */
38	-
39	-#include "globals.h"
40	-
41	-#include "icmdc.h"
42	-
43	-/* Support functions for interactive commands. */
44	-
45	-/*
46	- * Get a buffer full of input.
47	- * Trims white space in the result.
48	- * Returns NULL if there is an input error or if the input is 'quit'.
49	- */
50	-static char *
51	-get_input(char *buf, int size)
52	-{
53	- int sl;
54	- char *s;
55	-
56	- fflush(stdout);
57	-
58	- /* Get the raw input. */
59	- if (fgets(buf, size, stdin) == NULL)
60	- return NULL;
61	-
62	- /* Trim trailing white space. */
63	- sl = strlen(buf);
64	- while (sl && isspace(buf[sl - 1]))
65	- buf[--sl] = '\0';
66	-
67	- /* Trim leading white space. */
68	- s = buf;
69	- while (s && isspace(s)) {
70	- s++;
71	- sl--;
72	- }
73	- if (s != buf)
74	- memmove(buf, s, sl + 1);
75	-
76	- /* Check for 'quit'. */
77	- if (!strcasecmp(buf, "quit"))
78	- return NULL;
79	-
80	- return buf;
81	-}
82	-
83	-/* Get a yes, no or quit. Returns 0 for no, 1 for yes, -1 for quit or error. */
84	-static int
85	-getyn(int defval)
86	-{
87	- char buf[64];
88	-
89	- for (;;) {
90	- if (get_input(buf, sizeof(buf)) == NULL)
91	- return -1;
92	- if (!buf[0])
93	- return defval;
94	- if (!strncasecmp(buf, "yes", strlen(buf)))
95	- return 1;
96	- else if (!strncasecmp(buf, "no", strlen(buf)))
97	- return 0;
98	- else {
99	- printf("Please answer 'yes', 'no' or 'quit': ");
100	- }
101	- }
102	-}
103	-
104	-/*
105	- * Get a numeric value. Returns the number for good input, -1 for quit or
106	- * error.
107	- */
108	-static int
109	-getnum(int defval)
110	-{
111	- char buf[64];
112	- unsigned long u;
113	- char *ptr;
114	-
115	- for (;;) {
116	- if (get_input(buf, sizeof(buf)) == NULL)
117	- return -1;
118	- if (!buf[0])
119	- return defval;
120	- u = strtoul(buf, &ptr, 10);
121	- if (*ptr == '\0')
122	- return (int)u;
123	- printf("Please enter a number or 'quit': ");
124	- }
125	-}
126	-
127	-/*
128	- * Interactive file transfer command.
129	- * Called from Transfer_action. Returns a new set of params.
130	- * Returns 0 for success, -1 for failure.
131	- */
132	-int
133	-interactive_transfer(String *params, Cardinal num_params)
134	-{
135	- char inbuf[1024];
136	- static String kw_ret[14];
137	- static char kw[13][1024];
138	- char hostfile[1024];
139	- char localfile[1024];
140	- int kw_ix = 0;
141	- int receive = 1;
142	- int tso = 1;
143	- int ascii = 1;
144	- int n;
145	- enum { CR_REMOVE, CR_ADD, CR_KEEP } cr_mode = CR_REMOVE;
146	- enum { FE_KEEP, FE_REPLACE, FE_APPEND } fe_mode = FE_KEEP;
147	- enum { RF_NONE, RF_FIXED, RF_VARIABLE, RF_UNDEFINED } rf_mode = RF_NONE;
148	- enum { AT_NONE, AT_TRACKS, AT_CYLINDERS, AT_AVBLOCK } at_mode = AT_NONE;
149	- int lrecl = 0;
150	- int primary_space = 0, secondary_space = 0;
151	- int i;
152	-
153	- printf("\n\
154	-File Transfer\n\
155	-\n\
156	-Type 'quit' at any prompt to abort this dialog.\n\
157	-\n\
158	-Note: In order to initiate a file transfer, the 3270 cursor must be\n\
159	-positioned on an input field that can accept the IND$FILE command, i.e.,\n\
160	-at VM/CMS or TSO command prompt.\n");
161	-
162	- printf("\nContinue? (y/n) [y] ");
163	- if (getyn(1) <= 0)
164	- return -1;
165	-
166	- printf(" 'send' means copy a file from this workstation to the host.\n");
167	- printf(" 'receive' means copy a file from the host to this workstation.\n");
168	- for (;;) {
169	- printf("Direction (send/receive) [receive]: ");
170	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
171	- return -1;
172	- if (!inbuf[0] \|\| !strncasecmp(inbuf, "receive", strlen(inbuf)))
173	- break;
174	- if (!strncasecmp(inbuf, "send", strlen(inbuf))) {
175	- strcpy(kw[kw_ix++], "Direction=send");
176	- receive = 0;
177	- break;
178	- }
179	- }
180	-
181	- for (;;) {
182	- printf("Name of source file on %s: ",
183	- receive? "the host": "this workstation");
184	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
185	- return -1;
186	- if (inbuf[0]) {
187	- if (receive) {
188	- sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
189	- strcpy(hostfile, inbuf);
190	- } else {
191	- sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
192	- strcpy(localfile, inbuf);
193	- }
194	- break;
195	- }
196	- }
197	-
198	- for (;;) {
199	- printf("Name of destination file on %s: ",
200	- receive? "this workstation": "the host");
201	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
202	- return -1;
203	- if (inbuf[0]) {
204	- if (receive) {
205	- sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
206	- strcpy(localfile, inbuf);
207	- } else {
208	- sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
209	- strcpy(hostfile, inbuf);
210	- }
211	- break;
212	- }
213	- }
214	-
215	- for (;;) {
216	- printf("Host type: (tso/vm) [tso] ");
217	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
218	- return -1;
219	- if (!inbuf[0] \|\| !strncasecmp(inbuf, "tso", strlen(inbuf)))
220	- break;
221	- if (!strncasecmp(inbuf, "vm", strlen(inbuf))) {
222	- strcpy(kw[kw_ix++], "Host=vm");
223	- tso = 0;
224	- break;
225	- }
226	- }
227	-
228	- printf("\
229	- An 'ascii' transfer does automatic translation between EBCDIC on the host and\n\
230	-ASCII on the workstation.\n\
231	- A 'binary' transfer does no data translation.\n");
232	-
233	- for (;;) {
234	- printf("Transfer mode: (ascii/binary) [ascii] ");
235	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
236	- return -1;
237	- if (!inbuf[0] \|\| !strncasecmp(inbuf, "ascii", strlen(inbuf)))
238	- break;
239	- if (!strncasecmp(inbuf, "binary", strlen(inbuf))) {
240	- strcpy(kw[kw_ix++], "Mode=binary");
241	- ascii = 0;
242	- break;
243	- }
244	- }
245	-
246	- if (ascii) {
247	- printf("\
248	- For ASCII transfers, carriage return (CR) characters can be handled specially.\n\
249	- 'remove' means that CRs will be removed during the transfer.\n\
250	- 'add' means that CRs will be added to each record during the transfer.\n\
251	- 'keep' means that no special action is taken with CRs.\n");
252	- for (;;) {
253	- printf("CR handling: (remove/add/keep) [remove] ");
254	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
255	- return -1;
256	- if (!inbuf[0] \|\| !strncasecmp(inbuf, "remove", strlen(inbuf)))
257	- break;
258	- if (!strncasecmp(inbuf, "add", strlen(inbuf))) {
259	- strcpy(kw[kw_ix++], "Cr=add");
260	- cr_mode = CR_ADD;
261	- break;
262	- }
263	- if (!strncasecmp(inbuf, "keep", strlen(inbuf))) {
264	- strcpy(kw[kw_ix++], "Cr=keep");
265	- cr_mode = CR_KEEP;
266	- break;
267	- }
268	- }
269	- }
270	-
271	- printf("\
272	- If the destination file exists, you can choose to keep it (and abort the\n\
273	- transfer), replace it, or append the source file to it.\n");
274	- for (;;) {
275	- printf("Action if destination file exists: (keep/replace/append) [keep] ");
276	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
277	- return -1;
278	- if (!inbuf[0] \|\| !strncasecmp(inbuf, "keep", strlen(inbuf)))
279	- break;
280	- if (!strncasecmp(inbuf, "replace", strlen(inbuf))) {
281	- strcpy(kw[kw_ix++], "Exist=replace");
282	- fe_mode = FE_REPLACE;
283	- break;
284	- }
285	- if (!strncasecmp(inbuf, "append", strlen(inbuf))) {
286	- strcpy(kw[kw_ix++], "Exist=append");
287	- fe_mode = FE_APPEND;
288	- break;
289	- }
290	- }
291	-
292	- if (!receive) {
293	- for (;;) {
294	- printf("[optional] Destinaton file record format (fixed/variable/undefined): ");
295	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
296	- return -1;
297	- if (!inbuf[0])
298	- break;
299	- if (!strncasecmp(inbuf, "fixed", strlen(inbuf))) {
300	- sprintf(kw[kw_ix++], "Recfm=fixed");
301	- rf_mode = RF_FIXED;
302	- break;
303	- }
304	- if (!strncasecmp(inbuf, "variable", strlen(inbuf))) {
305	- sprintf(kw[kw_ix++], "Recfm=variable");
306	- rf_mode = RF_VARIABLE;
307	- break;
308	- }
309	- if (!strncasecmp(inbuf, "undefined", strlen(inbuf))) {
310	- sprintf(kw[kw_ix++], "Recfm=undefined");
311	- rf_mode = RF_UNDEFINED;
312	- break;
313	- }
314	- }
315	-
316	- printf("[optional] Destination file logical record length: ");
317	- n = getnum(0);
318	- if (n < 0)
319	- return -1;
320	- if (n > 0) {
321	- sprintf(kw[kw_ix++], "Lrecl=%d", n);
322	- lrecl = n;
323	- }
324	-
325	- if (tso) {
326	-
327	- printf("[optional] Destination file block size: ");
328	- n = getnum(0);
329	- if (n < 0)
330	- return -1;
331	- if (n > 0)
332	- sprintf(kw[kw_ix++], "Blksize=%d", n);
333	-
334	- for (;;) {
335	- printf("[optional] Destination file allocation type (tracks/cylinders/avblock): ");
336	- if (get_input(inbuf, sizeof(inbuf)) == NULL)
337	- return -1;
338	- if (!inbuf[0])
339	- break;
340	- if (!strncasecmp(inbuf, "tracks", strlen(inbuf))) {
341	- strcpy(kw[kw_ix++], "Allocation=tracks");
342	- at_mode = AT_TRACKS;
343	- break;
344	- }
345	- if (!strncasecmp(inbuf, "cylinders", strlen(inbuf))) {
346	- strcpy(kw[kw_ix++], "Allocation=cylinders");
347	- at_mode = AT_CYLINDERS;
348	- break;
349	- }
350	- if (!strncasecmp(inbuf, "avblock", strlen(inbuf))) {
351	- strcpy(kw[kw_ix++], "Allocation=avblock");
352	- at_mode = AT_AVBLOCK;
353	- break;
354	- }
355	- }
356	-
357	- printf("[optional] Destination file primary space: ");
358	- n = getnum(0);
359	- if (n < 0)
360	- return -1;
361	- if (n > 0) {
362	- sprintf(kw[kw_ix++], "PrimarySpace=%d", n);
363	- primary_space = n;
364	- }
365	-
366	- printf("[optional] Destination file secondary space: ");
367	- n = getnum(0);
368	- if (n < 0)
369	- return -1;
370	- if (n > 0) {
371	- sprintf(kw[kw_ix++], "SecondarySpace=%d", n);
372	- secondary_space = n;
373	- }
374	-
375	- }
376	-
377	- }
378	-
379	- printf("\nFile Transfer Summary:\n");
380	- if (receive) {
381	- printf(" Source file on Host: %s\n", hostfile);
382	- printf(" Destination file on Workstation: %s\n", localfile);
383	- } else {
384	- printf(" Source file on workstation: %s\n", localfile);
385	- printf(" Destination file on Host: %s\n", hostfile);
386	- }
387	- printf(" Transfer mode: %s", ascii? "ASCII": "Binary");
388	- if (ascii) {
389	- switch (cr_mode) {
390	- case CR_REMOVE:
391	- printf(", remove CRs\n");
392	- break;
393	- case CR_ADD:
394	- printf(", add CRs\n");
395	- break;
396	- case CR_KEEP:
397	- break;
398	- }
399	- }
400	- printf(" If destination file exists, ");
401	- switch (fe_mode) {
402	- case FE_KEEP:
403	- printf("abort the transfer\n");
404	- break;
405	- case FE_REPLACE:
406	- printf("replace it\n");
407	- break;
408	- case FE_APPEND:
409	- printf("append to it\n");
410	- break;
411	- }
412	- if (!receive &&
413	- (rf_mode != RF_NONE \|\| lrecl \|\|
414	- primary_space \|\| secondary_space)) {
415	-
416	- printf(" Destination file:\n");
417	-
418	- switch (rf_mode) {
419	- case RF_NONE:
420	- break;
421	- case RF_FIXED:
422	- printf(" Record format: fixed\n");
423	- break;
424	- case RF_VARIABLE:
425	- printf(" Record format: variable\n");
426	- break;
427	- case RF_UNDEFINED:
428	- printf(" Record format: undefined\n");
429	- break;
430	- }
431	- if (lrecl)
432	- printf(" Logical record length: %d\n",
433	- lrecl);
434	- if (primary_space \|\| secondary_space) {
435	- printf(" Allocation:");
436	- if (primary_space)
437	- printf(" primary %d", primary_space);
438	- if (secondary_space)
439	- printf(" secondary %d", secondary_space);
440	- switch (at_mode) {
441	- case AT_NONE:
442	- break;
443	- case AT_TRACKS:
444	- printf(" tracks");
445	- break;
446	- case AT_CYLINDERS:
447	- printf(" cylinders");
448	- break;
449	- case AT_AVBLOCK:
450	- printf(" avblock");
451	- break;
452	- }
453	- printf("\n");
454	- }
455	- }
456	-
457	- printf("\nContinue? (y/n) [y] ");
458	- if (getyn(1) <= 0)
459	- return -1;
460	-
461	- /* Let it go. */
462	-#if defined(FT_DEBUG) /[/
463	- printf("transfer");
464	-#endif /]/
465	- for (i = 0; i < kw_ix; i++) {
466	- kw_ret[i] = (String)kw[i];
467	-#if defined(FT_DEBUG) /[/
468	- if (strchr(kw_ret[i], ' ') != NULL)
469	- printf(" \"%s\"", kw_ret[i]);
470	- else
471	- printf(" %s", kw_ret[i]);
472	-#endif /]/
473	- }
474	-#if defined(FT_DEBUG) /[/
475	- printf("\n");
476	- fflush(stdout);
477	-#endif /]/
478	- kw_ret[i] = NULL;
479	- *params = kw_ret;
480	- *num_params = kw_ix;
481	- return 0;
482	-}
@@ -0,0 +1,482 @@		@@ -0,0 +1,482 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
	19	+ * Place, Suite 330, Boston, MA, 02111-1307, USA
	20	+ *
	21	+ * Este programa está nomeado como icmd.c e possui 482 linhas de código.
	22	+ *
	23	+ * Contatos:
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ * licinio@bb.com.br (Licínio Luis Branco)
	28	+ * kraucer@bb.com.br (Kraucer Fernandes Mazuco)
	29	+ * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda)
	30	+ *
	31	+ */
	32	+
	33	+/*
	34	+ * icmd.c
	35	+ * A curses-based 3270 Terminal Emulator
	36	+ * Interactive commands
	37	+ */
	38	+
	39	+#include "globals.h"
	40	+
	41	+#include "icmdc.h"
	42	+
	43	+/* Support functions for interactive commands. */
	44	+
	45	+/*
	46	+ * Get a buffer full of input.
	47	+ * Trims white space in the result.
	48	+ * Returns NULL if there is an input error or if the input is 'quit'.
	49	+ */
	50	+static char *
	51	+get_input(char *buf, int size)
	52	+{
	53	+ int sl;
	54	+ char *s;
	55	+
	56	+ fflush(stdout);
	57	+
	58	+ /* Get the raw input. */
	59	+ if (fgets(buf, size, stdin) == NULL)
	60	+ return NULL;
	61	+
	62	+ /* Trim trailing white space. */
	63	+ sl = strlen(buf);
	64	+ while (sl && isspace(buf[sl - 1]))
	65	+ buf[--sl] = '\0';
	66	+
	67	+ /* Trim leading white space. */
	68	+ s = buf;
	69	+ while (s && isspace(s)) {
	70	+ s++;
	71	+ sl--;
	72	+ }
	73	+ if (s != buf)
	74	+ memmove(buf, s, sl + 1);
	75	+
	76	+ /* Check for 'quit'. */
	77	+ if (!strcasecmp(buf, "quit"))
	78	+ return NULL;
	79	+
	80	+ return buf;
	81	+}
	82	+
	83	+/* Get a yes, no or quit. Returns 0 for no, 1 for yes, -1 for quit or error. */
	84	+static int
	85	+getyn(int defval)
	86	+{
	87	+ char buf[64];
	88	+
	89	+ for (;;) {
	90	+ if (get_input(buf, sizeof(buf)) == NULL)
	91	+ return -1;
	92	+ if (!buf[0])
	93	+ return defval;
	94	+ if (!strncasecmp(buf, "yes", strlen(buf)))
	95	+ return 1;
	96	+ else if (!strncasecmp(buf, "no", strlen(buf)))
	97	+ return 0;
	98	+ else {
	99	+ printf("Please answer 'yes', 'no' or 'quit': ");
	100	+ }
	101	+ }
	102	+}
	103	+
	104	+/*
	105	+ * Get a numeric value. Returns the number for good input, -1 for quit or
	106	+ * error.
	107	+ */
	108	+static int
	109	+getnum(int defval)
	110	+{
	111	+ char buf[64];
	112	+ unsigned long u;
	113	+ char *ptr;
	114	+
	115	+ for (;;) {
	116	+ if (get_input(buf, sizeof(buf)) == NULL)
	117	+ return -1;
	118	+ if (!buf[0])
	119	+ return defval;
	120	+ u = strtoul(buf, &ptr, 10);
	121	+ if (*ptr == '\0')
	122	+ return (int)u;
	123	+ printf("Please enter a number or 'quit': ");
	124	+ }
	125	+}
	126	+
	127	+/*
	128	+ * Interactive file transfer command.
	129	+ * Called from Transfer_action. Returns a new set of params.
	130	+ * Returns 0 for success, -1 for failure.
	131	+ */
	132	+int
	133	+interactive_transfer(String *params, Cardinal num_params)
	134	+{
	135	+ char inbuf[1024];
	136	+ static String kw_ret[14];
	137	+ static char kw[13][1024];
	138	+ char hostfile[1024];
	139	+ char localfile[1024];
	140	+ int kw_ix = 0;
	141	+ int receive = 1;
	142	+ int tso = 1;
	143	+ int ascii = 1;
	144	+ int n;
	145	+ enum { CR_REMOVE, CR_ADD, CR_KEEP } cr_mode = CR_REMOVE;
	146	+ enum { FE_KEEP, FE_REPLACE, FE_APPEND } fe_mode = FE_KEEP;
	147	+ enum { RF_NONE, RF_FIXED, RF_VARIABLE, RF_UNDEFINED } rf_mode = RF_NONE;
	148	+ enum { AT_NONE, AT_TRACKS, AT_CYLINDERS, AT_AVBLOCK } at_mode = AT_NONE;
	149	+ int lrecl = 0;
	150	+ int primary_space = 0, secondary_space = 0;
	151	+ int i;
	152	+
	153	+ printf("\n\
	154	+File Transfer\n\
	155	+\n\
	156	+Type 'quit' at any prompt to abort this dialog.\n\
	157	+\n\
	158	+Note: In order to initiate a file transfer, the 3270 cursor must be\n\
	159	+positioned on an input field that can accept the IND$FILE command, i.e.,\n\
	160	+at VM/CMS or TSO command prompt.\n");
	161	+
	162	+ printf("\nContinue? (y/n) [y] ");
	163	+ if (getyn(1) <= 0)
	164	+ return -1;
	165	+
	166	+ printf(" 'send' means copy a file from this workstation to the host.\n");
	167	+ printf(" 'receive' means copy a file from the host to this workstation.\n");
	168	+ for (;;) {
	169	+ printf("Direction (send/receive) [receive]: ");
	170	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	171	+ return -1;
	172	+ if (!inbuf[0] \|\| !strncasecmp(inbuf, "receive", strlen(inbuf)))
	173	+ break;
	174	+ if (!strncasecmp(inbuf, "send", strlen(inbuf))) {
	175	+ strcpy(kw[kw_ix++], "Direction=send");
	176	+ receive = 0;
	177	+ break;
	178	+ }
	179	+ }
	180	+
	181	+ for (;;) {
	182	+ printf("Name of source file on %s: ",
	183	+ receive? "the host": "this workstation");
	184	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	185	+ return -1;
	186	+ if (inbuf[0]) {
	187	+ if (receive) {
	188	+ sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
	189	+ strcpy(hostfile, inbuf);
	190	+ } else {
	191	+ sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
	192	+ strcpy(localfile, inbuf);
	193	+ }
	194	+ break;
	195	+ }
	196	+ }
	197	+
	198	+ for (;;) {
	199	+ printf("Name of destination file on %s: ",
	200	+ receive? "this workstation": "the host");
	201	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	202	+ return -1;
	203	+ if (inbuf[0]) {
	204	+ if (receive) {
	205	+ sprintf(kw[kw_ix++], "LocalFile=%s", inbuf);
	206	+ strcpy(localfile, inbuf);
	207	+ } else {
	208	+ sprintf(kw[kw_ix++], "HostFile=%s", inbuf);
	209	+ strcpy(hostfile, inbuf);
	210	+ }
	211	+ break;
	212	+ }
	213	+ }
	214	+
	215	+ for (;;) {
	216	+ printf("Host type: (tso/vm) [tso] ");
	217	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	218	+ return -1;
	219	+ if (!inbuf[0] \|\| !strncasecmp(inbuf, "tso", strlen(inbuf)))
	220	+ break;
	221	+ if (!strncasecmp(inbuf, "vm", strlen(inbuf))) {
	222	+ strcpy(kw[kw_ix++], "Host=vm");
	223	+ tso = 0;
	224	+ break;
	225	+ }
	226	+ }
	227	+
	228	+ printf("\
	229	+ An 'ascii' transfer does automatic translation between EBCDIC on the host and\n\
	230	+ASCII on the workstation.\n\
	231	+ A 'binary' transfer does no data translation.\n");
	232	+
	233	+ for (;;) {
	234	+ printf("Transfer mode: (ascii/binary) [ascii] ");
	235	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	236	+ return -1;
	237	+ if (!inbuf[0] \|\| !strncasecmp(inbuf, "ascii", strlen(inbuf)))
	238	+ break;
	239	+ if (!strncasecmp(inbuf, "binary", strlen(inbuf))) {
	240	+ strcpy(kw[kw_ix++], "Mode=binary");
	241	+ ascii = 0;
	242	+ break;
	243	+ }
	244	+ }
	245	+
	246	+ if (ascii) {
	247	+ printf("\
	248	+ For ASCII transfers, carriage return (CR) characters can be handled specially.\n\
	249	+ 'remove' means that CRs will be removed during the transfer.\n\
	250	+ 'add' means that CRs will be added to each record during the transfer.\n\
	251	+ 'keep' means that no special action is taken with CRs.\n");
	252	+ for (;;) {
	253	+ printf("CR handling: (remove/add/keep) [remove] ");
	254	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	255	+ return -1;
	256	+ if (!inbuf[0] \|\| !strncasecmp(inbuf, "remove", strlen(inbuf)))
	257	+ break;
	258	+ if (!strncasecmp(inbuf, "add", strlen(inbuf))) {
	259	+ strcpy(kw[kw_ix++], "Cr=add");
	260	+ cr_mode = CR_ADD;
	261	+ break;
	262	+ }
	263	+ if (!strncasecmp(inbuf, "keep", strlen(inbuf))) {
	264	+ strcpy(kw[kw_ix++], "Cr=keep");
	265	+ cr_mode = CR_KEEP;
	266	+ break;
	267	+ }
	268	+ }
	269	+ }
	270	+
	271	+ printf("\
	272	+ If the destination file exists, you can choose to keep it (and abort the\n\
	273	+ transfer), replace it, or append the source file to it.\n");
	274	+ for (;;) {
	275	+ printf("Action if destination file exists: (keep/replace/append) [keep] ");
	276	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	277	+ return -1;
	278	+ if (!inbuf[0] \|\| !strncasecmp(inbuf, "keep", strlen(inbuf)))
	279	+ break;
	280	+ if (!strncasecmp(inbuf, "replace", strlen(inbuf))) {
	281	+ strcpy(kw[kw_ix++], "Exist=replace");
	282	+ fe_mode = FE_REPLACE;
	283	+ break;
	284	+ }
	285	+ if (!strncasecmp(inbuf, "append", strlen(inbuf))) {
	286	+ strcpy(kw[kw_ix++], "Exist=append");
	287	+ fe_mode = FE_APPEND;
	288	+ break;
	289	+ }
	290	+ }
	291	+
	292	+ if (!receive) {
	293	+ for (;;) {
	294	+ printf("[optional] Destinaton file record format (fixed/variable/undefined): ");
	295	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	296	+ return -1;
	297	+ if (!inbuf[0])
	298	+ break;
	299	+ if (!strncasecmp(inbuf, "fixed", strlen(inbuf))) {
	300	+ sprintf(kw[kw_ix++], "Recfm=fixed");
	301	+ rf_mode = RF_FIXED;
	302	+ break;
	303	+ }
	304	+ if (!strncasecmp(inbuf, "variable", strlen(inbuf))) {
	305	+ sprintf(kw[kw_ix++], "Recfm=variable");
	306	+ rf_mode = RF_VARIABLE;
	307	+ break;
	308	+ }
	309	+ if (!strncasecmp(inbuf, "undefined", strlen(inbuf))) {
	310	+ sprintf(kw[kw_ix++], "Recfm=undefined");
	311	+ rf_mode = RF_UNDEFINED;
	312	+ break;
	313	+ }
	314	+ }
	315	+
	316	+ printf("[optional] Destination file logical record length: ");
	317	+ n = getnum(0);
	318	+ if (n < 0)
	319	+ return -1;
	320	+ if (n > 0) {
	321	+ sprintf(kw[kw_ix++], "Lrecl=%d", n);
	322	+ lrecl = n;
	323	+ }
	324	+
	325	+ if (tso) {
	326	+
	327	+ printf("[optional] Destination file block size: ");
	328	+ n = getnum(0);
	329	+ if (n < 0)
	330	+ return -1;
	331	+ if (n > 0)
	332	+ sprintf(kw[kw_ix++], "Blksize=%d", n);
	333	+
	334	+ for (;;) {
	335	+ printf("[optional] Destination file allocation type (tracks/cylinders/avblock): ");
	336	+ if (get_input(inbuf, sizeof(inbuf)) == NULL)
	337	+ return -1;
	338	+ if (!inbuf[0])
	339	+ break;
	340	+ if (!strncasecmp(inbuf, "tracks", strlen(inbuf))) {
	341	+ strcpy(kw[kw_ix++], "Allocation=tracks");
	342	+ at_mode = AT_TRACKS;
	343	+ break;
	344	+ }
	345	+ if (!strncasecmp(inbuf, "cylinders", strlen(inbuf))) {
	346	+ strcpy(kw[kw_ix++], "Allocation=cylinders");
	347	+ at_mode = AT_CYLINDERS;
	348	+ break;
	349	+ }
	350	+ if (!strncasecmp(inbuf, "avblock", strlen(inbuf))) {
	351	+ strcpy(kw[kw_ix++], "Allocation=avblock");
	352	+ at_mode = AT_AVBLOCK;
	353	+ break;
	354	+ }
	355	+ }
	356	+
	357	+ printf("[optional] Destination file primary space: ");
	358	+ n = getnum(0);
	359	+ if (n < 0)
	360	+ return -1;
	361	+ if (n > 0) {
	362	+ sprintf(kw[kw_ix++], "PrimarySpace=%d", n);
	363	+ primary_space = n;
	364	+ }
	365	+
	366	+ printf("[optional] Destination file secondary space: ");
	367	+ n = getnum(0);
	368	+ if (n < 0)
	369	+ return -1;
	370	+ if (n > 0) {
	371	+ sprintf(kw[kw_ix++], "SecondarySpace=%d", n);
	372	+ secondary_space = n;
	373	+ }
	374	+
	375	+ }
	376	+
	377	+ }
	378	+
	379	+ printf("\nFile Transfer Summary:\n");
	380	+ if (receive) {
	381	+ printf(" Source file on Host: %s\n", hostfile);
	382	+ printf(" Destination file on Workstation: %s\n", localfile);
	383	+ } else {
	384	+ printf(" Source file on workstation: %s\n", localfile);
	385	+ printf(" Destination file on Host: %s\n", hostfile);
	386	+ }
	387	+ printf(" Transfer mode: %s", ascii? "ASCII": "Binary");
	388	+ if (ascii) {
	389	+ switch (cr_mode) {
	390	+ case CR_REMOVE:
	391	+ printf(", remove CRs\n");
	392	+ break;
	393	+ case CR_ADD:
	394	+ printf(", add CRs\n");
	395	+ break;
	396	+ case CR_KEEP:
	397	+ break;
	398	+ }
	399	+ }
	400	+ printf(" If destination file exists, ");
	401	+ switch (fe_mode) {
	402	+ case FE_KEEP:
	403	+ printf("abort the transfer\n");
	404	+ break;
	405	+ case FE_REPLACE:
	406	+ printf("replace it\n");
	407	+ break;
	408	+ case FE_APPEND:
	409	+ printf("append to it\n");
	410	+ break;
	411	+ }
	412	+ if (!receive &&
	413	+ (rf_mode != RF_NONE \|\| lrecl \|\|
	414	+ primary_space \|\| secondary_space)) {
	415	+
	416	+ printf(" Destination file:\n");
	417	+
	418	+ switch (rf_mode) {
	419	+ case RF_NONE:
	420	+ break;
	421	+ case RF_FIXED:
	422	+ printf(" Record format: fixed\n");
	423	+ break;
	424	+ case RF_VARIABLE:
	425	+ printf(" Record format: variable\n");
	426	+ break;
	427	+ case RF_UNDEFINED:
	428	+ printf(" Record format: undefined\n");
	429	+ break;
	430	+ }
	431	+ if (lrecl)
	432	+ printf(" Logical record length: %d\n",
	433	+ lrecl);
	434	+ if (primary_space \|\| secondary_space) {
	435	+ printf(" Allocation:");
	436	+ if (primary_space)
	437	+ printf(" primary %d", primary_space);
	438	+ if (secondary_space)
	439	+ printf(" secondary %d", secondary_space);
	440	+ switch (at_mode) {
	441	+ case AT_NONE:
	442	+ break;
	443	+ case AT_TRACKS:
	444	+ printf(" tracks");
	445	+ break;
	446	+ case AT_CYLINDERS:
	447	+ printf(" cylinders");
	448	+ break;
	449	+ case AT_AVBLOCK:
	450	+ printf(" avblock");
	451	+ break;
	452	+ }
	453	+ printf("\n");
	454	+ }
	455	+ }
	456	+
	457	+ printf("\nContinue? (y/n) [y] ");
	458	+ if (getyn(1) <= 0)
	459	+ return -1;
	460	+
	461	+ /* Let it go. */
	462	+#if defined(FT_DEBUG) /[/
	463	+ printf("transfer");
	464	+#endif /]/
	465	+ for (i = 0; i < kw_ix; i++) {
	466	+ kw_ret[i] = (String)kw[i];
	467	+#if defined(FT_DEBUG) /[/
	468	+ if (strchr(kw_ret[i], ' ') != NULL)
	469	+ printf(" \"%s\"", kw_ret[i]);
	470	+ else
	471	+ printf(" %s", kw_ret[i]);
	472	+#endif /]/
	473	+ }
	474	+#if defined(FT_DEBUG) /[/
	475	+ printf("\n");
	476	+ fflush(stdout);
	477	+#endif /]/
	478	+ kw_ret[i] = NULL;
	479	+ *params = kw_ret;
	480	+ *num_params = kw_ix;
	481	+ return 0;
	482	+}
	@@ -65,7 +65,7 @@		@@ -65,7 +65,7 @@
65		65
66	Trace("Status: %d",query_3270_terminal_status());	66	Trace("Status: %d",query_3270_terminal_status());
67		67
68	- if(query_3270_terminal_status() != STATUS_CODE_BLANK)	68	+ if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
69	return RetValue(Retstr,EINVAL);	69	return RetValue(Retstr,EINVAL);
70		70
71	switch(Argc)	71	switch(Argc)
	@@ -100,7 +100,7 @@		@@ -100,7 +100,7 @@
100		100
101	Trace("Status: %d",query_3270_terminal_status());	101	Trace("Status: %d",query_3270_terminal_status());
102		102
103	- return RetValue(Retstr,query_3270_terminal_status() == STATUS_CODE_BLANK ? 0 : EINVAL);	103	+ return RetValue(Retstr,query_3270_terminal_status() == LIB3270_STATUS_BLANK ? 0 : EINVAL);
104	}	104	}
105		105
106	RexxReturnCode REXXENTRY rx3270FindFieldAttribute(PSZ Name, LONG Argc, RXSTRING Argv[],PSZ Queuename, PRXSTRING Retstr)	106	RexxReturnCode REXXENTRY rx3270FindFieldAttribute(PSZ Name, LONG Argc, RXSTRING Argv[],PSZ Queuename, PRXSTRING Retstr)
	@@ -307,7 +307,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A		@@ -307,7 +307,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
307	{	307	{
308	rc = ECANCELED;	308	rc = ECANCELED;
309	}	309	}
310	- else if(query_3270_terminal_status() == STATUS_CODE_BLANK)	310	+ else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
311	{	311	{
312	screen_read(buffer,start,sz);	312	screen_read(buffer,start,sz);
313	*(buffer+sz) = 0;	313	*(buffer+sz) = 0;
	@@ -445,7 +445,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A		@@ -445,7 +445,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
445		445
446	if(!PCONNECTED)	446	if(!PCONNECTED)
447	rc = ENOTCONN;	447	rc = ENOTCONN;
448	- else if(query_3270_terminal_status() != STATUS_CODE_BLANK)	448	+ else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
449	rc = EINVAL;	449	rc = EINVAL;
450	else	450	else
451	rc = lib3270_enter();	451	rc = lib3270_enter();
	@@ -477,7 +477,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A		@@ -477,7 +477,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
477		477
478	if(!PCONNECTED)	478	if(!PCONNECTED)
479	rc = ENOTCONN;	479	rc = ENOTCONN;
480	- else if(query_3270_terminal_status() != STATUS_CODE_BLANK)	480	+ else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
481	rc = EINVAL;	481	rc = EINVAL;
482	else	482	else
483	rc = lib3270_pfkey(atoi(Argv[0].strptr));	483	rc = lib3270_pfkey(atoi(Argv[0].strptr));
	@@ -649,7 +649,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A		@@ -649,7 +649,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
649	{	649	{
650	rc = ECANCELED;	650	rc = ECANCELED;
651	}	651	}
652	- else if(query_3270_terminal_status() == STATUS_CODE_BLANK)	652	+ else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
653	{	653	{
654	screen_read(buffer,pos,sz);	654	screen_read(buffer,pos,sz);
655	*(buffer+(sz+1)) = 0;	655	*(buffer+(sz+1)) = 0;
	@@ -685,7 +685,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg		@@ -685,7 +685,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg
685	if(Argc)	685	if(Argc)
686	return RXFUNC_BADCALL;	686	return RXFUNC_BADCALL;
687		687
688	- if(!CONNECTED \|\| query_3270_terminal_status() != STATUS_CODE_BLANK)	688	+ if(!CONNECTED \|\| query_3270_terminal_status() != LIB3270_STATUS_BLANK)
689	{	689	{
690	ReturnValue(0);	690	ReturnValue(0);
691	}	691	}
	@@ -735,7 +735,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg		@@ -735,7 +735,7 @@ RexxReturnCode REXXENTRY rx3270IsTerminalReady(PSZ Name, LONG Argc, RXSTRING Arg
735	rc = ENOTCONN;	735	rc = ENOTCONN;
736	else if(IsHalted())	736	else if(IsHalted())
737	rc = ECANCELED;	737	rc = ECANCELED;
738	- else if(query_3270_terminal_status() == STATUS_CODE_BLANK)	738	+ else if(query_3270_terminal_status() == LIB3270_STATUS_BLANK)
739	rc = 0;	739	rc = 0;
740	}	740	}
741		741