<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119177] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119177">119177</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-18 15:35:29 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: validate ui_message args, add quoting, simplify const proc in port client, patch by Gustaf Neumann
See https://lists.macosforge.org/pipermail/macports-dev/2014-April/026527.html.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (119176 => 119177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-04-18 22:29:55 UTC (rev 119176)
+++ trunk/base/src/macports1.0/macports.tcl 2014-04-18 22:35:29 UTC (rev 119177)
</span><span class="lines">@@ -205,6 +205,24 @@
</span><span class="cx">
</span><span class="cx"> proc ui_message {priority prefix phase args} {
</span><span class="cx"> global macports::channels ::debuglog macports::current_phase
</span><ins>+
+ #
+ # validate $args
+ #
+ switch [llength $args] {
+ 0 - 1 {}
+ 2 {
+ if {[lindex $args 0] ne {-nonewline}} {
+ set hint "error: when 5 arguments are given, 2nd last must be \"-newnewline\""
+ error "$hint\nusage: ui_message priority prefix phase ?-nonewline? string"
+ }
+ }
+ default {
+ set hint "error: too many arguments specified"
+ error "$hint\nusage: ui_message priority prefix phase ?-nonewline? string"
+ }
+ }
+
</ins><span class="cx"> foreach chan $macports::channels($priority) {
</span><span class="cx"> if {[info exists ::debuglog] && ($chan eq {debuglog})} {
</span><span class="cx"> set chan $::debuglog
</span><span class="lines">@@ -2669,7 +2687,7 @@
</span><span class="cx">
</span><span class="cx"> switch -- $matchstyle {
</span><span class="cx"> exact {
</span><del>- if {$case_sensitive eq yes} {
</del><ins>+ if {$case_sensitive eq "yes"} {
</ins><span class="cx"> set compres [string compare $pattern $target]
</span><span class="cx"> } else {
</span><span class="cx"> set compres [string compare -nocase $pattern $target]
</span><span class="lines">@@ -2677,14 +2695,14 @@
</span><span class="cx"> set matchres [expr {0 == $compres}]
</span><span class="cx"> }
</span><span class="cx"> glob {
</span><del>- if {$case_sensitive eq yes} {
</del><ins>+ if {$case_sensitive eq "yes"} {
</ins><span class="cx"> set matchres [string match $pattern $target]
</span><span class="cx"> } else {
</span><span class="cx"> set matchres [string match -nocase $pattern $target]
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> regexp {
</span><del>- if {$case_sensitive eq yes} {
</del><ins>+ if {$case_sensitive eq "yes"} {
</ins><span class="cx"> set matchres [regexp -- $pattern $target]
</span><span class="cx"> } else {
</span><span class="cx"> set matchres [regexp -nocase -- $pattern $target]
</span><span class="lines">@@ -4111,7 +4129,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[info exists uninstall_later] && $uninstall_later eq yes} {
</del><ins>+ if {[info exists uninstall_later] && $uninstall_later eq "yes"} {
</ins><span class="cx"> foreach i $ilist {
</span><span class="cx"> set version [lindex $i 1]
</span><span class="cx"> set revision [lindex $i 2]
</span><span class="lines">@@ -4556,7 +4574,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {$libarch_found eq false} {
</del><ins>+ if {$libarch_found eq "false"} {
</ins><span class="cx"> ui_debug "Missing architecture [machista::get_arch_name [$architecture cget -mat_arch]] in file $filepath"
</span><span class="cx"> if {[path_is_in_prefix $filepath]} {
</span><span class="cx"> ui_debug "Marking $bpath as broken"
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (119176 => 119177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2014-04-18 22:29:55 UTC (rev 119176)
+++ trunk/base/src/port/port.tcl 2014-04-18 22:35:29 UTC (rev 119177)
</span><span class="lines">@@ -149,18 +149,9 @@
</span><span class="cx"> # @param name variable name
</span><span class="cx"> # @param value constant variable value
</span><span class="cx"> proc const {name args} {
</span><del>- interp alias {} $name {} _const [expr $args]
</del><ins>+ proc $name {} [list return [expr $args]]
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-##
-# Helper function to define constants
-#
-# @see const
-proc _const value {
- return $value
-}
-
-
</del><span class="cx"> # Format an integer representing bytes using given units
</span><span class="cx"> proc bytesize {siz {unit {}} {format {%.3f}}} {
</span><span class="cx"> if {$unit == {}} {
</span><span class="lines">@@ -4909,7 +4900,7 @@
</span><span class="cx"> variable showTimeThreshold
</span><span class="cx"> variable showPercentageThreshold
</span><span class="cx">
</span><del>- if {$show eq yes} {
</del><ins>+ if {$show eq "yes"} {
</ins><span class="cx"> return yes
</span><span class="cx"> } else {
</span><span class="cx"> if {[expr {[clock milliseconds] - $startTime}] > $showTimeThreshold &&
</span><span class="lines">@@ -4946,7 +4937,7 @@
</span><span class="cx"> # the for loop is a simple hack because Tcl 8.4 doesn't have
</span><span class="cx"> # lassign
</span><span class="cx"> foreach {now total} $args {
</span><del>- if {[showProgress $now $total] eq yes} {
</del><ins>+ if {[showProgress $now $total] eq "yes"} {
</ins><span class="cx"> set barPrefix " "
</span><span class="cx"> set barPrefixLen [string length $barPrefix]
</span><span class="cx"> if {$total != 0} {
</span><span class="lines">@@ -4998,7 +4989,7 @@
</span><span class="cx"> # the for loop is a simple hack because Tcl 8.4 doesn't have
</span><span class="cx"> # lassign
</span><span class="cx"> foreach {type total now speed} $args {
</span><del>- if {[showProgress $now $total] eq yes} {
</del><ins>+ if {[showProgress $now $total] eq "yes"} {
</ins><span class="cx"> set barPrefix " "
</span><span class="cx"> set barPrefixLen [string length $barPrefix]
</span><span class="cx"> if {$total != 0} {
</span><span class="lines">@@ -5047,7 +5038,7 @@
</span><span class="cx"> # Subtract the width of the percentage output, also subtract the two
</span><span class="cx"> # characters [ and ] bounding the progress bar.
</span><span class="cx"> set percentageWidth 8
</span><del>- set barWidth [expr entier($width) - $percentageWidth - 2]
</del><ins>+ set barWidth [expr {entier($width) - $percentageWidth - 2}]
</ins><span class="cx">
</span><span class="cx"> # Map the range (0, $total) to (0, 4 * $width) where $width is the maximum
</span><span class="cx"> # numebr of characters to be printed for the progress bar. Multiply the
</span><span class="lines">@@ -5120,7 +5111,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Format the percentage using the space that has been reserved for it
</span><del>- set percentagesuffix [format " %[expr $percentageWidth - 3].1f %%" $percentage]
</del><ins>+ set percentagesuffix [format " %[expr {$percentageWidth - 3}].1f %%" $percentage]
</ins><span class="cx">
</span><span class="cx"> puts -nonewline "\r${prefix}\[${progressbar}\]${percentagesuffix}${suffix}"
</span><span class="cx"> flush stdout
</span><span class="lines">@@ -5286,7 +5277,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[isatty stdout]
</span><del>- && $portclient::progress::hasTermAnsiSend eq yes
</del><ins>+ && $portclient::progress::hasTermAnsiSend eq "yes"
</ins><span class="cx"> && (![info exists ui_options(ports_quiet)] || $ui_options(ports_quiet) ne "yes")} {
</span><span class="cx"> set ui_options(progress_download) portclient::progress::download
</span><span class="cx"> set ui_options(progress_generic) portclient::progress::generic
</span></span></pre>
</div>
</div>
</body>
</html>