Deleted Added
full compact
ldd.c (294665) ldd.c (299952)
1/*
2 * Copyright (c) 1993 Paul Kranenburg
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1993 Paul Kranenburg
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/usr.bin/ldd/ldd.c 294665 2016-01-24 15:15:57Z br $");
32__FBSDID("$FreeBSD: head/usr.bin/ldd/ldd.c 299952 2016-05-16 16:01:46Z truckman $");
33
34#include <sys/wait.h>
35
36#include <machine/elf.h>
37
38#include <arpa/inet.h>
39
40#include <dlfcn.h>

--- 42 unchanged lines hidden (view full) ---

83#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
84#define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */
85
86#define _PATH_LDD32 "/usr/bin/ldd32"
87
88static int
89execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
90{
33
34#include <sys/wait.h>
35
36#include <machine/elf.h>
37
38#include <arpa/inet.h>
39
40#include <dlfcn.h>

--- 42 unchanged lines hidden (view full) ---

83#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
84#define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */
85
86#define _PATH_LDD32 "/usr/bin/ldd32"
87
88static int
89execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
90{
91 char *argv[8];
91 char *argv[9];
92 int i, rval, status;
93
94 LDD_UNSETENV("TRACE_LOADED_OBJECTS");
95 rval = 0;
96 i = 0;
97 argv[i++] = strdup(_PATH_LDD32);
98 if (aflag)
99 argv[i++] = strdup("-a");

--- 314 unchanged lines hidden ---
92 int i, rval, status;
93
94 LDD_UNSETENV("TRACE_LOADED_OBJECTS");
95 rval = 0;
96 i = 0;
97 argv[i++] = strdup(_PATH_LDD32);
98 if (aflag)
99 argv[i++] = strdup("-a");

--- 314 unchanged lines hidden ---