Upgrade toybox to bf51dae965ff237007377edd93d44c4c682a7d26 am: e1babc2aa5 am: 838574aecf am: c914274bde

Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/2853461

Change-Id: I5a0e2e5185fa535e40d19ee9685175a8ad277081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 28 insertions, 33 deletions

diff --git a/METADATA b/METADATA
index f5227968..0c58934a 100644
--- a/METADATA
+++ b/METADATA
@@ -5,19 +5,16 @@
 name: "toybox"
 description: "Toybox: all-in-one Linux command line."
 third_party {
-  url {
-    type: HOMEPAGE
-    value: "https://landley.net/toybox/"
-  }
-  url {
-    type: GIT
-    value: "https://github.com/landley/toybox"
-  }
-  version: "7fac232b4d25e51372ee22512c92e724ce97734e"
   license_type: UNENCUMBERED
   last_upgrade_date {
     year: 2023
-    month: 11
-    day: 27
+    month: 12
+    day: 1
+  }
+  homepage: "https://landley.net/toybox/"
+  identifier {
+    type: "Git"
+    value: "https://github.com/landley/toybox"
+    version: "bf51dae965ff237007377edd93d44c4c682a7d26"
   }
 }
diff --git a/android/device/generated/help.h b/android/device/generated/help.h
index b1260a76..92d24bd2 100644
--- a/android/device/generated/help.h
+++ b/android/device/generated/help.h
@@ -210,7 +210,7 @@
 
 #define HELP_readahead "usage: readahead FILE...\n\nPreload files into disk cache."
 
-#define HELP_pwgen "usage: pwgen [-cAn0yrsBhC1v] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. When output is to tty produces\na screenfull to defeat shoulder surfing (pick one and clear the screen).\n\n-c  --capitalize                  Permit capital letters.\n-A  --no-capitalize               Don't include capital letters.\n-n  --numerals                    Permit numbers.\n-0  --no-numerals                 Don't include numbers.\n-y  --symbols                     Permit special characters ($#%...).\n-r <chars>  --remove=<chars>      Don't include the given characters.\n-s  --secure                      Generate more random passwords.\n-B  --ambiguous                   Avoid ambiguous characters (e.g. 0, O).\n-h  --help                        Print this help message.\n-C                                Print the output in columns.\n-1                                Print the output one line each.\n-v                                Don't include vowels."
+#define HELP_pwgen "usage: pwgen [-cAn0yrsBC1v] [-r CHARS] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. Default output to tty fills screen\nwith passwords to defeat shoulder surfing (pick one and clear the screen).\n\n-0	No numbers (--no-numerals)\n-1	Output one per line\n-A	No capital letters (--no-capitalize)\n-B	Avoid ambiguous characters like 0O and 1lI (--ambiguous)\n-C	Output in columns\n-c	Add capital letters (--capitalize)\n-n	Add numbers (--numerals)\n-r	Don't include the given CHARS (--remove)\n-v	No vowels.\n-y	Add punctuation (--symbols)"
 
 #define HELP_pwdx "usage: pwdx PID...\n\nPrint working directory of processes listed on command line."
 
diff --git a/android/linux/generated/help.h b/android/linux/generated/help.h
index 864fa6c2..057986d0 100644
--- a/android/linux/generated/help.h
+++ b/android/linux/generated/help.h
@@ -212,7 +212,7 @@
 
 #define HELP_readahead "usage: readahead FILE...\n\nPreload files into disk cache."
 
-#define HELP_pwgen "usage: pwgen [-cAn0yrsBhC1v] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. When output is to tty produces\na screenfull to defeat shoulder surfing (pick one and clear the screen).\n\n-c  --capitalize                  Permit capital letters.\n-A  --no-capitalize               Don't include capital letters.\n-n  --numerals                    Permit numbers.\n-0  --no-numerals                 Don't include numbers.\n-y  --symbols                     Permit special characters ($#%...).\n-r <chars>  --remove=<chars>      Don't include the given characters.\n-s  --secure                      Generate more random passwords.\n-B  --ambiguous                   Avoid ambiguous characters (e.g. 0, O).\n-h  --help                        Print this help message.\n-C                                Print the output in columns.\n-1                                Print the output one line each.\n-v                                Don't include vowels."
+#define HELP_pwgen "usage: pwgen [-cAn0yrsBC1v] [-r CHARS] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. Default output to tty fills screen\nwith passwords to defeat shoulder surfing (pick one and clear the screen).\n\n-0	No numbers (--no-numerals)\n-1	Output one per line\n-A	No capital letters (--no-capitalize)\n-B	Avoid ambiguous characters like 0O and 1lI (--ambiguous)\n-C	Output in columns\n-c	Add capital letters (--capitalize)\n-n	Add numbers (--numerals)\n-r	Don't include the given CHARS (--remove)\n-v	No vowels.\n-y	Add punctuation (--symbols)"
 
 #define HELP_pwdx "usage: pwdx PID...\n\nPrint working directory of processes listed on command line."
 
diff --git a/android/mac/generated/help.h b/android/mac/generated/help.h
index 864fa6c2..057986d0 100644
--- a/android/mac/generated/help.h
+++ b/android/mac/generated/help.h
@@ -212,7 +212,7 @@
 
 #define HELP_readahead "usage: readahead FILE...\n\nPreload files into disk cache."
 
