diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2004-11-07 15:05:08 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2004-11-07 15:05:08 +0000 |
| commit | 8a8ea3ebe0dfe7069a03796eaf19db1a12b9a537 (patch) | |
| tree | 95872a40796659b4cd086c5acc288a91cdaa2209 /src | |
| parent | header fixes. (diff) | |
| download | portage-cvs-8a8ea3ebe0dfe7069a03796eaf19db1a12b9a537.tar.gz portage-cvs-8a8ea3ebe0dfe7069a03796eaf19db1a12b9a537.tar.bz2 portage-cvs-8a8ea3ebe0dfe7069a03796eaf19db1a12b9a537.zip | |
bug #70351, compilation failure.
Diffstat (limited to 'src')
| -rw-r--r-- | src/sandbox-1.1/ChangeLog | 6 | ||||
| -rw-r--r-- | src/sandbox-1.1/libsandbox.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/sandbox-1.1/ChangeLog b/src/sandbox-1.1/ChangeLog index 394fddf..8d88dc2 100644 --- a/src/sandbox-1.1/ChangeLog +++ b/src/sandbox-1.1/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Path Sandbox # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.38 2004/11/03 13:15:59 ferringb Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.39 2004/11/07 15:05:07 ferringb Exp $ + + 07 Nov 2004; Brian Harring <ferringb@gentoo.org> libsandbox.c: c99 standard, + (think it was at least) allows intermixing of code and data segments. bug #70351 + should be fixed by this. 03 Nov 2004; Brian Harring <ferringb@gentoo.org> libsandbox.c, sandbox_futils.c: futils fix from bug #65201 via solar, and libsandbox log path checks via #69137 diff --git a/src/sandbox-1.1/libsandbox.c b/src/sandbox-1.1/libsandbox.c index 8a8fbe3..632bb5d 100644 --- a/src/sandbox-1.1/libsandbox.c +++ b/src/sandbox-1.1/libsandbox.c @@ -25,7 +25,7 @@ * as some of the InstallWatch code was used. * * - * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.23 2004/11/03 13:15:59 ferringb Exp $ + * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.24 2004/11/07 15:05:08 ferringb Exp $ * */ @@ -1171,6 +1171,7 @@ check_syscall(sbcontext_t * sbcontext, const char *func, const char *file) char *debug_log_path = NULL; int debug_log_file = 0; char buffer[512]; + char *dpath = NULL; init_wrappers(); @@ -1207,7 +1208,7 @@ check_syscall(sbcontext_t * sbcontext, const char *func, const char *file) sprintf(buffer, "%s:%*s%s\n", func, (int) (10 - strlen(func)), "", absolute_path); // log_path somehow gets corrupted. figuring out why would be good. - char *dpath = strdup(log_path); + dpath = strdup(log_path); if ((0 == lstat(log_path, &log_stat)) && (0 == S_ISREG(log_stat.st_mode)) ) { @@ -1240,7 +1241,7 @@ check_syscall(sbcontext_t * sbcontext, const char *func, const char *file) sprintf(buffer, "%s:%*s%s\n", func, (int) (10 - strlen(func)), "", absolute_path); //debug_log_path somehow gets corupted, same thing as log_path above. - char *dpath = strdup(debug_log_path); + dpath = strdup(debug_log_path); if ((0 == lstat(debug_log_path, &debug_log_stat)) && (0 == S_ISREG(debug_log_stat.st_mode)) ) { |