Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.20.1a/270-better_file_error.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13)
branch1.13
changeset 2847 c0bf2319af08
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
scripts: fix dumping execution backtrace

Dumping the backtrace has been broken since changeset #652e56d6d35a:
scripts: execute each steps in a subshell

We can spawn sub-sub-shells in some cases.

The way the fault handler works is to dump the backtrace, but to avoid
printing it once for every sub-shell (which could get quite confusing),
it simply exits when it detects that it is being run in a sub-shell,
leaving to the top-level shell the work to dump the backtrace.

Because each step is executed in its own sub-shell, the variable arrays
that contain the step name, the source file and line number, are lost
when exiting the per-step sub-shell.

Hence, the backtrace is currently limited to printing only the top-level
main procedure of the shell.

Fix this thus:
- when dumping the bckatraces for the steps & the functions, remember
it was dumped, and only dump it if it was not already dumped
- at the top-level shell, print the hints

Also, rename the top-level step label.

Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4193d6e6a17430a177fa88c287879c2c35e319f3) 
     1 #!/bin/sh -e

     2 ## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>

     3 ##

     4 ## All lines beginning with `## DP:' are a description of the patch.

     5 ## DP: Specify which filename is causing an error if the filename is a

     6 ## DP: directory. (#45832)

     7 

     8 if [ $# -ne 1 ]; then

     9     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"

    10     exit 1

    11 fi

    12 

    13 [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts

    14 patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

    15 

    16 case "$1" in

    17        -patch) patch $patch_opts -p1 < $0;;

    18        -unpatch) patch $patch_opts -p1 -R < $0;;

    19         *)

    20                 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"

    21                 exit 1;;

    22 esac

    23 

    24 exit 0

    25 

    26 @DPATCH@

    27 diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c

    28 

    29 diff -durN binutils-2.20.1.orig/bfd/opncls.c binutils-2.20.1/bfd/opncls.c

    30 --- binutils-2.20.1.orig/bfd/opncls.c	2010-01-14 11:48:22.000000000 +0100

    31 +++ binutils-2.20.1/bfd/opncls.c	2010-08-17 19:32:23.000000000 +0200

    32 @@ -183,6 +183,13 @@

    33  {

    34    bfd *nbfd;

    35    const bfd_target *target_vec;

    36 +  struct stat s;

    37 +

    38 +  if (stat (filename, &s) == 0)

    39 +    if (S_ISDIR(s.st_mode)) {

    40 +      bfd_set_error (bfd_error_file_not_recognized);

    41 +      return NULL;

    42 +    }

    43  

    44    nbfd = _bfd_new_bfd ();

    45    if (nbfd == NULL)
crosstool-ng