Author: dteske
Date: Thu Mar 5 00:32:54 2015
New Revision: 279610
URL: https://svnweb.freebsd.org/changeset/base/279610
Log:
MFC r273068:
Rename awk(1) implementation of GNU awk's built-in asorti() function to
prevent fatal conflict should one-true-awk ever be replaced -- e.g., in
an appliance -- with GNU awk. NB: Renamed my implementation to _asorti()
Modified:
stable/10/usr.sbin/bsdconfig/includes/includes
stable/10/usr.sbin/bsdconfig/share/device.subr
stable/10/usr.sbin/bsdconfig/share/packages/index.subr
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsdconfig/includes/includes
==============================================================================
--- stable/10/usr.sbin/bsdconfig/includes/includes Thu Mar 5 00:29:58
2015 (r279609)
+++ stable/10/usr.sbin/bsdconfig/includes/includes Thu Mar 5 00:32:54
2015 (r279610)
@@ -69,7 +69,7 @@ show_include()
-v use_color=${USE_COLOR:-0} \
-v re="$pattern" \
-v show_desc=${SHOW_DESC:-0} '
- function asorti(src, dest)
+ function _asorti(src, dest)
{
k = nitems = 0;
@@ -120,7 +120,7 @@ show_include()
}
}
END {
- n = asorti(syntax, sorted_indices)
+ n = _asorti(syntax, sorted_indices)
for (i = 1; i <= n; i++)
printf "%s", syntax[sorted_indices[i]]
}' "$file" )
Modified: stable/10/usr.sbin/bsdconfig/share/device.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/share/device.subr Thu Mar 5 00:29:58
2015 (r279609)
+++ stable/10/usr.sbin/bsdconfig/share/device.subr Thu Mar 5 00:32:54
2015 (r279610)
@@ -1116,7 +1116,7 @@ f_device_shutdown()
f_device_sort_by_awk='
# Variables that should be defined on the invocation line:
# -v prop="property"
-function asorti(src, dest)
+function _asorti(src, dest)
{
k = nitems = 0
for (i in src) dest[++nitems] = i
@@ -1137,7 +1137,7 @@ function asorti(src, dest)
}
}
END {
- nitems = asorti(devices, devices_sorted)
+ nitems = _asorti(devices, devices_sorted)
for (i = 1; i <= nitems; i++) print devices[devices_sorted[i]]
}
'
Modified: stable/10/usr.sbin/bsdconfig/share/packages/index.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/share/packages/index.subr Thu Mar 5
00:29:58 2015 (r279609)
+++ stable/10/usr.sbin/bsdconfig/share/packages/index.subr Thu Mar 5
00:32:54 2015 (r279610)
@@ -241,7 +241,7 @@ f_index_read()
export msg_packages
eval "$( debug= f_getvar "$var_to_get" | awk -F'|' '
- function asorti(src, dest)
+ function _asorti(src, dest)
{
k = nitems = 0
@@ -292,7 +292,7 @@ f_index_read()
END {
print "_npkgs=" tpkgs # For convenience, total package count
- n = asorti(categories, categories_sorted)
+ n = _asorti(categories, categories_sorted)
# Produce package counts for each category
for (i = 1; i <= n; i++)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
