[Swift-commit] r4074 - in SwiftApps/SwiftR/Swift: R exec

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-02-09 13:49:31 -0600 (Wed, 09 Feb 2011)
New Revision: 4074

Modified:
   SwiftApps/SwiftR/Swift/R/Fifo.R
   SwiftApps/SwiftR/Swift/exec/fifowrite
Log:
Fixed bug in no-timeout implementation of fifo and added error checking
to fifowrite script.


Modified: SwiftApps/SwiftR/Swift/R/Fifo.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Fifo.R	2011-02-09 19:38:14 UTC (rev 4073)
+++ SwiftApps/SwiftR/Swift/R/Fifo.R	2011-02-09 19:49:31 UTC (rev 4074)
@@ -27,7 +27,7 @@
 
 
     if (is.null(timeout)) {
-        cmdString <- bin
+        cmdString <- paste(bin, fifopath)
     }
     else {
         cmdString <- paste(bin, fifopath, "-t", timeout)

Modified: SwiftApps/SwiftR/Swift/exec/fifowrite
===================================================================
--- SwiftApps/SwiftR/Swift/exec/fifowrite	2011-02-09 19:38:14 UTC (rev 4073)
+++ SwiftApps/SwiftR/Swift/exec/fifowrite	2011-02-09 19:49:31 UTC (rev 4074)
@@ -6,6 +6,13 @@
 
 fifo=$1
 shift
+
+if [ ! -p $fifo ]
+then
+    echo $fifo is not a named pipe
+    exit 1
+fi
+
 timeout=0
 msg=""