Changeset 1452 for trunk/base

Timestamp:

Dec 18, 2002, 3:43:18 AM (21 years ago)

Author:

kevin

Message:

Add channel parameter to ui_puts to select between stderr and stdout.

Location:

trunk/base/src

Files:

• darwinports1.0/darwinportsui.tcl (modified) (6 diffs)
• port1.0/portutil.tcl (modified) (1 diff)

trunk/base/src/darwinports1.0/darwinportsui.tcl

@@ -109 +109 @@
 # must pass "-nonewline" as the second argument.
 
-proc ui_puts {str {nonl ""}} {
+proc ui_puts {chan str {nonl ""}} {
     if ![ui_enabled] return
 
     if {$nonl == "-nonewline"} {
-        puts -nonewline stdout "$str"
-        flush stdout
+        puts -nonewline $chan "$str"
+        flush $chan
     } else {
-        puts "$str"
+        puts $chan "$str"
     }
 }
@@ -134 +134 @@
 
     if [isset ports_verbose] {
-        ui_puts "$str" $nonl
+        ui_puts stdout "$str" $nonl
     }
 }
@@ -143 +143 @@
 
     if ![isset ports_quiet] {
-        ui_puts "$str" $nonl
+        ui_puts stdout "$str" $nonl
     }
 }
@@ -149 +149 @@
 # Output message unconditionally as an error message.
 proc ui_error {str} {
-    ui_puts "Error: $str"
+    ui_puts stderr "Error: $str"
 }
 
@@ -173 +173 @@
     set satisfaction no
     while {$satisfaction == "no"} {
-        ui_puts $promptstr -nonewline
+        ui_puts stdout $promptstr -nonewline
         if {[ui_gets mystr] == 0} {
             if {[string length $defvalue] > 0} {
@@ -199 +199 @@
 # "promptstr".  There is no return value.
 proc ui_confirm {promptstr} {
-    ui_puts "$promptstr" -nonewline
+    ui_puts stdout "$promptstr" -nonewline
     ui_gets garbagestr
 }

trunk/base/src/port1.0/portutil.tcl

@@ -622 +622 @@
     if [catch {flock $fd -exclusive -noblock} result] {
         if {"$result" == "EAGAIN"} {
-            ui_puts "Waiting for lock on $statefile"
+            ui_msg "Waiting for lock on $statefile"
         } elseif {"$result" == "EOPNOTSUPP"} {
             # Locking not supported, just return