Skip to content

Improve support for embedded systems like OpenWrt #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xwang1498 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve support for embedded systems like OpenWrt #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7e4e99
Use bash to find terminal size if stty and tput fail
xwang1498 May 31, 2025
69ac874
Add support for Busybox ping, which outputs slightly differently
xwang1498 May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions prettyping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ function get_terminal_size(SIZE, SIZEA, HAS_DETECTED, CMD) {
HAS_DETECTED = 0

CMD = "stty -f /dev/tty size 2> /dev/null"

if ( (CMD | getline SIZE) == 1 ) {
split(SIZE, SIZEA, " ")
LINES = int(SIZEA[1])
Expand All @@ -270,21 +269,32 @@ function get_terminal_size(SIZE, SIZEA, HAS_DETECTED, CMD) {
close(CMD)

if ( HAS_DETECTED == 0 ) {
CMD = "tput lines"
CMD = "tput lines 2> /dev/null"
if ( (CMD | getline SIZE) == 1 ) {
LINES = int(SIZE)
HAS_DETECTED = 1
}
close(CMD)

CMD = "tput cols"
CMD = "tput cols 2> /dev/null"
if ( (CMD | getline SIZE) == 1 ) {
COLUMNS = int(SIZE)
HAS_DETECTED = 1
}
close(CMD)
}

if ( HAS_DETECTED == 0 ) {
CMD = "bash -i -c \"echo \\$LINES \\$COLUMNS\" 2> /dev/null"
while ( (CMD | getline SIZE) == 1) {
split(SIZE, SIZEA, " ")
LINES = int(SIZEA[1])
COLUMNS = int(SIZEA[2])
HAS_DETECTED = 1
}
close(CMD)
}

if ( int('"${OVERRIDE_COLUMNS}"') ) { COLUMNS = int('"${OVERRIDE_COLUMNS}"') }
if ( int('"${OVERRIDE_LINES}"') ) { LINES = int('"${OVERRIDE_LINES}"') }
}
Expand Down Expand Up @@ -766,7 +776,7 @@ BEGIN {
############################################################
# Main loop
{
if ( $0 ~ /^[0-9]+ bytes from .*[:,] icmp_[rs]eq=[0-9]+ (ttl|hlim)=[0-9]+ time=[0-9.]+ *ms/ ) {
if ( $0 ~ /^[0-9]+ bytes from .*[:,] (icmp_)?[rs]eq=[0-9]+ (ttl|hlim)=[0-9]+ time=[0-9.]+ *ms/ ) {
# Sample line from ping:
# 64 bytes from 8.8.8.8: icmp_seq=1 ttl=49 time=184 ms
if ( other_line_times >= 2 ) {
Expand Down