chiark - git - mdw - termux-packages/blob - packages/zsh/Src-exec.c.patch

   1 diff -u -r ../zsh-5.3/Src/exec.c ./Src/exec.c
   2 --- ../zsh-5.3/Src/exec.c       2016-12-06 20:21:39.000000000 +0100
   3 +++ ./Src/exec.c        2017-07-21 00:51:47.226997418 +0200
   4 @@ -518,7 +518,7 @@
   5                     } else if (eno == ENOEXEC) {
   6                         argv[-1] = "sh";
   7                         winch_unblock();
   8 -                       execve("/bin/sh", argv - 1, newenvp);
   9 +                       execve("@TERMUX_PREFIX@/bin/sh", argv - 1, newenvp);
  10                     }
  11                 } else if (eno == ENOEXEC) {
  12                     for (t0 = 0; t0 != ct; t0++)
  13 @@ -527,7 +527,7 @@
  14                     if (t0 == ct) {
  15                         argv[-1] = "sh";
  16                         winch_unblock();
  17 -                       execve("/bin/sh", argv - 1, newenvp);
  18 +                       execve("@TERMUX_PREFIX@/bin/sh", argv - 1, newenvp);
  19                     }
  20                 }
  21             } else
  22 @@ -3295,9 +3295,12 @@
  23             holdintr();
  24  #ifdef HAVE_NICE
  25         /* Check if we should run background jobs at a lower priority. */
  26 -       if ((how & Z_ASYNC) && isset(BGNICE))
  27 -           if (nice(5) < 0)
  28 +       if ((how & Z_ASYNC) && isset(BGNICE)) {
  29 +           errno = 0;
  30 +           nice(5);
  31 +           if (errno != 0)
  32                 zwarn("nice(5) failed: %e", errno);
  33 +       }
  34  #endif /* HAVE_NICE */
  35
  36      } else if (is_cursh) {