patches/glibc/2.12.1/910-typedef-caddr.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
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)
eha@2379
     1
diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
eha@2379
     2
--- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379
     3
+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
eha@2379
     4
@@ -114,7 +114,10 @@
eha@2379
     5
 #ifdef	__USE_BSD
eha@2379
     6
 # ifndef __daddr_t_defined
eha@2379
     7
 typedef __daddr_t daddr_t;
eha@2379
     8
+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379
     9
 typedef __caddr_t caddr_t;
eha@2379
    10
+#   define __caddr_t_defined
eha@2379
    11
+#  endif
eha@2379
    12
 #  define __daddr_t_defined
eha@2379
    13
 # endif
eha@2379
    14
 #endif
eha@2379
    15
diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
eha@2379
    16
--- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379
    17
+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
eha@2379
    18
@@ -80,7 +80,10 @@
eha@2379
    19
 #endif
eha@2379
    20
 #ifndef __daddr_t_defined
eha@2379
    21
 typedef __daddr_t daddr_t;
eha@2379
    22
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379
    23
 typedef __caddr_t caddr_t;
eha@2379
    24
+#  define __caddr_t_defined
eha@2379
    25
+# endif
eha@2379
    26
 # define __daddr_t_defined
eha@2379
    27
 #endif
eha@2379
    28