[openfirmware] r1660 - cpu/x86/pc/olpc/via
svn at openfirmware.info
svn at openfirmware.info
Mon Jan 11 21:43:51 CET 2010
Author: pgf
Date: 2010-01-11 21:43:51 +0100 (Mon, 11 Jan 2010)
New Revision: 1660
Modified:
cpu/x86/pc/olpc/via/factory.fth
Log:
improve messaging surrounding the server protocol. in particular,
remove the "pre-check" for the rename target, since it causes
extra "SMB Error" messages regarding the (usually) nonexistent file.
Modified: cpu/x86/pc/olpc/via/factory.fth
===================================================================
--- cpu/x86/pc/olpc/via/factory.fth 2010-01-11 08:06:23 UTC (rev 1659)
+++ cpu/x86/pc/olpc/via/factory.fth 2010-01-11 20:43:51 UTC (rev 1660)
@@ -69,22 +69,15 @@
: submit-file ( subdir$ -- )
" flush" $call-cifs abort" CIFS flush failed"
" do-close" $call-cifs abort" CIFS do-close failed"
+ ." Creating " 2dup type ." file" cr
tempname$ 2swap " %s\\%s" sprintf ( new-name$ )
-
- \ Check for preexisting destination file
- 2dup 0 " do-open" $call-cifs 0= if ( new-name$ )
- " do-close" $call-cifs drop ( new-name$ )
- ." Error: " type ." already exists on the server" cr ( )
- tempname$ $delete drop ( )
- abort
- then ( new-name$ )
-
- tempname$ 2swap " $rename" $call-cifs abort" CIFS rename failed"
+ tempname$ 2swap " $rename" $call-cifs abort" CIFS rename failed. Server program not running?"
;
: get-response ( subdir$ -- adr len )
tempname$ 2swap " %s\\%s" sprintf ( response-name$ )
d# 10 0 do ( response-name$ )
d# 1000 ms ( response-name$ )
+ ." Looking for response..." cr
2dup 0 " do-open" $call-cifs 0= if ( response-name$ )
2drop ( )
" size" $call-cifs ( d.size )
More information about the openfirmware
mailing list