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