-#define HELP_pwgen "usage: pwgen [-cAn0yrsBhC1v] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. When output is to tty produces\na screenfull to defeat shoulder surfing (pick one and clear the screen).\n\n-c  --capitalize                  Permit capital letters.\n-A  --no-capitalize               Don't include capital letters.\n-n  --numerals                    Permit numbers.\n-0  --no-numerals                 Don't include numbers.\n-y  --symbols                     Permit special characters ($#%...).\n-r <chars>  --remove=<chars>      Don't include the given characters.\n-s  --secure                      Generate more random passwords.\n-B  --ambiguous                   Avoid ambiguous characters (e.g. 0, O).\n-h  --help                        Print this help message.\n-C                                Print the output in columns.\n-1                                Print the output one line each.\n-v                                Don't include vowels."
+#define HELP_pwgen "usage: pwgen [-cAn0yrsBC1v] [-r CHARS] [LENGTH] [COUNT]\n\nGenerate human-readable random passwords. Default output to tty fills screen\nwith passwords to defeat shoulder surfing (pick one and clear the screen).\n\n-0	No numbers (--no-numerals)\n-1	Output one per line\n-A	No capital letters (--no-capitalize)\n-B	Avoid ambiguous characters like 0O and 1lI (--ambiguous)\n-C	Output in columns\n-c	Add capital letters (--capitalize)\n-n	Add numbers (--numerals)\n-r	Don't include the given CHARS (--remove)\n-v	No vowels.\n-y	Add punctuation (--symbols)"
 
 #define HELP_pwdx "usage: pwdx PID...\n\nPrint working directory of processes listed on command line."
 
diff --git a/toys/other/pwgen.c b/toys/other/pwgen.c
index 73627561..ded3df89 100644
--- a/toys/other/pwgen.c
+++ b/toys/other/pwgen.c
@@ -8,23 +8,21 @@ config PWGEN
   bool "pwgen"
   default y
   help
-    usage: pwgen [-cAn0yrsBhC1v] [LENGTH] [COUNT]
+    usage: pwgen [-cAn0yrsBC1v] [-r CHARS] [LENGTH] [COUNT]
 
-    Generate human-readable random passwords. When output is to tty produces
-    a screenfull to defeat shoulder surfing (pick one and clear the screen).
+    Generate human-readable random passwords. Default output to tty fills screen
+    with passwords to defeat shoulder surfing (pick one and clear the screen).
 
-    -c  --capitalize                  Permit capital letters.
-    -A  --no-capitalize               Don't include capital letters.
-    -n  --numerals                    Permit numbers.
-    -0  --no-numerals                 Don't include numbers.
-    -y  --symbols                     Permit special characters ($#%...).
-    -r <chars>  --remove=<chars>      Don't include the given characters.
-    -s  --secure                      Generate more random passwords.
-    -B  --ambiguous                   Avoid ambiguous characters (e.g. 0, O).
-    -h  --help                        Print this help message.
-    -C                                Print the output in columns.
-    -1                                Print the output one line each.
-    -v                                Don't include vowels.
+    -0	No numbers (--no-numerals)
+    -1	Output one per line
+    -A	No capital letters (--no-capitalize)
+    -B	Avoid ambiguous characters like 0O and 1lI (--ambiguous)
+    -C	Output in columns
+    -c	Add capital letters (--capitalize)
+    -n	Add numbers (--numerals)
+    -r	Don't include the given CHARS (--remove)
+    -v	No vowels.
+    -y	Add punctuation (--symbols)
 */
 
 #define FOR_pwgen
@@ -52,8 +50,8 @@ void pwgen_main(void)
     for (ii = 0; ii<length;) {
       // Don't fetch more random than necessary, give each byte 2 tries to fit
       if (!rand) xgetrandom(randbuf, rand = sizeof(randbuf));
-      c = 33+randbuf[--rand]%93; // remainder 69 makes >102 less likely
-      if (FLAG(s)) randbuf[rand] = 0;
+      c = 33+randbuf[--rand]%94; // remainder 67 makes >102 less likely
+      randbuf[rand] = 0;
 
       if (c>='A' && c<='Z') {
         if (FLAG(A)) continue;
diff --git a/toys/pending/strace.c b/toys/pending/strace.c
index 49ac2b69..24ec52a8 100644
--- a/toys/pending/strace.c
+++ b/toys/pending/strace.c
@@ -35,9 +35,9 @@ GLOBALS(
 
 // Syscall args from https://man7.org/linux/man-pages/man2/syscall.2.html
 // REG_ORDER is args 0-6, SYSCALL, RESULT
-#if defined(__ARM_EABI__)
+#if defined(__arm__)
 static const char REG_ORDER[] = {0,1,2,3,4,5,7,0};
-#elif defined(__ARM_ARCH) && __ARM_ARCH == 8
+#elif defined(__aarch64__)
 static const char REG_ORDER[] = {0,1,2,3,4,5,8,0};
 #elif defined(__i386__)
 // ebx,ecx,edx,esi,edi,ebp,orig_eax,eax