patches/glibc/ports-2.10.1/180-resolv-dynamic.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)
yann@1625
     1
ripped from SuSE
yann@1625
     2
yann@1625
     3
if /etc/resolv.conf is updated, then make sure applications
yann@1625
     4
already running get the updated information.
yann@1625
     5
yann@1625
     6
http://bugs.gentoo.org/177416
yann@1625
     7
yann@1625
     8
diff -durN glibc-2.10.1.orig/resolv/res_libc.c glibc-2.10.1/resolv/res_libc.c
yann@1625
     9
--- glibc-2.10.1.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
yann@1625
    10
+++ glibc-2.10.1/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
yann@1625
    11
@@ -22,6 +22,7 @@
yann@1625
    12
 #include <arpa/nameser.h>
yann@1625
    13
 #include <resolv.h>
yann@1625
    14
 #include <bits/libc-lock.h>
yann@1625
    15
+#include <sys/stat.h>
yann@1625
    16
 
yann@1625
    17
 
yann@1625
    18
 /* The following bit is copied from res_data.c (where it is #ifdef'ed
yann@1625
    19
@@ -95,6 +96,20 @@
yann@1625
    20
 __res_maybe_init (res_state resp, int preinit)
yann@1625
    21
 {
yann@1625
    22
 	if (resp->options & RES_INIT) {
yann@1625
    23
+		static time_t last_mtime, last_check;
yann@1625
    24
+		time_t now;
yann@1625
    25
+		struct stat statbuf;
yann@1625
    26
+		
yann@1625
    27
+		time (&now);
yann@1625
    28
+		if (now != last_check) {
yann@1625
    29
+			last_check = now;
yann@1625
    30
+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
yann@1625
    31
+				last_mtime = statbuf.st_mtime;
yann@1625
    32
+				atomicinclock (lock);
yann@1625
    33
+				atomicinc (__res_initstamp);
yann@1625
    34
+				atomicincunlock (lock);
yann@1625
    35
+			}
yann@1625
    36
+		}
yann@1625
    37
 		if (__res_initstamp != resp->_u._ext.initstamp) {
yann@1625
    38
 			if (resp->nscount > 0)
yann@1625
    39
 				__res_iclose (resp, true);