Snap for 11432641 from 65eeedaae1 to 24Q2-release

Change-Id: I06fb186c3f397d7d0e685bfb761754dd152ce4c2
This commit is contained in:
Android Build Coastguard Worker 2024-02-10 02:16:52 +00:00
commit 239acfce97
3 changed files with 7 additions and 3 deletions

View File

@ -9,12 +9,12 @@ third_party {
last_upgrade_date {
year: 2024
month: 2
day: 7
day: 8
}
homepage: "https://landley.net/toybox/"
identifier {
type: "Git"
value: "https://github.com/landley/toybox"
version: "a57e42a386b04f27aa9c000d6425f13bb644c70c"
version: "0562629fa863a751e04e4a5979c76b1106e467d3"
}
}

View File

@ -424,6 +424,8 @@ static void show_notes(unsigned long offset, unsigned long size)
if (type == 1) {
printf("NT_VERSION\tAPI level %u", elf_int(&p)), j=1;
if (descsz>=132) printf(", NDK %.64s (%.64s)", p, p+64);
} else if (type == 5) {
printf("NT_PAD_SEGMENT\tpad_segment=%u", elf_int(&p)), j=1;
} else p -= 8;
} else if (notematch(namesz, &p, "CORE")) {
if (*(desc = nt_type_core(type)) != '0') printf("%s", desc), j=1;

View File

@ -1742,13 +1742,15 @@ static void top_common(
if (timeout<=now) timeout = new.whence+TT.top.d;
if (timeout<=now || timeout>now+TT.top.d) timeout = now+TT.top.d;
fflush(stdout);
// In batch mode, we ignore the keyboard.
if (FLAG(b)) {
msleep(timeout-now);
// Make an obvious gap between datasets.
xputs("\n\n");
break;
} else fflush(stdout);
}
recalc = 1;
i = scan_key_getsize(scratch, timeout-now, &TT.width, &TT.height);