From 3d337f4fa8fa2ba6dcd42f0d9101aca36aafc4cf Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sun, 29 Apr 2018 14:50:39 -0700
Subject: [PATCH] Change TFTPD text file EOL strategy

---
 PLASMA-SYS1.PO          | Bin 143360 -> 143360 bytes
 src/samplesrc/tftpd.pla |  14 ++++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/PLASMA-SYS1.PO b/PLASMA-SYS1.PO
index bfe2ce17837a647da3b7f08e64dd270dab471b1e..d99e2e4fbf28acc244a9128ea395081e3e4a68c2 100644
GIT binary patch
delta 901
zcmXYtUq}>D7{%}1xifQj)onLIMP?0mYsq1w)(4HKv_P;7L;HiEP`mDq?owz_i$0AP
zqL+NRgp3fTkx1D~X_AsChDaDfK?%Ktkz^QwS@y?3I{kV0anAX^bH9h%xyU;g`Tg2;
z-&_{y-4XSM$UE}ajKtRatn3tbB?)QwyGdUDqwGd{P^HhEV=-D5dPXcBA+Cz!wWOuk
zmyY^P=0Z+;$(amqF?}YhaBjuuI9+oZ;<Rkb2V!X^V;SxL?q;06@dQ<i#Uq3siaJ-D
zXb}xMcbe$MyrAj1<O%QgWwOkfU7k~f>`i#vO`lVcpw;TX)6EImi26)|4nbOzw3OC3
zgGqW4X(LI4?r09)nU!JN*=f-VwPqV}*-qM`XYC<{h+!}a#=!)b0<&OVA@Y@Ch_~=d
z;3M)XGG#<EW(YSln+3#HXgOoDlDTCSQ$&Ih(Tv$O#zZgt1Mm=ek_F@<X77<dgRhL(
z;ycU+*aTE1f~!R4sD{XcF91czVdOICerP%Lh#C-8&^DFHjOvyhsv^43?FK!d54!<$
zhv7%T7<ddO!8CR=c>ff-q}og@!>r)Y5AaJZl$$D-R8xem5#a%TjmTWh5Fuzp%MvBf
zN{xvsXtl;<4Z5}HHGp%V30U9)XhWw%3kVy&3v`1Xa0Byx+#L9`xQ8%;FbzKk=D|zM
zUSqZlzXCpiRqzFT!|o@JZo*TY2&NOM>j4?knGEZNvRLObqAOw#<|TSSltSxtCQd`^
z(Xl`Zz4PeVttei`k#=CCa78y{FUtM!w^1C#{w{VSU<^!vDewgQS=|tG@GsyO@Q!mP
zz1%JRT#@<QkOw#uhdF+W8{#PR1ow(MPDDL?Bla=A-PxC-h1b^>a-DdJrUuh=_BR>c
B^Sl56

delta 875
zcmXAhYe-Z<9L4{0@7z0g*GFqf8r?Os5L^~YO-0ZWQG~TbNrb>2tGkOXL`5VC(K=A}
zq!=?U23Az$2SdX!wIZk}q!$%N;0M!6Frp+$Fofu2AAX#3{^!iJO<HY}*6o^k&&4?E
zUcXYTqtCQt?gZzrMB)RM7A88J<f4U?q4;`MY_L~OAjk^RM=4_YNh{e}MNL_rXm*m1
zYsk?=s%x>D{2u2<kd3feXIBF&h@Ym2>Epb`Tq+vagxhUIc!QtV=2YiVh^=LAr>~J6
zfaHf*rH1G2Ay)tYn(8cuSO@&MFw19^&eJg4j<hPmGF&+cwM4%1%vPr?!b*(FWYSul
zQxUd1)}xc`2Ls?P7y%E!6YyLo^-j0t1pE}3LH>^X2g<lDO-{<iy>c0}h;voSU8<bx
zGRR4Wa68GlyaeA1`jCgYSB>K~iTn-x;1rWTVSa%Hun07RlrU_WWROe-tC7=@v!R=y
zh0r3yD@&nKgRA|9OC2<H*^cdb&;h#8UB>nnd_NcfgJ2lkNB0o#A44aM7?)EpU+~c!
zm^aeYf?=see8^0a9K@NVJf^L(OfLQK8%(ZpOkL)o+XBi!1qgr|P>an@(<>X{_ktGC
z3Xb3|O<Nv^KMUUpe=Ua43;Mtyj`wgJg?|BFgSTJ|d_XsjPd~zc0@KJdrdM&nl@Mvl
zEi9EFbm<YKRtT?5f#wP>^Pz><RDb|>+pw#~u1=8L0b+YF2n$;s#aO~0!|((Kr%`r-
zF3=6Gg6rsege`mF2jGYB?ko1Q!lmYfu6`qXEiN-GQkj-5eb9|oqRh2O7Qz=>wkoyO
f(3|&TFRMKIKXvvsv*pg2W_IX;N6WhzWzYTs8f@_N

diff --git a/src/samplesrc/tftpd.pla b/src/samplesrc/tftpd.pla
index ad307c3..f73c113 100644
--- a/src/samplesrc/tftpd.pla
+++ b/src/samplesrc/tftpd.pla
@@ -191,7 +191,7 @@ def readUDP(ipsrc, portsrc, data, len, param)
             fin
             if param == 512 // Size of initial read
                 param = fileio:read(ref, buff+datBytes, 512)
-                if netscii
+                if type == $04 // TXT type
                     xlat($0D, $0A, buff+datBytes, param)
                 fin
                 block++
@@ -228,7 +228,7 @@ def writeUDP(ipsrc, portsrc, data, len, param)
                 break
             fin
             len = len - t_datPkt
-            if netscii
+            if type == $04 // TXT type
                 xlat($0A, $0D, data+datBytes, len)
             fin
             if fileio:write(ref, data+datBytes, len) <> len
@@ -259,6 +259,8 @@ def writeUDP(ipsrc, portsrc, data, len, param)
     return 0
 end
 def servUDP(ipsrc, portsrc, data, len, param)
+    byte info[24]
+    
     when *data
         is RRQ // Read request
             //
@@ -284,12 +286,16 @@ def servUDP(ipsrc, portsrc, data, len, param)
                 iNet:sendUDP(portTFTP, ipsrc, portsrc, @tftpError, t_errPkt)
                 return 0
             fin
+            info.0 = $0A
+            info:1 = @filename
+            syscall($C4, @info)
+            type = info.4
             puts("Reading file: "); puts(@filename); putln
             TID              = (TID + TID_INC) | $1000
             block            = 1
             buff=>datBlock   = swab(block)
             len = fileio:read(ref, buff+datBytes, 512)
-            if netscii
+            if type == $04 // TXT type
                 xlat($0D, $0A, buff+datBytes, 512)
             fin
             portTID = iNet:openUDP(TID, @readUDP, len)
@@ -339,7 +345,7 @@ end
 if !iNet:initIP()
     return -1
 fin
-puts("TFTP Server Version 0.2\n")
+puts("TFTP Server Version 0.1\n")
 portTFTP = iNet:openUDP(TFTP_PORT, @servUDP, 0)
 //
 // Alloc aligned file/io buffers