devel/libexecinfo/libexecinfo.2007-01-31T225936Z.diff

diff -ruN /usr/ports/devel/libexecinfo/files/patch-execinfo.c ./libexecinfo/files/patch-execinfo.c
--- /usr/ports/devel/libexecinfo/files/patch-execinfo.c Wed Dec 31 16:00:00 1969
+++ ./libexecinfo/files/patch-execinfo.c        Wed Feb  9 17:00:15 2005
@@ -0,0 +1,45 @@
+--- execinfo.c.orig    Sun Jul 18 22:21:09 2004
++++ execinfo.c Wed Feb  9 16:56:51 2005
+@@ -78,7 +78,6 @@
+     rval = malloc(clen);
+     if (rval == NULL)
+         return NULL;
+-    (char **)cp = &(rval[size]);
+     for (i = 0; i < size; i++) {
+         if (dladdr(buffer[i], &info) != 0) {
+             if (info.dli_sname == NULL)
+@@ -92,14 +91,14 @@
+                    2 +                      /* " <" */
+                    strlen(info.dli_sname) + /* "function" */
+                    1 +                      /* "+" */
+-                   D10(offset) +            /* "offset */
++                   10 +                     /* "offset */
+                    5 +                      /* "> at " */
+                    strlen(info.dli_fname) + /* "filename" */
+                    1;                       /* "\0" */
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p <%s+%d> at %s",
++            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
+               buffer[i], info.dli_sname, offset, info.dli_fname);
+         } else {
+             alen = 2 +                      /* "0x" */
+@@ -108,11 +107,14 @@
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p", buffer[i]);
++            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
+         }
+-        rval[i] = cp;
+-        cp += alen;
++        rval[i] = (char *) clen;
++        clen += alen;
+     }
++
++    for (i = 0; i < size; i++)
++        rval[i] += (int) rval;
+ 
+     return rval;
+ }
Revision:	494
Committed:	2012-02-19T14:53:40-08:00 (13 years, 4 months ago) by douglas
Original Path:	*freebsd/diff/devel/libexecinfo/libexecinfo.2007-01-31T22:59:36Z.diff*
File size:	1964 byte(s)
Log Message:	Move shar and diff files into their own fancy directory structures.
#	User	Rev	Content
1	douglas	2	diff -ruN /usr/ports/devel/libexecinfo/files/patch-execinfo.c ./libexecinfo/files/patch-execinfo.c
2			--- /usr/ports/devel/libexecinfo/files/patch-execinfo.c Wed Dec 31 16:00:00 1969
3			+++ ./libexecinfo/files/patch-execinfo.c Wed Feb 9 17:00:15 2005
4			@@ -0,0 +1,45 @@
5			+--- execinfo.c.orig Sun Jul 18 22:21:09 2004
6			++++ execinfo.c Wed Feb 9 16:56:51 2005
7			+@@ -78,7 +78,6 @@
8			+ rval = malloc(clen);
9			+ if (rval == NULL)
10			+ return NULL;
11			+- (char **)cp = &(rval[size]);
12			+ for (i = 0; i < size; i++) {
13			+ if (dladdr(buffer[i], &info) != 0) {
14			+ if (info.dli_sname == NULL)
15			+@@ -92,14 +91,14 @@
16			+ 2 + /* " <" */
17			+ strlen(info.dli_sname) + /* "function" */
18			+ 1 + /* "+" */
19			+- D10(offset) + /* "offset */
20			++ 10 + /* "offset */
21			+ 5 + /* "> at " */
22			+ strlen(info.dli_fname) + /* "filename" */
23			+ 1; /* "\0" */
24			+ rval = realloc_safe(rval, clen + alen);
25			+ if (rval == NULL)
26			+ return NULL;
27			+- snprintf(cp, alen, "%p <%s+%d> at %s",
28			++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
29			+ buffer[i], info.dli_sname, offset, info.dli_fname);
30			+ } else {
31			+ alen = 2 + /* "0x" */
32			+@@ -108,11 +107,14 @@
33			+ rval = realloc_safe(rval, clen + alen);
34			+ if (rval == NULL)
35			+ return NULL;
36			+- snprintf(cp, alen, "%p", buffer[i]);
37			++ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
38			+ }
39			+- rval[i] = cp;
40			+- cp += alen;
41			++ rval[i] = (char *) clen;
42			++ clen += alen;
43			+ }
44			++
45			++ for (i = 0; i < size; i++)
46			++ rval[i] += (int) rval;
47			+
48			+ return rval;
49			+ }