[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/17] linux-user, bsd-user: Preserve incoming order of environmen
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target |
Date: |
Tue, 13 Jun 2023 11:38:06 +0200 |
From: Andreas Schwab <schwab@suse.de>
Do not reverse the order of environment variables in the target environ
array relative to the incoming environ order. Some testsuites depend on a
specific order, even though it is not defined by any standard.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <mvmlejfsivd.fsf@suse.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
bsd-user/main.c | 10 +++++++++-
linux-user/main.c | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index cd8b2a670f..b597328118 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -295,8 +295,16 @@ int main(int argc, char **argv)
envlist = envlist_create();
- /* add current environment into the list */
+ /*
+ * add current environment into the list
+ * envlist_setenv adds to the front of the list; to preserve environ
+ * order add from back to front
+ */
for (wrk = environ; *wrk != NULL; wrk++) {
+ continue;
+ }
+ while (wrk != environ) {
+ wrk--;
(void) envlist_setenv(envlist, *wrk);
}
diff --git a/linux-user/main.c b/linux-user/main.c
index 5e6b2e1714..dba67ffa36 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -692,8 +692,16 @@ int main(int argc, char **argv, char **envp)
envlist = envlist_create();
- /* add current environment into the list */
+ /*
+ * add current environment into the list
+ * envlist_setenv adds to the front of the list; to preserve environ
+ * order add from back to front
+ */
for (wrk = environ; *wrk != NULL; wrk++) {
+ continue;
+ }
+ while (wrk != environ) {
+ wrk--;
(void) envlist_setenv(envlist, *wrk);
}
--
2.38.1
- [PULL 00/17] Misc patches for 2023-06-13, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target,
Philippe Mathieu-Daudé <=
- [PULL 02/17] cocoa: Fix warnings about invalid prototype declarations, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 03/17] util/cacheflush: Use declarations from <OSCacheControl.h> on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 05/17] accel/hvf: Report HV_DENIED error, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 04/17] util/cacheflush: Avoid possible redundant dcache flush on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 06/17] target/hppa/meson: Only build int_helper.o with system emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 07/17] target/i386/helper: Remove do_cpu_sipi() stub for user-mode emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 08/17] target/i386/helper: Shuffle do_cpu_init(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 09/17] target/i386: Rename helper template headers as '.h.inc', Philippe Mathieu-Daudé, 2023/06/13
- [PULL 10/17] hw/i2c: Enable an id for the pca954x devices, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 12/17] hw/scsi/megasas: Silent GCC duplicated-cond warning, Philippe Mathieu-Daudé, 2023/06/13