diff --git a/0000BOOT/BOOT.BIC b/0000BOOT/BOOT.BIC index aec64fc..067e17a 100644 Binary files a/0000BOOT/BOOT.BIC and b/0000BOOT/BOOT.BIC differ diff --git a/LT/ADAM/ADAMASM.BIZ b/LT/ADAM/ADAMASM.BIZ index f7bbacc..dd7d74a 100644 Binary files a/LT/ADAM/ADAMASM.BIZ and b/LT/ADAM/ADAMASM.BIZ differ diff --git a/LT/ADAM/COMM.CPZ b/LT/ADAM/COMM.CPZ index b68b37b..7e643eb 100644 --- a/LT/ADAM/COMM.CPZ +++ b/LT/ADAM/COMM.CPZ @@ -35,7 +35,7 @@ #define RMT_RQST_EXE_LOCAL 0x06 #define RMT_RQST_PUTS_CNT 0x07 -#define RMT_RQST_MAX 0x07 +#define RMT_RQST_MAX 0x08 U8 comm_base[5]={0,0x3F8,0x2F8,0x3E8,0x2E8}; U1Fifo *comm_Rx_fifos[5]={NULL,NULL,NULL,NULL,NULL}; @@ -454,7 +454,7 @@ rr_start: RmtRxPktU1(chnl,&b1,JIFFY_FREQ/50,&esc); rr_cont: if (b==RMT_PKT_REQUEST) { - if (b1>RMT_RQST_MAX) { + if (b1>=RMT_RQST_MAX) { if (b1==RMT_PKT_REQUEST && !esc) goto rr_cont; else @@ -563,6 +563,8 @@ public U8 RmtGetMsg(LTChnl *chnl,I8 *p1,I8 *p2) *p2=b[16]><(U8); if (!cmd) chnl->null_msg_jiffy=jiffies+JIFFY_FREQ/50; + else + chnl->null_msg_jiffy=0; } return cmd; } @@ -576,8 +578,10 @@ public void RmtSendMsg(LTChnl *chnl,U8 cmd,I8 p1,I8 p2) b[8]><(U8)=p1; b[16]><(U8)=p2; RmtTxPkt(chnl,b,sizeof(U8)*3); - } else + } else { RmtTxPkt(chnl,b,1); + chnl->null_msg_cnt++; + } } public void RmtPutCharSC(LTChnl *chnl,I8 ch,U8 sc) @@ -614,11 +618,15 @@ public void RmtTxFile(LTChnl *chnl,I1 *filename, { U8 size; U1 *buf; + LTDirEntry de; if (!chnl || !chnl->type) return; - buf=ReadFile(filename,&size,NULL,raw); - if (buf) { - RmtTxBuf(chnl,buf,size); - Free(buf); + if (FindFile(filename,&de)) { + buf=ReadFile(filename,&size,NULL,raw); + if (buf) { + RmtTxBuf(chnl,&de.start,LT_DIR_ENTRY_SIZE); + RmtTxBuf(chnl,buf,size); + Free(buf); + } } } @@ -626,12 +634,16 @@ public U8 RmtRxFile(LTChnl *chnl,I1 *filename, BoolU4 raw=TRUE) { U8 size; - U1 *buf; + U1 *buf,*buf1; + LTDirEntry *de; if (!chnl || !chnl->type) return 0; + buf1=RmtRxBuf(chnl); + de=buf1-offset(LTDirEntry.start); if (buf=RmtRxBuf(chnl,&size)) { - WriteFile(filename,buf,size,0,0,raw); + WriteFile(filename,buf,size,de->datetime,de->attr,raw); Free(buf); } + Free(buf1); return size; } @@ -676,23 +688,23 @@ public I1 *RmtRxPutS(LTChnl *chnl,U8 *rqst=NULL) return buf; } -/*************** -public U1 *RmtRqstTxBuf(U8 *size=NULL) +public U1 *RmtRqstTxBuf() { +//Remote must fill-in remote's chnl->tx_buf +//and remote's chnl->tx_size before calling. LTChnl *chnl=Fs->rmt_chnl; if (!chnl || !chnl->type) return NULL; RmtTxPkt(chnl,NULL,0,RMT_RQST_TX_BUF); - return RmtRxBuf(chnl,size); + return RmtRxBuf(chnl); } -public void RmtRqstRxBuf(U1 *buf,U8 size) -{ +public void RmtRqstRxBuf(U1 *src_local_buf,U8 size) +{ //Dst buf address is placed in remote's chnl->rx_buf LTChnl *chnl=Fs->rmt_chnl; if (!chnl || !chnl->type) return; RmtTxPkt(chnl,NULL,0,RMT_RQST_RX_BUF); - RmtTxBuf(chnl,buf,size); + RmtTxBuf(chnl,src_local_buf,size); } -*************/ public void RmtRqstTxFile(I1 *dst_local_filename,I1 *src_remote_filename) { @@ -736,7 +748,8 @@ void TelnetGuestOpen(LTChnl *chnl) U8 i,cmd,p1,p2,rqst; U1 *st,*st2; if (!chnl || !chnl->type) return; - coutln "CTRL-ALT-C to exit"; + Fs->local_chnl=chnl; + coutln "CTRL-ALT-B to break"; try while (TRUE) { if (st2=RmtRxPutS(chnl,&rqst)) { @@ -749,6 +762,12 @@ void TelnetGuestOpen(LTChnl *chnl) 1<tx_buf,chnl->tx_size); break; case RMT_RQST_RX_BUF: - RmtRxBuf(chnl); + chnl->rx_buf=RmtRxBuf(chnl); break; -************/ case RMT_RQST_EXE_LOCAL: st=RmtRxBuf(chnl); ExecuteString(st); @@ -786,11 +804,15 @@ void TelnetGuestOpen(LTChnl *chnl) } catch Fs->catch_except=TRUE; +tel_exit: +/****** for (i=0;i<5;i++) { chnl->PutChar(chnl,RMT_PKT_CLOSE); chnl->PutChar(chnl,RMT_PKT_CLOSE); Sleep(50); } +******/ + Fs->local_chnl=NULL; } ext[EXT_RMT_PUTCHAR]=&RmtTxPutChar; diff --git a/LT/ADAM/DISK10.CPZ b/LT/ADAM/DISK10.CPZ index fb981b6..e842638 100644 --- a/LT/ADAM/DISK10.CPZ +++ b/LT/ADAM/DISK10.CPZ @@ -756,7 +756,7 @@ U8 SizeFlattenLTDirTree(LTDirEntry *tempm) { U8 result=0; while (tempm) { - result+=sizeof(LTDirEntry)-offset(LTDirEntry.start)+1; + result+=LT_DIR_ENTRY_SIZE+1; if (tempm->attr & LT_ATTR_DIR) result+=SizeFlattenLTDirTree(tempm->sub); tempm=tempm->next; @@ -770,7 +770,7 @@ U8 FillFlattenLTDirTree(LTDirEntry *tempm,U1 *dst) while (tempm) { *dst++=1; result++; - i=sizeof(LTDirEntry)-offset(LTDirEntry.start); + i=LT_DIR_ENTRY_SIZE; MemCpy(dst,&tempm->start,i); dst+=i; result+=i; @@ -790,7 +790,7 @@ public U1 *FlattenLTDirTree(LTDirEntry *tempm,U8 *size=NULL) U8 i=SizeFlattenLTDirTree(tempm); U1 *buf=MAlloc(i); FillFlattenLTDirTree(tempm,buf); - if (*size) *size=i; + if (size) *size=i; return buf; } @@ -801,7 +801,7 @@ U1 *DoUnflattenLTDirTree(U1 *src,LTDirEntry **tempm) if (*src++) { tempm1=MAllocZ(sizeof(LTDirEntry)); *tempm=tempm1; - i=sizeof(LTDirEntry)-offset(LTDirEntry.start); + i=LT_DIR_ENTRY_SIZE; MemCpy(&tempm1->start,src,i); src+=i; if (tempm1->attr & LT_ATTR_DIR) @@ -818,4 +818,3 @@ public LTDirEntry *UnflattenLTDirTree(U1 *src) DoUnflattenLTDirTree(src,&tempm); return tempm; } - \ No newline at end of file diff --git a/LT/ADAM/WINDOW.CPZ b/LT/ADAM/WINDOW.CPZ index a93a8f0..04682a8 100644 --- a/LT/ADAM/WINDOW.CPZ +++ b/LT/ADAM/WINDOW.CPZ @@ -413,8 +413,8 @@ void InputFilterTask() I1 *st; TssCmdStruct *tempc,*tempc1; BoolU4 old_filter; - InitUserTask; Preempt(OFF); + InitUserTask; Bts(&Fs->task_flags,TSSf_INPUT_FILTER_TASK); old_filter=Bts(&Fs->parent_tss->task_flags,TSSf_FILTER_INPUT); while (TRUE) { @@ -1040,4 +1040,3 @@ public void PressAKey() PutSysText("ST_PRESS_A_KEY"); GetKey; } - \ No newline at end of file diff --git a/LT/COMPILE/CMP.BIZ b/LT/COMPILE/CMP.BIZ index f0cb138..b90c5fe 100644 Binary files a/LT/COMPILE/CMP.BIZ and b/LT/COMPILE/CMP.BIZ differ diff --git a/LT/DOC/News.TXZ b/LT/DOC/News.TXZ index 9a0c624..699bbc9 100644 --- a/LT/DOC/News.TXZ +++ b/LT/DOC/News.TXZ @@ -1,5 +1,8 @@ $WW,1$ +$IV,1$----07/19/06 21:44:00----$IV,0$ +* Worked on serial port null modem support. You can network two computers and do a telnet type thing. There is now a $LK,"RmtMergeChk","MN:RmtMergeChk"$() routine which will sync two computers. One has to have a window running $LK,"TelnetHostOpen","MN:TelnetHostOpen"$() which you pass a channel from $LK,"CommOpen8N1","MN:CommOpen8N1"$(). + $IV,1$----07/18/06 10:25:00----$IV,0$ * Unmask IRQ's during mouse polling. Might have side-effects. diff --git a/LT/OSMain/ADAMK.HPZ b/LT/OSMain/ADAMK.HPZ index 11ceae3..8e042d1 100644 --- a/LT/OSMain/ADAMK.HPZ +++ b/LT/OSMain/ADAMK.HPZ @@ -1462,6 +1462,10 @@ class LTChnl U8 port; U8 baud; U8 null_msg_jiffy; + U8 null_msg_cnt; + U8 tx_size; + U1 *tx_buf; + U1 *rx_buf; void PutChar(LTChnl *chnl,U1 b); U1 GetChar(LTChnl *chnl); BoolU4 ScanChar(LTChnl *chnl,U1 *ch); @@ -1609,6 +1613,7 @@ public class TssStruct U4 answers_displayed; TssStruct *dbg_tss; TssStruct *popup_tss; + LTChnl *local_chnl; LTChnl *rmt_chnl; U4 user_aux0; U4 user_aux1; @@ -1685,10 +1690,12 @@ public class MachineRegsStruct #define CH_LINE_FEED 0x0A #define CH_FORM_FEED 0x0C #define CH_CR 0x0D -#define CH_ESC 27 +#define CH_ESC 0x1B +#define CH_CTRLB 0x02 +#define CH_CTRLE 0x05 #define CH_CTRLQ 0x11 -#define CH_SHIFT_SPACE 31 -#define CH_SPACE 32 +#define CH_SHIFT_SPACE 0x1F +#define CH_SPACE 0x20 #define SC_CR 0x1C #define SC_SHIFT 0x2A @@ -2328,6 +2335,7 @@ class PasswordStruct #define FUf_PUBLIC 8 #define FUf_MAP 9 #define FUf_JUST_DIRS 10 +#define FUf_JUST_TEXT_FILES 11 class FlagsStruct { diff --git a/LT/OSMain/CMD.CPZ b/LT/OSMain/CMD.CPZ index c9671ad..8f36617 100644 --- a/LT/OSMain/CMD.CPZ +++ b/LT/OSMain/CMD.CPZ @@ -544,4 +544,3 @@ U8 EndTask() *free_gdt_list=my_fs; return tempt->fs; } - \ No newline at end of file diff --git a/LT/OSMain/DISK3.CPZ b/LT/OSMain/DISK3.CPZ index bead55f..1c876c6 100644 --- a/LT/OSMain/DISK3.CPZ +++ b/LT/OSMain/DISK3.CPZ @@ -1499,7 +1499,7 @@ BoolU4 NewLTDirEntry2(LTPartition *p,I1 *cur_dir,LTDirEntry *de,BoolU4 free_old_ ch=ptr->name[0]; if (!ch) { if (written) break; - MemCpy(&ptr->attr,&de->attr,LT_DIR_ENTRY_SIZE); + MemCpy(&ptr->start,&de->start,LT_DIR_ENTRY_SIZE); if ((i+1)*LT_DIR_ENTRY_SIZE+j*BLK_SIZEdata+cur_dir_cluster*p->spc+j,1,FALSE); @@ -1545,7 +1545,7 @@ BoolU4 NewLTDirEntry2(LTPartition *p,I1 *cur_dir,LTDirEntry *de,BoolU4 free_old_ break; } else if (ptr->attr & LT_ATTR_DELETED) { if (!written) { - MemCpy(&ptr->attr,&de->attr,LT_DIR_ENTRY_SIZE); + MemCpy(&ptr->start,&de->start,LT_DIR_ENTRY_SIZE); WBlks(p,buf+j*BLK_SIZE, p->data+cur_dir_cluster*p->spc+j,1,FALSE); written=TRUE; @@ -1556,7 +1556,7 @@ BoolU4 NewLTDirEntry2(LTPartition *p,I1 *cur_dir,LTDirEntry *de,BoolU4 free_old_ FreeLTClusters(p,ptr->cluster, (ptr->size+p->spc*BLK_SIZE-1)/(p->spc*BLK_SIZE),FALSE); if (!written) { - MemCpy(&ptr->attr,&de->attr,LT_DIR_ENTRY_SIZE); + MemCpy(&ptr->start,&de->start,LT_DIR_ENTRY_SIZE); WBlks(p,buf+j*BLK_SIZE, p->data+cur_dir_cluster*p->spc+j,1,FALSE); break; @@ -1742,7 +1742,7 @@ LTDirEntry *FindLTFiles(I1 *wild,U8 *fuf_flags) break; else if (!(ptr->attr & LT_ATTR_DELETED)) { tempm=MAllocZ(sizeof(LTDirEntry)); - MemCpy(&tempm->attr,&ptr->attr,LT_DIR_ENTRY_SIZE); + MemCpy(&tempm->start,&ptr->start,LT_DIR_ENTRY_SIZE); if (Bt(fuf_flags,FUf_RECURSE) && tempm->attr & LT_ATTR_DIR && tempm->name[0]!='.') { tempm->next=result; result=tempm; @@ -1981,4 +1981,3 @@ void DirLT(I1 *wild,BoolU4 full) } } - \ No newline at end of file diff --git a/LT/OSMain/DISK4.CPZ b/LT/OSMain/DISK4.CPZ index 6405864..4eaa0d7 100644 --- a/LT/OSMain/DISK4.CPZ +++ b/LT/OSMain/DISK4.CPZ @@ -1012,3 +1012,4 @@ void WriteCDImage(I1 drive,I1 *in_name) Free(in_name3); } + \ No newline at end of file diff --git a/LT/OSMain/OS.MPZ b/LT/OSMain/OS.MPZ index 503d756..815b638 100644 --- a/LT/OSMain/OS.MPZ +++ b/LT/OSMain/OS.MPZ @@ -1,26 +1,26 @@ $LK "ACSF_IN_STRUCT ","FL:::/LT/OSMain/ADAMK.HPZ,1095"$1 0000 StrConst -$LK "ACS_COMPRESS ","FL:::/LT/OSMain/OSINC.ASZ,283"$0000005C 0002 SysSym Lit -$LK "ACS_CUR_BITS_IN_USE ","FL:::/LT/OSMain/OSINC.ASZ,273"$00000034 0001 SysSym Lit -$LK "ACS_CUR_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,272"$00000030 0001 SysSym Lit -$LK "ACS_DST_BUF ","FL:::/LT/OSMain/OSINC.ASZ,269"$00000024 0000 SysSym Lit -$LK "ACS_DST_POS ","FL:::/LT/OSMain/OSINC.ASZ,268"$0000001C 0000 SysSym Lit -$LK "ACS_DST_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,267"$00000014 0000 SysSym Lit -$LK "ACS_ENTRY_USED ","FL:::/LT/OSMain/OSINC.ASZ,281"$00000054 0001 SysSym Lit -$LK "ACS_FREE_INDEX ","FL:::/LT/OSMain/OSINC.ASZ,278"$00000048 0002 SysSym Lit -$LK "ACS_FREE_LIMIT ","FL:::/LT/OSMain/OSINC.ASZ,279"$0000004C 0003 SysSym Lit -$LK "ACS_HASH ","FL:::/LT/OSMain/OSINC.ASZ,284"$0000805C 0002 SysSym Lit -$LK "ACS_LAST_CH ","FL:::/LT/OSMain/OSINC.ASZ,282"$00000058 0000 SysSym Lit -$LK "ACS_MIN_BITS ","FL:::/LT/OSMain/OSINC.ASZ,270"$00000028 0000 SysSym Lit -$LK "ACS_MIN_TABLE_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,271"$0000002C 0001 SysSym Lit -$LK "ACS_NEXT_BITS_IN_USE ","FL:::/LT/OSMain/OSINC.ASZ,275"$0000003C 0002 SysSym Lit -$LK "ACS_NEXT_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,274"$00000038 0003 SysSym Lit -$LK "ACS_SAVED_BASECODE ","FL:::/LT/OSMain/OSINC.ASZ,280"$00000050 0000 SysSym Lit -$LK "ACS_SRC_BUF ","FL:::/LT/OSMain/OSINC.ASZ,266"$00000010 0000 SysSym Lit -$LK "ACS_SRC_POS ","FL:::/LT/OSMain/OSINC.ASZ,265"$00000008 0000 SysSym Lit -$LK "ACS_SRC_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,264"$00000000 0000 SysSym Lit -$LK "ACS_STACK_BASE ","FL:::/LT/OSMain/OSINC.ASZ,277"$00000044 0000 SysSym Lit -$LK "ACS_STACK_PTR ","FL:::/LT/OSMain/OSINC.ASZ,276"$00000040 0000 SysSym Lit -$LK "ACS_STRUCT_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,285"$0000C05C 0000 SysSym Lit +$LK "ACS_COMPRESS ","FL:::/LT/OSMain/OSINC.ASZ,284"$0000005C 0002 SysSym Lit +$LK "ACS_CUR_BITS_IN_USE ","FL:::/LT/OSMain/OSINC.ASZ,274"$00000034 0001 SysSym Lit +$LK "ACS_CUR_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,273"$00000030 0001 SysSym Lit +$LK "ACS_DST_BUF ","FL:::/LT/OSMain/OSINC.ASZ,270"$00000024 0000 SysSym Lit +$LK "ACS_DST_POS ","FL:::/LT/OSMain/OSINC.ASZ,269"$0000001C 0000 SysSym Lit +$LK "ACS_DST_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,268"$00000014 0000 SysSym Lit +$LK "ACS_ENTRY_USED ","FL:::/LT/OSMain/OSINC.ASZ,282"$00000054 0001 SysSym Lit +$LK "ACS_FREE_INDEX ","FL:::/LT/OSMain/OSINC.ASZ,279"$00000048 0002 SysSym Lit +$LK "ACS_FREE_LIMIT ","FL:::/LT/OSMain/OSINC.ASZ,280"$0000004C 0003 SysSym Lit +$LK "ACS_HASH ","FL:::/LT/OSMain/OSINC.ASZ,285"$0000805C 0002 SysSym Lit +$LK "ACS_LAST_CH ","FL:::/LT/OSMain/OSINC.ASZ,283"$00000058 0000 SysSym Lit +$LK "ACS_MIN_BITS ","FL:::/LT/OSMain/OSINC.ASZ,271"$00000028 0000 SysSym Lit +$LK "ACS_MIN_TABLE_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,272"$0000002C 0001 SysSym Lit +$LK "ACS_NEXT_BITS_IN_USE ","FL:::/LT/OSMain/OSINC.ASZ,276"$0000003C 0002 SysSym Lit +$LK "ACS_NEXT_ENTRY ","FL:::/LT/OSMain/OSINC.ASZ,275"$00000038 0003 SysSym Lit +$LK "ACS_SAVED_BASECODE ","FL:::/LT/OSMain/OSINC.ASZ,281"$00000050 0000 SysSym Lit +$LK "ACS_SRC_BUF ","FL:::/LT/OSMain/OSINC.ASZ,267"$00000010 0000 SysSym Lit +$LK "ACS_SRC_POS ","FL:::/LT/OSMain/OSINC.ASZ,266"$00000008 0000 SysSym Lit +$LK "ACS_SRC_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,265"$00000000 0000 SysSym Lit +$LK "ACS_STACK_BASE ","FL:::/LT/OSMain/OSINC.ASZ,278"$00000044 0000 SysSym Lit +$LK "ACS_STACK_PTR ","FL:::/LT/OSMain/OSINC.ASZ,277"$00000040 0000 SysSym Lit +$LK "ACS_STRUCT_SIZE ","FL:::/LT/OSMain/OSINC.ASZ,286"$0000C05C 0000 SysSym Lit $LK "ACTIVATE_NEXT_USER ","FL:::/LT/OSMain/SCHED.ASZ,157"$000044A8 0002 SysSym $LK "ADAM_TSS ","FL:::/LT/OSMain/OSMAIN.ASZ,15"$0000101C 0002 SysSym Export $LK +BI,"AFree ","FL:::/LT/OSMain/MEM.CPZ,7",1$00004B24 001B Funct Export @@ -53,8 +53,8 @@ $LK +BI,"AMAlloc ","FL:::/LT/OSMain/MEM.CPZ,1",2$00004ADD 0009 Funct $LK +BI,"AMAllocIdentical ","FL:::/LT/OSMain/MEM.CPZ,12",3$00004B5A 0004 Funct Export $LK +BI,"AMAllocZ ","FL:::/LT/OSMain/MEM.CPZ,40",4$00004D8E 0008 Funct Export $LK +BI,"ANewString ","FL:::/LT/OSMain/MEM.CPZ,26",5$00004C6C 0007 Funct Export -$LK "ARC_MAX_BITS ","FL:::/LT/OSMain/ADAMK.HPZ,1869"$12 0006 StrConst -$LK "ARC_MAX_TABLE_ENTRY ","FL:::/LT/OSMain/ADAMK.HPZ,1870"$((1<ans 0000 StrConst -$LK "ans0 ","FL:::/LT/OSMain/ADAMK.HPZ,1621"$(Fs->ans 0000 StrConst -$LK "ans1 ","FL:::/LT/OSMain/ADAMK.HPZ,1622"$(Fs->ans 0000 StrConst -$LK "ans2 ","FL:::/LT/OSMain/ADAMK.HPZ,1623"$(Fs->ans 0000 StrConst -$LK "ans3 ","FL:::/LT/OSMain/ADAMK.HPZ,1624"$(Fs->ans 0000 StrConst -$LK "ans4 ","FL:::/LT/OSMain/ADAMK.HPZ,1625"$(Fs->ans 0000 StrConst -$LK "ans5 ","FL:::/LT/OSMain/ADAMK.HPZ,1626"$(Fs->ans 0000 StrConst -$LK "ans6 ","FL:::/LT/OSMain/ADAMK.HPZ,1627"$(Fs->ans 0000 StrConst -$LK "ans7 ","FL:::/LT/OSMain/ADAMK.HPZ,1628"$(Fs->ans 0000 StrConst -$LK "ansd ","FL:::/LT/OSMain/ADAMK.HPZ,1630"$(Fs->dou 0000 StrConst -$LK "ansd0 ","FL:::/LT/OSMain/ADAMK.HPZ,1631"$(Fs->dou 0000 StrConst -$LK "ansd1 ","FL:::/LT/OSMain/ADAMK.HPZ,1632"$(Fs->dou 0000 StrConst -$LK "ansd2 ","FL:::/LT/OSMain/ADAMK.HPZ,1633"$(Fs->dou 0000 StrConst -$LK "ansd3 ","FL:::/LT/OSMain/ADAMK.HPZ,1634"$(Fs->dou 0000 StrConst -$LK "ansd4 ","FL:::/LT/OSMain/ADAMK.HPZ,1635"$(Fs->dou 0000 StrConst -$LK "ansd5 ","FL:::/LT/OSMain/ADAMK.HPZ,1636"$(Fs->dou 0000 StrConst -$LK "ansd6 ","FL:::/LT/OSMain/ADAMK.HPZ,1637"$(Fs->dou 0000 StrConst -$LK "ansd7 ","FL:::/LT/OSMain/ADAMK.HPZ,1638"$(Fs->dou 0000 StrConst +$LK "ans ","FL:::/LT/OSMain/ADAMK.HPZ,1625"$(Fs->ans 0000 StrConst +$LK "ans0 ","FL:::/LT/OSMain/ADAMK.HPZ,1626"$(Fs->ans 0000 StrConst +$LK "ans1 ","FL:::/LT/OSMain/ADAMK.HPZ,1627"$(Fs->ans 0000 StrConst +$LK "ans2 ","FL:::/LT/OSMain/ADAMK.HPZ,1628"$(Fs->ans 0000 StrConst +$LK "ans3 ","FL:::/LT/OSMain/ADAMK.HPZ,1629"$(Fs->ans 0000 StrConst +$LK "ans4 ","FL:::/LT/OSMain/ADAMK.HPZ,1630"$(Fs->ans 0000 StrConst +$LK "ans5 ","FL:::/LT/OSMain/ADAMK.HPZ,1631"$(Fs->ans 0000 StrConst +$LK "ans6 ","FL:::/LT/OSMain/ADAMK.HPZ,1632"$(Fs->ans 0000 StrConst +$LK "ans7 ","FL:::/LT/OSMain/ADAMK.HPZ,1633"$(Fs->ans 0000 StrConst +$LK "ansd ","FL:::/LT/OSMain/ADAMK.HPZ,1635"$(Fs->dou 0000 StrConst +$LK "ansd0 ","FL:::/LT/OSMain/ADAMK.HPZ,1636"$(Fs->dou 0000 StrConst +$LK "ansd1 ","FL:::/LT/OSMain/ADAMK.HPZ,1637"$(Fs->dou 0000 StrConst +$LK "ansd2 ","FL:::/LT/OSMain/ADAMK.HPZ,1638"$(Fs->dou 0000 StrConst +$LK "ansd3 ","FL:::/LT/OSMain/ADAMK.HPZ,1639"$(Fs->dou 0000 StrConst +$LK "ansd4 ","FL:::/LT/OSMain/ADAMK.HPZ,1640"$(Fs->dou 0000 StrConst +$LK "ansd5 ","FL:::/LT/OSMain/ADAMK.HPZ,1641"$(Fs->dou 0000 StrConst +$LK "ansd6 ","FL:::/LT/OSMain/ADAMK.HPZ,1642"$(Fs->dou 0000 StrConst +$LK "ansd7 ","FL:::/LT/OSMain/ADAMK.HPZ,1643"$(Fs->dou 0000 StrConst $LK "boot_blkdev ","FL:::/LT/OSMain/START.CPZ,67"$00004A30 0004 GlbVar Export $LK "compiled_lines ","FL:::/LT/OSMain/START.CPZ,66"$00004A24 0001 GlbVar Export $LK "dc_col ","FL:::/LT/OSMain/START.CPZ,62"$000049F8 0009 GlbVar Export @@ -2312,58 +2316,52 @@ $LK "textbase ","FL:::/LT/OSMain/ADAMK2.HPZ,52"$00001CF0 0004 GlbVar E $LK +BI,"throw ","FL:::/LT/OSMain/MISC.CPZ,113",326$00006493 001C Funct Export $LK "vga_image ","FL:::/LT/OSMain/START.CPZ,76"$00004AD5 0001 GlbVar Export $LK "wordstat_mask ","FL:::/LT/OSMain/START.CPZ,73"$00004AC9 0001 GlbVar Export - $K4KMK JJ KK$ ZKqKKKK$)/MMMMM$!lLLLLLHLLLLM(0L@LmLLLLH%4z`````aa*a>aQadawaaa `"Y9YWY|YYYYYZ]ZZZZ0[B[y[[[ -V.VYVtV|VVVVVVVW0WDWcWxWWWWWWWTXtXXXXXYY H%#N3NCNpNNNNNNOO,O?OLO H&5YOiOOOOOOOPP,P?PLP H$Q_a_q_____``'`:`M```m`hg~RRRRRRRS*SSSSSSSSST5haaaaa!bNbgb{bbbbbbcc(cUcncccccc d d3d`duddddd3eSeeeeee(M.MMMVMMM4RUiUUUUUUU V+TBTSTyTTTTTTU&UDUtJKK2KLKnKKKh]]]]]] ^/^>^i^x^^^^^__4_C_$)o!2Mcz/Mfy=O`}2Rew #6Nwp#:?\mIi=ObvHBQRi -@^k<Pt8R]&=`tLSp$7<AdqŔܔ/U|˕ەPŖ,HM\|̗  4GL]qΘAg˙ݙf<Vy -"FSdnН՝1EYmt۞ AF.?TeƠנ -6;Lgl{Ǣܢ2HUuϣ4cvФ)EYmåե<Q^sҦ@)6!^8^L^`^q^^^^^^^7Z^_0_I_V________ ``/`R`c```````a/a4a @kx 7KL`třϙ @]jf}Θ!4 +9h"4Nl*Iy*Lrw#<%1j-j:jHjVjkjjjjk$3'HV4X\t%Qcr%<uLcy:V[L Q y      ' b       !%!Q!d!t!!!!!"3"&(4;%?'( h`x````(h}}}} ~x~~~~~~~+e(GXw(vŁρԁblʂ)8v     -( -; -*0q     +$  - - P c ,4oy2`-0@Ḯք 8L.mvэ -RrώԎ&+>Rj/p{y{{0$ $11ao&o:oooooop5pQpeppppqq2qKqhqqqqqqrr2$$؂ *3Y]HQx4$҈5( &+:J6<)u     9 L z        6 B G d     *1Kj -@r"<h~&@Rn7DBP_o9F8D3AK[u'490'Y:<9K\|;<4Ph -<,-=[2= 6>H2A kkekkkl-lvlll&m>m?`{WW X9XXX Y7YYYZNZZZZZZ [@ ܭ#Ad!7D[.3PmB#$H$_$u$$$$$%%,%Q%i%%%%% &;&M&o&&&&&&C0ȩѩD DDE E7EKE]EmEEEEEF F\w}8[`@)BVy[(7>tNNNNNN\L )] -$;GNSw -Lo"/5?P^ttuu-uLubuvuuuuuvCvVvvvvvvSw_ToNsWsssss t@tnttttt`5Ea6NNNOO+OLOcOpOOOOO P$P.PoPPPPyQQQQQ)Rb(X o         - - -$ -1 -? -Q -r - - - - -& ` y  c, d(?Vgmze< fei,g! "-JgǮڮ)>GZuï֯ + $K4KMK JJ KK$ ZKqKKKK$)/MMMMM$!lLLLLLHLLLLM(2LBLoLLLLH%4|`````aa,a@aSafayaaa `$Y;YYY~YYYYYZ_ZZZZ2[D[{[[[ +V0V[VvV~VVVVVVVW2WFWeWzWWWWWWWVXvXXXXXYY H%%N5NENrNNNNNNOO.OAONO H&5[OkOOOOOOOPP.PAPNP H$S_c_s_____``)`<`O`b`o`hg~RRRRRRRS,SSSSSSSSS T5haaaab#bPbib}bbbbbbcc*cWcpcccccc d"d5dbdwddddd5eUeeeeee( M0MOMXMMM4TUkUUUUUUU V-TDTUT{TTTTTTU(UFUtJ +KK4KNKpKKKh]]]]]] ^1^@^k^z^^^^^__6_E_$)o!2Mcz/Mfy=O`}2Rew #6Nwp#:?\mIi=ObvHBQTk @^k>Rv8R](?bvLSp$7<Adqǔޔ1W~͕ݕRǖ.JO^~Η"6IN_sИCi͙ߙh>X{ $HUfpҝם3G[otݞ CHŸ0AVgȠ٠ 8=Nin}ɢޢ4JWwѣ6exҤ+G[oťץ>S`uԦ@)6#^:^N^b^s^^^^^^^7Z__2_K_X________` `1`T`e``````aa1a6a @kx 7KL`třϙ @]jf}Θ!4  -;j"6Pn,K{,Nty#<%1 j/jRj/p{y{{0$ $11a o(oj(BTp7DBPaq;H8D3AM]w)690)[:<9K\|;<4Ph +<,-=[2= 6>H2Ak kgkkkl/lxlll(m@m?`{WW X9XXX Y7YYYZNZZZZZZ [@ ޭ%Ad!7F]05Ro B#$J$a$w$$$$$%%.%S%k%%%%%&=&O&q&&&&&&C0ȩѩD DDE"E9EME_EoEEEEEF!F>FuFFFFF/GGGXGoGGGGGGH-HOHlHHHHH IICIaIIIIIIIJJ1JEJSJEXBBBC>CaCCCCD.D=DSDiDwDFPK\Mdxy—ɗۗ<FXG, ( 6OayH(sz|WWWWWWI8[fFVVVwVVVVVJ8grVVWW%WXWoWKHKZ\SeSSSTcTTT +UoUUUU:VLt*AFW\IE#MN8v̋O8 01Jd}P<׌ Q8ŊΊߊ:SZfR8()BS8SctủT44F[qU0;RmtV$####W(YipX8YXv +!2C[c}"5Z9i Ow(T&@^y:]bB+DX{[(7>tNNNNNN\L +] &=IPUy Nq $17AR^ttuu-uLubuvuuuuuvCvVvvvvvvSw_ToNsWsssss t@tnttttt`7Ga6NNNOO+OLOcOpOOOOO P$P.PoPPPPyQQQQQ)Rb(Z q         + + + +& +3 +A +S +t + + + + +( b {  c, d(?Vgmze< fei,g! "-JgǮڮ)>GZuï֯ ,5H[iv|ɰҰ%*BTxh<4@bbbbbccc0ci$a -a'a,a5a:ajt&&& '?'h'~'''''' (#(4(H(U(b(k((kIMXal@_'v'|'' (6(\(d((((mh?.V.b.o....../+/T/a/z////n`9N55616J6i6666666757Q7omq}888ph999::@:Q:m::::::::;; ;3;@;q? @ @.@;@S@n@@@@@@AA A$A5AMAZAwAAAB:BvBBBCCYCsCCCCCr;;</<<<o<<<<<<<=7=Y=k========>#>6>P>a>u>>>>.?;?@?O?]????s0M;];j;z;;;;;t(el8!828N8c8p8u _d7778v8XHoHHHHHHHHIhIIIIJJ8JUJJJwHO^^7n7777777x7CD=DXDDDDDEE$E6E^EEEEEEFF%FAFVFkFFFFFFFF'GGGGGGHH Hy))))))**.*F*Y*t*******+4+h+++++ ,,T,a,y,,,,,,--0-L-c-h------ ..'.5.zH00 -1H111111232P222222 3%3-3c3333I444445C5555556V6p66666{D///0'0G0\00000|((((((}0))/)V)k))~lI666'7a7p777777 8?8\8888899,9J9^9999999 :<:s:::::; ;A;;<)<N<k<<<<<<)=E=h=====>)>A>n>|>>>>-?A?f????@7@L@f@u@,ӭH\h8^4u4{44444444\2 5$5*575;5S5x5555dLc´״ )Hf˵*>_     !!)!f!!!!!"-"X"o"~""""!#&#3#=#q##<&@NUu4m 0>SnsiԼOchyν4B`<Kaο  $8ct2 -#)>mO^nc %328ARc˶'5mܷ>Riȸ<lʹYkp޺ߺ/\m{g{ *<BKn&6Rf|Mn})9`$DɐҐ"COgwב /49Vr4:Dfoɸ8U`/F]uº\L`NNNN OOO$O5O>OWOgO~OOO4@_{h{{{{{{|"|:|Z|w|||||}.}N}k}}}}}9~S~j~~~~~~)=b5Lpƀ 'Ae܁'<Mb  ;@hv0Rd+He -7<TwxXM` nn$%4Hzļ-FVoѽ#<FVx߾%)2\sVd[y"(FR|@*SXrd5Kԥݥ)69SanxEj*?R{ԓ $2G^nsÔȔ$Hlllllmm*m?mPmemmmmm -n,n1nEnWnvnnnnn(CJS"S%S=SOS87B7RGRqRRRRRVjӧ?OefѨ*7<AWerw|<&=T]svɪ֪6fYPiPPPPPPPP$Q5QBQaQ{QQQQQQR -RR.RLRQRsRR`\\,\9\Q\i\v\\\\\ ])]F]u]z]pieeff8fNf[fhffffff8g_gyggggg -hPMMMMN KKLL#L4Wg(A4\lƨڨ\rϩ`LQ AUlƂقNby~ȃ 38L^sƄۄ#PTlͅ,@EWp@[![>[][|[[\h\\\\\1nn o"o8oeo{ooooooopZpwppppq[qqqqqq2rtt0tRtztttttt'u7uFu]u}uuuuu1vEvJvbvvvTkkkkkk lll0l5lElWl\lll~ll$jjkk&kXr$rLrZrsrrrr;scsssssstt<r{)(V\_\u\\\\\\] ]5]Q]d]w]]]0 +Jaf$ikrkkkkzݙ0BTfyƚך$.AT^qћ1D^oҜ$6HZ$:C`e\/Db֎ 38555JJJJJJD0=P_nʈy}">8h#hNhkhwhhhh8ggggggh8fffg gAg\gsgn2mBmkmmmmmmn*nBn[nnnnnnnoo7oRoWonoooooooopp4p9pFpUpnppppppppq qq%qBq^qnqsqqqqqqr r$r8r=rTrhrmrrrrrrss-sAsXiiiiij*j>jPj_jzjjjjj<hhhhi;idieixiiiMQąFaVakad_u.......//)/6/d/t/////\J^c-z--------2.A.N.T.h.v. %*V+_+++$((((()!)4)C)L)k)))))%*D*T*d*x***++"+I+P8Ie,|,,,,,,,--!-1-F-U-hv//00)080F0`0q0000000001!1<+7++++,,,3,I,X,<Td{ֿ-J]aHET -'>Ui˹@anκ׺1I[z[Pagaxaaaaab2bFbgbbbbc)c=cYccccccccd=dTdjddddde*eReeeeeeee-f2fRfrffffff-gVgggzgggggh8hEhphhhhh -ii'i,iDitiiiiiii#j3j9jQjaj|jjjjjjk+k9k`:N`oLan@4HYg{hY>Ga{1Ke5Oi 9Sm #=Wq<6hMhSh`hyhhhhhh$KKL2L^L$06NN.NYNfN08A$7D@O\w-: 5 O "\.Eo$u (+AYkp&LS[dw { AJJJJJKK+K@KEKJKgKKKKLLOLdLyLLLLLLLMM0MHM\MpMMMMMMMNxyy,y>y]ysyyyyy -z&zTzgzzzzz{d{T_whwwww xxQxxxxxxdr888888"939Y9r99999990LUݦ!^n#5w%<K .w&/A":Wh-Ccq#7GdvA"Q"h"q""""""##*#V#j#|####Jږ2?$170u~&ESb%7HUZ'\8U(Et>"6Mdidy~=N 527OrCZl %U[u2f 9Mq$"(MM]\]z]]]]]]]]^^ ^,^s^~^^^0H_pdq GLkpx| 27X^^^_'_<_O_Y_z______ ``7` lmY} 5bt|4e|ģܣ 1B̤ͤ2Hafp}\ -!5FTew+9Pd¡ڡ1>CtȢޢ -:( 33393F333( -3333A4P4)7_m:^yň=^rۉ)p/1F1a1o1~11111122.282N222222x09Gcbԯ3`ŰҰ%6${{{W|k|(w||||||,}FOXj|aOOPP3PWPPPPPPPLQ]QlQQQQQQQ(RPRRRRRRS/SBSUSiS6(9=To#'Sns!-D9Pj(1~  ) = N _ z       -  ir2GbgHarv"6;cg2 ):e HV8Xv&@-2Maf#$0<'3aaaab"bJbbbb  7<; R z  +a'a,a5a:ajt&&&!'A'j''''''' (%(6(J(W(d(m((kIMXal@a'x'~'' (8(^(f((((mhA.X.d.q....../-/V/c/|////n`9N55 636L6k6666666777S7omq888ph999: :B:S:o::::::::;;";5;B;q?@!@0@=@U@p@@@@@@AA!A&A7AOA\AyAAAB<q<<<<<<< +=9=[=m========>%>8>R>c>w>>>>0?=?B?Q?_????s0O;_;l;|;;;;;t(el8#848P8e8r8u _d7778v8ZHqHHHHHHHHIjIIIIJJ:JWJJJwHO^`7p7777777x7DD?DZDDDDDEE&E8E`EEEEEEFF'FCFXFmFFFFFFFF)GGGGGGHH!Hy)))))) **0*H*[*v*******+6+j+++++,,V,c,{,,,,,, +--2-N-e-j-----...).7.zH00 1J111111252R222222 3'3/3e3333K444445E5555556X6r66666{D///0)0I0^00000|((((()}0 ))1)X)m))~lI666)7c7r777777 8A8^8888899.9L9`9999999":>:u:::::;";C;;<+<P<m<<<<<<+=G=j=====>+>C>p>~>>>>/?C?h????@9@N@h@w@,ӭH\h8`4w4}44444445\25&5,595=5U5z5555dNeĴٴ+Jh͵,>_     !!+!h!!!!!"/"Z"q"""""##(#5#?#s##<(BPWw4m!2@UpukּQej{н6Db>Mcп &:ev4  %+@oQ`pe'52:CTeͶ)7o޷@Tkʸ >n̹ [mr1^o}i},>DMp(8Th~Op)9`$DɐҐ"COgwב /49Vr4:Dfoɸ8U`/F]uº\L`NNNN OO O&O7O@OYOiOOOO4@a{j{{{{{{ +|$|<|\|y|||||}0}P}m}}}}};~U~l~~~~~~+?d7NrȀ)Cgށ)>Ob "=Bjx2Tf-Jg  9>VyzXM` nn>nLnjnnnnnnnnnoo|ձ*C۲!5eixϳ)@$%4Hzļ-FVoѽ#<FVx߾%)4^uXf]{$*HT~@ ,UZtd5Kԥݥ)69SanxEj*?R{ԓ $2G^nsÔȔ$Hlllllmm,mAmRmgmmmmm n.n3nGnYnxnnnnn(CJS"S%S=SOS87B7RGRqRRRRRVjӧ?OefѨ*7<AWerw|<&=T]svɪ֪6f[PkPPPPPPPP&Q7QDQcQ}QQQQQQR RR0RNRSRuRR`\ \.\;\S\k\x\\\\\]+]H]w]|]pieeff:fPf]fjffffff:gag{ggggg hPMMMMN KKL L%L4Wg(A4^nȨܨ^tѩbNS AWnȂۂPd{ʃ  5:N`uȄ݄%RVnυ.BGYr†@[![>[][|[[\h\\\\\1nn o$o:ogo}ooooooop\pyppppq]qqqqqq4rtt2tTt|tttttt)u9uHu_uuuuuu3vGvLvdvvvTkkkkkk ll l2l7lGlYl^lnlll$jjkk&kXr&rNr\rurrrr=sesssssstt<r{)(X\a\w\\\\\\]!]7]S]f]y]]]0 +Jaf$kktkkkkzݙ0BTfyƚך$.AT^qћ1D^oҜ$6HZ$:C`e\ 1Fd؎ 38555JJJJJJD 2?Rapʈy}">8h#hNhkhwhhhh8ggggggh8fffg gAg\gsgn2mBmkmmmmmmn*nBn[nnnnnnnoo7oRoWonoooooooopp4p9pFpUpnppppppppq qq%qBq^qnqsqqqqqqr r$r8r=rTrhrmrrrrrrss-sAsXiiiiij*j>jPj_jzjjjjj<hhhhi;idieixiiiMQąFaVakad_u......///+/8/f/v/////\J^e-|--------4.C.P.V.j.x. %*X+a+++$((((()#)6)E)N)m)))))'*F*V*f*z***++$+K+P8Ig,~,,,,,,,--#-3-H-W-hv//00+0:0H0b0s0000000011#1<+7++++ ,, ,5,K,Z,<Td{ֿ-J]aHET +'>Ui˹@anκ׺1I[z[Raiazaaaaab4bHbibbbbc+c?c[ccccccccd?dVdlddddde,eTeeeeeeee/f4fTftffffff/gXgig|ggggg h:hGhrhhhhh ii)i.iFiviiiiiii%j5j;jSjcj~jjjjjkk-k;k`:N`oLan@4HYg{hY>Ga{1Ke5Oi 9Sm #=Wq<8hOhUhbh{hhhhhh$KKL2L^L$06NN.NYNfN08A&9F@O\w-:  7 Q "\.Eo$u (+AYkp&LS[dw { AJJJJJK K-KBKGKLKiKKKK LLQLfL{LLLLLLLMM2MJM^MrMMMMMMMNxyy,y>y]ysyyyyy +z&zTzgzzzzz{d{T_whwwww xxQxxxxxxdr888888$959[9t99999990LUݦ!^n%7y'>M"0y(1C$<Yj/Ees%9IdvC"S"j"s""""""##,#X#l#~####Jږ2?$170w(GUd '9JW\)^:W*Gv@$8Ofkf{?P749QtE\n 'W]w4h ";Os$"(MMUx|]]>]\]z]]]]]]]]^^ ^,^s^~^^^0JardqINmrz~ 27X^^^_'_<_O_Y_z______ ``7` lo +[ 7dv|4e|ģܣ 1B̤ͤ2Hafp}\ +!5FTew+9Pd¡ڡ1>CtȢޢ -:( 353;3H333( +3333C4R4+9ao<`{Lj?`t݉+p11H1c1q11111112202:2P222222x2;Ied֯5bǰ԰'8${{{W|k|(w||||||,}FOXj|aOOPP5PYPPPPPPPNQ_QnQQQQQQQ*RRRRRRRRS1SDSWSkS6*;?Vq%)Upu#/F;Rl*3  + ? P a |        kt4IdiJctx $8=ei2"+<g"JX:Zx(B/4Och%&2<'3aaaab"bJbbbb  7<= T |  @ -*Piz P]nH_o& Lo4Ki . !T)M< /bg<Sc<@G]hmx@@@@@@@@aAAAAAAAB)BGBvBBX     -  ( H M u      $^gl}wwww x x6xDxgx}xxxx7yYy^yyyyyz&z3zjzyzzzzD{N{4BLKm[mmmmmmLVf֧)=Omqt},&xaaaaaaa0%.6?S˃8\0DXekr-@P*07;OTYL/?׃%LM`tBRbv;OT} 5Izԝ !2=PcyÞ,Phiϟٟ(N+BH[ -u~ +17Ge;Wv'>z%C[i $kqOdXdldzdd (,=B!uy"0BK'N>NZNaNxNNN#im8Ah$X]pg~.X]n%,em@Wmp&,nv -',w/EH[m(8_jycccccccd&dCd)PU -l - - - - - - -' < I \ n *Kc#Ef3Uv+=Mb, #o-D ߲ -)E³ev.|9Ĵߴ-H\IN_ζ.\ٷ9Y/,BYű0(||!}G}\}1(]d 2`$hhh(i5iRi[iriwiiiiiiijj34v؏40qϬ߬51:TbNJʋ0PȌ܌ 16Nq6LQav\pu7LvvvvvvwAw^w{www8x .JQcw|#5:Lf~9l 0Harw|:(UV%VIVdVxVVVVVVV.W ''Q'?0lu < [ n  @(  ;NA$ʱӱӲBHfo6BGC, +,Rk| P]nH_o& Lo4Ki . !T+O<1di<Sc<@G]hmx@@@@@@@@cAAAAAAAB+BIBxBBX     ! * J O w      $^gl}wwwwx"x8xFxixxxxx9y[y`yyyyyz(z5zlz{zzzzF{P{4BLMm]mmmmmnLXhا+?Qmqt},&xaaaaaaa0%.6?S˃8\2FZgmt/BR +,29=QV[L/?׃%LM`tBRbv;OT} 5Izԝ !2=PcyÞ,Phiϟٟ(N+BH[ +u~ +17Ge;Wv'>z%C[i $kqOdXdldzdd (,=B!uy"0BK)N@N\NcNzNNN#im8Ah$X]pi0Z_p%,em@Wmp&,nv +',w/EH[m(8_jycccccccd&dCd)PW +n + + + + + + ) > K ^ p *Kc#Ef3Uv+=Mb, #o-D ߲ +)E³ev.|9Ĵߴ-H\IN_ζ.\ٷ9Y/,D[DZ0(||!}G}\}1(]d 2`$hhh*i7iTi]itiyiiiiiiijj34v؏40qϬ߬53<VdɊ̋2Rʌތ 38Ps6LQax^rw7LvvvvvvwCw`w}www8x .JQcw|#5:Lf~9l 0Harw|:(UV'VKVfVzVVVVVVV0W>WJWhW~WWWWWXX3XUXmXXXXXXYY2Y?YLY]YlYYYYYZ$Z1ZlZZZ["[?[\[n[{[[[[[[\\'\;SSSSST6TGTVTuTTTTU$U1UYUmUUUUUU<a#####$$+$:$$$$ %;%P%U%f%w%%%% &&+&F&[&&&&&&&&=l,UmuC_q +(`5Sy-> ''S'?0lu" > ] p  @(   =PA$ʱӱӲBHfo6BGC, p•ՕD, FYE0g~̖Fxrdddd eDeteeeeef fff&f4fHf\fsfxfff \ No newline at end of file diff --git a/LT/OSMain/OSINC.ASZ b/LT/OSMain/OSINC.ASZ index 89a3e7e..1d9d7af 100644 --- a/LT/OSMain/OSINC.ASZ +++ b/LT/OSMain/OSINC.ASZ @@ -181,6 +181,7 @@ TSS_ANSWERS_TYPES: DU4 8 DUP(?); TSS_ANSWERS_DISPLAYED: DU4 ?; TSS_DBG: DU4 ?; TSS_POPUP: DU4 ?; +TSS_LOCALCHNL: DU4 ?; TSS_RMTCHNL: DU4 ?; TSS_USER_AUX0: DU4 ?; TSS_USER_AUX1: DU4 ?; diff --git a/LT/OSMain/SYSTEXT.CPZ b/LT/OSMain/SYSTEXT.CPZ index 8b23a8f..71e1f0b 100644 Binary files a/LT/OSMain/SYSTEXT.CPZ and b/LT/OSMain/SYSTEXT.CPZ differ diff --git a/LT/UTILS/GREP.CPZ b/LT/UTILS/GREP.CPZ index 15f0a0e..cbdb74f 100644 --- a/LT/UTILS/GREP.CPZ +++ b/LT/UTILS/GREP.CPZ @@ -173,7 +173,9 @@ public U8 FileOccurrences(I1 *pattern,I1 *wild=TEXT_FILE_MASK,I1 *flags="+r+i+l" LTDirEntry MCFindMatch(LTDirEntry *pattern,LTDirEntry *list) { while (list) { - if (!StrCmp(pattern->name,list->name) && pattern->attr==list->attr) + if (!StrCmp(pattern->name,list->name) && + (pattern->attr&~LT_ATTR_RESIDENT)== + list->attr&~LT_ATTR_RESIDENT) return list; list=list->next; } @@ -185,19 +187,23 @@ void MergeChkList(LTDirEntry *m1,LTDirEntry *m2,U8 *fuf_flags,U8 *df_flags) I8 i; LTDirEntry *tempm2; while (m1 && !(*df_flags & DF_ABORT_ALL_FILES)) { - tempm2=MCFindMatch(m1,m2); - if (!tempm2) - coutln "Does Not Exist:",m1->full_name; - else { - if (m1->attr & LT_ATTR_DIR) - MergeChkList(m1->sub,tempm2->sub,fuf_flags,df_flags); + if (!Bt(fuf_flags,FUf_JUST_TEXT_FILES) || + IsTextFile(m1->name) || + m1->attr & LT_ATTR_DIR) { + tempm2=MCFindMatch(m1,m2); + if (!tempm2) + coutln "Does Not Exist:",m1->full_name; else { - i=m1->datetime-tempm2->datetime; - if (AbsI8(i)>LTDATE_FREQ*2) { //Filedates can shift due to conversion - coutln m1->full_name; - if (Bt(fuf_flags,FUf_DIFF)) { - if (IsTextFile(m1->full_name)) - *df_flags=Diff(tempm2->full_name,m1->full_name,*df_flags); + if (m1->attr & LT_ATTR_DIR) + MergeChkList(m1->sub,tempm2->sub,fuf_flags,df_flags); + else { + i=m1->datetime-tempm2->datetime; + if (AbsI8(i)>LTDATE_FREQ*2) { //Filedates can shift due to conversion + coutln m1->full_name; + if (Bt(fuf_flags,FUf_DIFF)) { + if (IsTextFile(m1->full_name)) + *df_flags=Diff(tempm2->full_name,m1->full_name,*df_flags); + } } } } @@ -206,9 +212,13 @@ void MergeChkList(LTDirEntry *m1,LTDirEntry *m2,U8 *fuf_flags,U8 *df_flags) } } -public void MergeChk(I1 *dst_mask,I1 *src_mask,I1 *flags="+r") -//r=recurse -//d=diff +public void MergeChk( + I1 *dst_mask="/LT/*", + I1 *src_mask="/LT/*", + I1 *flags="+r") +//+r=recurse +//+d=diff +//+t=just text files { U8 df_flags=0; LTDirEntry *tempm1=NULL,*tempm2=NULL; @@ -223,48 +233,164 @@ public void MergeChk(I1 *dst_mask,I1 *src_mask,I1 *flags="+r") } +I1 *red_st="$$FG RED$$",*green_st="$$FG GREEN$$"; -void CommMergeChkList(U8 port,LTDirEntry *m1,LTDirEntry *m2,U8 *fuf_flags,U8 *df_flags) +void RmtMergeChkList(TssStruct *tss,LTChnl *chnl,LTDirEntry *m1,LTDirEntry *m2,U8 *fuf_flags,U8 *df_flags,I1 *cur_dir) { I8 i; LTDirEntry *tempm2; + I1 *full_name,*c1,*c2; while (m1 && !(*df_flags & DF_ABORT_ALL_FILES)) { - tempm2=MCFindMatch(m1,m2); - if (!tempm2) - coutln "Does Not Exist:",m1->name; - else { - if (m1->attr & LT_ATTR_DIR) - CommMergeChkList(port,m1->sub,tempm2->sub,fuf_flags,df_flags); - else { - i=m1->datetime-tempm2->datetime; - if (AbsI8(i)>LTDATE_FREQ*2) { //Filedates can shift due to conversion - coutln m1->name; - if (Bt(fuf_flags,FUf_DIFF)) { - if (IsTextFile(m1->name)) - *df_flags=Diff(tempm2->name,m1->name,*df_flags); + if (!Bt(fuf_flags,FUf_JUST_TEXT_FILES) || + IsTextFile(m1->name) || + m1->attr & LT_ATTR_DIR) { + tempm2=MCFindMatch(m1,m2); + if (!tempm2) { + coutln "Does Not Exist on Remote:",m1->name; + full_name=MAlloc(StrLen(cur_dir)+1+StrLen(m1->name)+1+1); + StrCpy(full_name,cur_dir); + StrCat(full_name,m1->name); + } else { + full_name=MAlloc(StrLen(cur_dir)+1+StrLen(tempm2->name)+1+1); + StrCpy(full_name,cur_dir); + StrCat(full_name,tempm2->name); + } + if (m1->attr & LT_ATTR_DIR) { + if (!tempm2) { + if (PopUpNoYes("MkDir on Remote?")) { + XTalk(tss,"MkDir(\"%s\");\r",full_name); + chnl->null_msg_cnt=0; + while (chnl->null_msg_cnt<2) + SwapInNext; + } + } + StrCat(full_name,"/"); + RmtMergeChkList(tss,chnl,m1->sub,tempm2->sub,fuf_flags,df_flags,full_name); + } else { + if (tempm2) { + i=m1->datetime-tempm2->datetime; + if (AbsI8(i)>LTDATE_FREQ*2) { //Filedates can shift due to conversion + if (i<0) { + c1=red_st; + c2=green_st; + } else { + c1=green_st; + c2=red_st; + } + PrintF("%s%h2D %h4T$$FG$$ %s%h2D %h4T$$FG$$\r\n %s\r\n\r\n", + c1,m1->datetime.date,m1->datetime.time, + c2,tempm2->datetime.date,tempm2->datetime.time, + m1->full_name); + if (PopUpNoYes("Sync?")) { + if (i<0) + XTalk(tss,"RmtRqstRxFile(\"%s\",\"%s\");\r", + full_name,m1->full_name); + else + XTalk(tss,"RmtRqstTxFile(\"%s\",\"%s\");\r", + full_name,m1->full_name); + chnl->null_msg_cnt=0; + while (chnl->null_msg_cnt<2) + SwapInNext; + } + } + } else { + if (PopUpNoYes("Sync?")) { + XTalk(tss,"RmtRqstTxFile(\"%s\",\"%s\");\r", + full_name,m1->full_name); + chnl->null_msg_cnt=0; + while (chnl->null_msg_cnt<2) + SwapInNext; } } } + Free(full_name); } m1=m1->next; } } +public void RmtMergeChkHost(I1 *dst_mask="/LT/*",I1 *flags="+r") +{ + LTDirEntry *tempm; + U8 size; + U1 *buf; + FlagsStruct f; + GetFFlags(&f,"ST_FILE_UTIL_FLAGS",flags); + tempm=FindFiles(dst_mask,&f.on); + buf=FlattenLTDirTree(tempm,&size); + RmtRqstRxBuf(buf,size); + Free(buf); + DelLTDirList(tempm); +} -//$BK,1$Not Done$BK,0$ -public void CommMergeChk(U8 port,I1 *dst_mask,I1 *src_mask,I1 *flags="+r") -//r=recurse -//d=diff +I1 *Progress1CB(Ltf *l,Ltf *user_data,LtfEntry *ll,TssStruct *mem_tss) +{ + I1 *st=MAlloc(16,mem_tss); + SPrintF(st,"%08X",progress1); + return st; +} + +public void RmtMergeChk(LTChnl *chnl, + I1 *dst_mask="/LT/*", + I1 *src_mask="/LT/*", + I1 *flags="+r+t") +//+r=recurse +//+d=diff +//+t=Just text files { U8 df_flags=0; LTDirEntry *tempm1=NULL,*tempm2=NULL; FlagsStruct f; + TssStruct *tss; + I1 *st,*st2; + Ltf *aux; + LtfEntry *ll; + + if (!chnl || !chnl->type) return; GetFFlags(&f,"ST_FILE_UTIL_FLAGS",flags); coutln "WARNING:This is based strictly on file dates."; - tempm1=FindFiles(src_mask,&f.on); - tempm2=FindFiles(dst_mask,&f.on); - CommMergeChkList(port,tempm1,tempm2,&f.on,&df_flags); - DelLTDirList(tempm1); - DelLTDirList(tempm2); + if (tempm1=FindFiles(src_mask,&f.on)) { + tss=Spawn(&UserCmdLine); + while (!Bt(&tss->task_flags,TSSf_IDLE)) + SwapInNext; + tss->window_top=Fs->window_top; + tss->window_bottom=(Fs->window_top+Fs->window_bottom)>>1-1; + Fs-> window_top=tss->window_bottom+3; + tss->window_right=Fs->window_right; + tss->window_left=Fs->window_left; + WindowToTop(Fs); + XTalk(tss,"TelnetGuestOpen(0x%08X);\r",chnl); + + aux=tss->aux_ltf; + LtfPutS(aux,"$$CM+BY,0,0$$"); + ll=LtfPutS(aux,"$$TX+DC+RD+LX+IV,\"00000000\"$$"); + ll->display_cb=&Progress1CB; + + XTalk(tss,"RmtMergeChkHost(\"%s\",\"%s\");\r",dst_mask,flags); + chnl->null_msg_cnt=0; + while (chnl->null_msg_cnt<2) + SwapInNext; + tempm2=UnflattenLTDirTree(chnl->rx_buf); + st =MAlloc(StrLen(dst_mask)+3); + st2=MAlloc(StrLen(dst_mask)+3); + StrCpy(st,dst_mask); + RemoveLastSeg(st,"/",st2); + if (!*st) { + Free(st); + st=NewString("./"); + } else + StrCat(st,"/"); + + RmtMergeChkList(tss,chnl,tempm1,tempm2,&f.on,&df_flags,st); + Free(st); + Free(st2); + DelLTDirList(tempm1); + DelLTDirList(tempm2); + XTalkString(tss,"Msg(MSG_KEY_DOWN,CH_CTRLB,SCF_CTRL+SCF_ALT);"); + Fs->window_top=tss->window_top; + Sleep(250); //allow shutdown of Guest channel + Kill(tss); + } } + \ No newline at end of file