patches/uClibc/0.9.30/200-getline-already-declared.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)
titus@2627
     1
--- uClibc-0.9.30.orig/extra/scripts/unifdef.c	2008-04-28 01:10:00.000000000 +0200
titus@2627
     2
+++ uClibc-0.9.30/extra/scripts/unifdef.c	2011-08-21 09:42:21.000000000 +0200
titus@2627
     3
@@ -206,7 +206,7 @@
titus@2627
     4
 static void             error(const char *);
titus@2627
     5
 static int              findsym(const char *);
titus@2627
     6
 static void             flushline(bool);
titus@2627
     7
-static Linetype         getline(void);
titus@2627
     8
+static Linetype         getlinetype(void);
titus@2627
     9
 static Linetype         ifeval(const char **);
titus@2627
    10
 static void             ignoreoff(void);
titus@2627
    11
 static void             ignoreon(void);
titus@2627
    12
@@ -512,7 +512,7 @@
titus@2627
    13
 
titus@2627
    14
 	for (;;) {
titus@2627
    15
 		linenum++;
titus@2627
    16
-		lineval = getline();
titus@2627
    17
+		lineval = getlinetype();
titus@2627
    18
 		trans_table[ifstate[depth]][lineval]();
titus@2627
    19
 		debug("process %s -> %s depth %d",
titus@2627
    20
 		    linetype_name[lineval],
titus@2627
    21
@@ -526,7 +526,7 @@
titus@2627
    22
  * help from skipcomment().
titus@2627
    23
  */
titus@2627
    24
 static Linetype
titus@2627
    25
-getline(void)
titus@2627
    26
+getlinetype(void)
titus@2627
    27
 {
titus@2627
    28
 	const char *cp;
titus@2627
    29
 	int cursym;