File: nsis-no-underscore.patch

package info (click to toggle)
firefox 147.0.3-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,683,320 kB
  • sloc: cpp: 7,607,359; javascript: 6,533,295; ansic: 3,775,223; python: 1,415,500; xml: 634,561; asm: 438,949; java: 186,241; sh: 62,752; makefile: 18,079; objc: 13,092; perl: 12,808; yacc: 4,583; cs: 3,846; pascal: 3,448; lex: 1,720; ruby: 1,003; php: 436; lisp: 258; awk: 247; sql: 66; sed: 54; csh: 10; exp: 6
file content (34 lines) | stat: -rw-r--r-- 1,460 bytes parent folder | download | duplicates (20)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
The `_` environment variable is a variable that is set by bash and some other
shells to point to the executable they use when executing a command. That is,
when executing `foo` from the command line, the shell sets `_` to
`/usr/bin/foo` (assuming that's where foo is).

However, nothing else does the same, so when e.g. a python program uses
`subprocess.Popen` to run another program, it doesn't set `_`. Worse, if that
python program itself was invoked from a shell, `_` would be set to e.g.
`/usr/bin/python3`.

So when nsis is invoked from a program that is not a shell, but the process
ancestry has a process that was a shell, `_` may be set to the first
intermediary program rather than nsis, which defeats nsis's assumption that `_`
would contain the nsis path. Ironically, nsis also has more reliable fallbacks
(using e.g.  /proc/self/exe), but somehow prefers `_`.

We remove the reliance of `_` entirely, for simplicity's sake.


diff -ruN nsis-3.07-src.orig/Source/util.cpp nsis-3.07-src/Source/util.cpp
--- nsis-3.07-src.orig/Source/util.cpp	2021-09-02 09:25:48.489016918 +0900
+++ nsis-3.07-src/Source/util.cpp	2021-09-02 09:26:21.158814484 +0900
@@ -810,10 +810,7 @@
   assert(rc == 0);
   return tstring(CtoTString(temp_buf));
 #else /* Linux/BSD/POSIX/etc */
-  const TCHAR *envpath = _tgetenv(_T("_"));
-  if (envpath)
-    return get_full_path(envpath);
-  else {
+  {
     char *path = NULL, *pathtmp;
     size_t len = 100;
     int nchars;