diff options
author | dteske <dteske@FreeBSD.org> | 2014-10-14 03:22:37 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2014-10-14 03:22:37 +0000 |
commit | 5db8e26837a7fa47fc57171c53acf155a7b9f235 (patch) | |
tree | e607828f53c820ee8020e20677fa90f2286ebdf6 /usr.sbin/bsdconfig | |
parent | a06acedacb7eb33cefef42e80530aed4cd2b9805 (diff) | |
download | FreeBSD-src-5db8e26837a7fa47fc57171c53acf155a7b9f235.zip FreeBSD-src-5db8e26837a7fa47fc57171c53acf155a7b9f235.tar.gz |
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()
MFC after: 3 days
X-MFC-to: stable/10, stable/9
Diffstat (limited to 'usr.sbin/bsdconfig')
-rwxr-xr-x | usr.sbin/bsdconfig/includes/includes | 4 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/share/device.subr | 4 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/share/packages/index.subr | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bsdconfig/includes/includes b/usr.sbin/bsdconfig/includes/includes index 7bd5312..6e9906f 100755 --- a/usr.sbin/bsdconfig/includes/includes +++ b/usr.sbin/bsdconfig/includes/includes @@ -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" ) diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr index 4e60d84..d95684d 100644 --- a/usr.sbin/bsdconfig/share/device.subr +++ b/usr.sbin/bsdconfig/share/device.subr @@ -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]] } ' diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr index 41934d4..f3c1713 100644 --- a/usr.sbin/bsdconfig/share/packages/index.subr +++ b/usr.sbin/bsdconfig/share/packages/index.subr @@ -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++) |