From 3c08aa530dd76642b88a89ae4c2b3c9b9d0d05e5 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 21 Jul 2022 07:54:25 -0700 Subject: syrooting: remove two useless checks. * txr.c (sysroot_init): The value of TXR_REL_PATH already has the exe suffix on it if we are building for Windows. There is no need to try with EXE_SUFF tacked on to it. There is also no need to try PROG_NAME with or without the suffix. EXE_SUFF is the empty string on non-Windows platforms, so the two lines of code are equivalent. On Windows, PROG_NAME without the EXE_SUFF will not match; that maybe_sysroot call is a waste of CPU cycles. --- txr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/txr.c b/txr.c index 36750a8e..8fab8eae 100644 --- a/txr.c +++ b/txr.c @@ -335,10 +335,8 @@ static void sysroot_init(void) prog_dir = scat3(prog_dir, chr(psc[0]), null_string); if (!(maybe_sysroot(lit(TXR_REL_PATH)) || - maybe_sysroot(lit(TXR_REL_PATH EXE_SUFF)) || maybe_sysroot(substitute_basename(lit(TXR_REL_PATH), prog_path)) || (share_txr_stdlib = 0) || - maybe_sysroot(lit(PROG_NAME)) || maybe_sysroot(lit(PROG_NAME EXE_SUFF)))) { sysroot_path = prog_dir; -- cgit v1.2.3