<!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>[119685] trunk/base/src/port1.0/portutil.tcl</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/119685">119685</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-05-03 15:04:19 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: port1.0/portutil.tcl: Avoid eval, replace with {*} where necessary, use exec -ignorestderr</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (119684 => 119685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2014-05-03 22:01:47 UTC (rev 119684)
+++ trunk/base/src/port1.0/portutil.tcl 2014-05-03 22:04:19 UTC (rev 119685)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> }
</span><span class="cx"> set refcount [lindex $deprecated_options(${option}-replace) 1]
</span><span class="cx"> lset deprecated_options(${option}-replace) 1 [expr {$refcount + 1}]
</span><del>- return [eval handle_option-strsed $option $args]
</del><ins>+ return [handle_option-strsed $option {*}$args]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![info exists user_options($option)] && [info exists $option]} {
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> # Call the command.
</span><span class="cx"> set fullcmdstring "$command_prefix $cmdstring $command_suffix"
</span><span class="cx"> ui_debug "Executing command line: $fullcmdstring"
</span><del>- set code [catch {eval system $notty $nice \$fullcmdstring} result]
</del><ins>+ set code [catch {system {*}$notty {*}$nice $fullcmdstring} result]
</ins><span class="cx"> # Save variables in order to re-throw the same error code.
</span><span class="cx"> set errcode $::errorCode
</span><span class="cx"> set errinfo $::errorInfo
</span><span class="lines">@@ -988,7 +988,8 @@
</span><span class="cx"> set tmpfile [join [lrange $tmpfile 1 end]]
</span><span class="cx"> }
</span><span class="cx">
</span><del>- set cmdline $portutil::autoconf::sed_command
</del><ins>+ set cmdline {}
+ lappend cmdline $portutil::autoconf::sed_command
</ins><span class="cx"> if {$extended} {
</span><span class="cx"> if {$portutil::autoconf::sed_ext_flag eq "N/A"} {
</span><span class="cx"> ui_debug "sed extended regexp not available"
</span><span class="lines">@@ -999,13 +1000,13 @@
</span><span class="cx"> if {$suppress} {
</span><span class="cx"> lappend cmdline -n
</span><span class="cx"> }
</span><del>- set cmdline [concat $cmdline [list $pattern < $file >@ $tmpfd 2>@stderr]]
</del><ins>+ lappend cmdline $pattern "<$file" ">@$tmpfd"
</ins><span class="cx"> if {$locale ne ""} {
</span><span class="cx"> set env(LC_CTYPE) $locale
</span><span class="cx"> }
</span><span class="cx"> ui_info "$UI_PREFIX [format [msgcat::mc "Patching %s: %s"] [file tail $file] $pattern]"
</span><span class="cx"> ui_debug "Executing reinplace: $cmdline"
</span><del>- if {[catch {eval exec $cmdline} error]} {
</del><ins>+ if {[catch {exec -ignorestderr -- {*}$cmdline} error]} {
</ins><span class="cx"> global errorInfo
</span><span class="cx"> ui_debug "$errorInfo"
</span><span class="cx"> ui_error "reinplace: $error"
</span><span class="lines">@@ -1068,7 +1069,7 @@
</span><span class="cx"> # delete
</span><span class="cx"> # Wrapper for file delete -force
</span><span class="cx"> proc delete {args} {
</span><del>- eval file delete -force -- $args
</del><ins>+ file delete -force -- {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # touch
</span><span class="lines">@@ -1167,7 +1168,7 @@
</span><span class="cx"> # copy
</span><span class="cx"> # Wrapper for file copy
</span><span class="cx"> proc copy {args} {
</span><del>- eval file copy $args
</del><ins>+ file copy {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # move
</span><span class="lines">@@ -1196,7 +1197,7 @@
</span><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- eval file rename $options -- $args
</del><ins>+ file rename {*}$options -- {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # ln
</span><span class="lines">@@ -1506,7 +1507,7 @@
</span><span class="cx"> if {$result == 0} {
</span><span class="cx"> foreach pre [ditem_key $ditem pre] {
</span><span class="cx"> ui_debug "Executing $pre"
</span><del>- set result [catch {eval $pre $targetname} errstr]
</del><ins>+ set result [catch {$pre $targetname} errstr]
</ins><span class="cx"> # Save variables in order to re-throw the same error code.
</span><span class="cx"> set errcode $::errorCode
</span><span class="cx"> set errinfo $::errorInfo
</span><span class="lines">@@ -1516,7 +1517,7 @@
</span><span class="cx">
</span><span class="cx"> if {$result == 0} {
</span><span class="cx"> ui_debug "Executing $targetname ($portname)"
</span><del>- set result [catch {eval $procedure $targetname} errstr]
</del><ins>+ set result [catch {$procedure $targetname} errstr]
</ins><span class="cx"> # Save variables in order to re-throw the same error code.
</span><span class="cx"> set errcode $::errorCode
</span><span class="cx"> set errinfo $::errorInfo
</span><span class="lines">@@ -1525,7 +1526,7 @@
</span><span class="cx"> if {$result == 0} {
</span><span class="cx"> foreach post [ditem_key $ditem post] {
</span><span class="cx"> ui_debug "Executing $post"
</span><del>- set result [catch {eval $post $targetname} errstr]
</del><ins>+ set result [catch {$post $targetname} errstr]
</ins><span class="cx"> # Save variables in order to re-throw the same error code.
</span><span class="cx"> set errcode $::errorCode
</span><span class="cx"> set errinfo $::errorInfo
</span><span class="lines">@@ -1551,7 +1552,7 @@
</span><span class="cx"> if {[ditem_contains $ditem postrun] && $result == 0} {
</span><span class="cx"> set postrun [ditem_key $ditem postrun]
</span><span class="cx"> ui_debug "Executing $postrun"
</span><del>- set result [catch {eval $postrun $targetname} errstr]
</del><ins>+ set result [catch {$postrun $targetname} errstr]
</ins><span class="cx"> # Save variables in order to re-throw the same error code.
</span><span class="cx"> set errcode $::errorCode
</span><span class="cx"> set errinfo $::errorInfo
</span><span class="lines">@@ -2240,39 +2241,39 @@
</span><span class="cx"> makeuserproc userproc-post-${ident}-${target}-\${proc_index} \$args
</span><span class="cx"> "
</span><span class="cx"> }
</span><del>- eval ditem_append $ditem provides $args
</del><ins>+ ditem_append $ditem provides {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_requires {ditem args} {
</span><del>- eval ditem_append $ditem requires $args
</del><ins>+ ditem_append $ditem requires {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_uses {ditem args} {
</span><del>- eval ditem_append $ditem uses $args
</del><ins>+ ditem_append $ditem uses {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_deplist {ditem args} {
</span><del>- eval ditem_append $ditem deplist $args
</del><ins>+ ditem_append $ditem deplist {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_prerun {ditem args} {
</span><del>- eval ditem_append $ditem prerun $args
</del><ins>+ ditem_append $ditem prerun {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_postrun {ditem args} {
</span><del>- eval ditem_append $ditem postrun $args
</del><ins>+ ditem_append $ditem postrun {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_runtype {ditem args} {
</span><del>- eval ditem_append $ditem runtype $args
</del><ins>+ ditem_append $ditem runtype {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_state {ditem args} {
</span><del>- eval ditem_append $ditem state $args
</del><ins>+ ditem_append $ditem state {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc target_init {ditem args} {
</span><del>- eval ditem_append $ditem init $args
</del><ins>+ ditem_append $ditem init {*}$args
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ##### variant class #####
</span><span class="lines">@@ -2336,7 +2337,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> foreach username [array names args] {
</span><del>- eval adduser $username $args($username)
</del><ins>+ adduser $username {*}$args($username)
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2978,12 +2979,12 @@
</span><span class="cx"> setegid $egid
</span><span class="cx"> ui_debug "euid/egid changed to: [geteuid]/[getegid]"
</span><span class="cx"> ui_debug "setting attributes on $file"
</span><del>- eval file attributes {$file} $attributes
</del><ins>+ file attributes $file {*}$attributes
</ins><span class="cx"> setegid [uname_to_gid "$macportsuser"]
</span><span class="cx"> seteuid [name_to_uid "$macportsuser"]
</span><span class="cx"> ui_debug "euid/egid changed to: [geteuid]/[getegid]"
</span><span class="cx"> } else {
</span><del>- eval file attributes {$file} $attributes
</del><ins>+ file attributes $file {*}$attributes
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> # not root, so can't set owner/group
</span></span></pre>
</div>
</div>
</body>
</html>