Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in pax-utils: macho.h paxelf.c paxmacho.c scanmacho.c
Date: Tue, 30 Dec 2008 12:34:32
Message-Id: E1LHdno-0000iQ-6g@stork.gentoo.org
1 vapier 08/12/30 12:34:28
2
3 Modified: macho.h paxelf.c paxmacho.c scanmacho.c
4 Log:
5 touchup whitespace style
6
7 Revision Changes Path
8 1.7 pax-utils/macho.h
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/macho.h?rev=1.7&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/macho.h?rev=1.7&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/macho.h?r1=1.6&r2=1.7
13
14 Index: macho.h
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/pax-utils/macho.h,v
17 retrieving revision 1.6
18 retrieving revision 1.7
19 diff -u -r1.6 -r1.7
20 --- macho.h 30 Dec 2008 12:02:29 -0000 1.6
21 +++ macho.h 30 Dec 2008 12:34:28 -0000 1.7
22 @@ -1,10 +1,9 @@
23 /*
24 * Copyright 2008 Gentoo Foundation
25 * Distributed under the terms of the GNU General Public License v2
26 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/macho.h,v 1.6 2008/12/30 12:02:29 vapier Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/pax-utils/macho.h,v 1.7 2008/12/30 12:34:28 vapier Exp $
28 */
29
30 -
31 #ifndef _MACHO_H
32 #define _MACHO_H 1
33
34 @@ -18,7 +17,6 @@
35 typedef int cpu_type_t;
36 typedef int cpu_subtype_t;
37
38 -
39 struct mach_header
40 {
41 uint32_t magic;
42 @@ -113,7 +111,6 @@
43 subimages, as a result the two-level
44 namespace hints can always be used */
45
46 -
47 struct mach_header_64
48 {
49 uint32_t magic;
50 @@ -133,7 +130,6 @@
51 #define CPU_TYPE_POWERPC64 (CPU_TYPE_POWERPC | CPU_ARCH_ABI64)
52 #define CPU_TYPE_X86_64 (CPU_TYPE_I386 | CPU_ARCH_ABI64)
53
54 -
55 struct load_command
56 {
57 uint32_t cmd;
58 @@ -211,7 +207,6 @@
59 framework or a client name for a bundle.
60 */
61
62 -
63 union lc_str
64 {
65 uint32_t offset;
66 @@ -247,14 +242,12 @@
67 /* cmdsize: set to sizeof(dylib_command) plus the size of the data
68 * pointed to by the name field of the dylib field. */
69
70 -
71 struct dylinker_command {
72 uint32_t cmd;
73 uint32_t cmdsize;
74 union lc_str name;
75 };
76
77 -
78 struct fat_header
79 {
80 uint32_t magic;
81 @@ -266,7 +259,6 @@
82 #define FAT_CIGAM 0xbebafeca /* for intel dudes */
83 /* nfat_arch: the number of far_arch structures following */
84
85 -
86 struct fat_arch
87 {
88 cpu_type_t cputype;
89
90
91
92 1.61 pax-utils/paxelf.c
93
94 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxelf.c?rev=1.61&view=markup
95 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxelf.c?rev=1.61&content-type=text/plain
96 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxelf.c?r1=1.60&r2=1.61
97
98 Index: paxelf.c
99 ===================================================================
100 RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v
101 retrieving revision 1.60
102 retrieving revision 1.61
103 diff -u -r1.60 -r1.61
104 --- paxelf.c 30 Dec 2008 12:00:06 -0000 1.60
105 +++ paxelf.c 30 Dec 2008 12:34:28 -0000 1.61
106 @@ -1,7 +1,7 @@
107 /*
108 * Copyright 2003-2007 Gentoo Foundation
109 * Distributed under the terms of the GNU General Public License v2
110 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.60 2008/12/30 12:00:06 vapier Exp $
111 + * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.61 2008/12/30 12:34:28 vapier Exp $
112 *
113 * Copyright 2005-2007 Ned Ludd - <solar@g.o>
114 * Copyright 2005-2007 Mike Frysinger - <vapier@g.o>
115 @@ -115,8 +115,6 @@
116 return (char *) "??";
117 }
118
119 -
120 -
121 static int arm_eabi_poker(elfobj *elf);
122 static int arm_eabi_poker(elfobj *elf)
123 {
124 @@ -140,7 +138,6 @@
125 return (eflags >> 24);
126 }
127
128 -
129 const char *get_elf_eabi(elfobj *elf)
130 {
131 static char buf[26];
132
133
134
135 1.12 pax-utils/paxmacho.c
136
137 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxmacho.c?rev=1.12&view=markup
138 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxmacho.c?rev=1.12&content-type=text/plain
139 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/paxmacho.c?r1=1.11&r2=1.12
140
141 Index: paxmacho.c
142 ===================================================================
143 RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v
144 retrieving revision 1.11
145 retrieving revision 1.12
146 diff -u -r1.11 -r1.12
147 --- paxmacho.c 30 Dec 2008 12:15:32 -0000 1.11
148 +++ paxmacho.c 30 Dec 2008 12:34:28 -0000 1.12
149 @@ -1,7 +1,7 @@
150 /*
151 * Copyright 2003-2008 Gentoo Foundation
152 * Distributed under the terms of the GNU General Public License v2
153 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v 1.11 2008/12/30 12:15:32 vapier Exp $
154 + * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v 1.12 2008/12/30 12:34:28 vapier Exp $
155 *
156 * Copyright 2005-2007 Ned Ludd - <solar@g.o>
157 * Copyright 2005-2007 Mike Frysinger - <vapier@g.o>
158 @@ -172,7 +172,6 @@
159 }
160 }
161
162 -
163 /* Determines the type of this object, and sets the right 32-bit or
164 * 64-bits pointer. The ismach64 flag is filled in appropriately. The
165 * return of this function is the read magic value, or 0 when the file
166 @@ -320,7 +319,6 @@
167 return(ret);
168 }
169
170 -
171 /* undo the readmacho() stuff */
172 void unreadmacho(fatobj *macho)
173 {
174
175
176
177 1.8 pax-utils/scanmacho.c
178
179 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanmacho.c?rev=1.8&view=markup
180 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanmacho.c?rev=1.8&content-type=text/plain
181 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanmacho.c?r1=1.7&r2=1.8
182
183 Index: scanmacho.c
184 ===================================================================
185 RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v
186 retrieving revision 1.7
187 retrieving revision 1.8
188 diff -u -r1.7 -r1.8
189 --- scanmacho.c 30 Dec 2008 12:02:29 -0000 1.7
190 +++ scanmacho.c 30 Dec 2008 12:34:28 -0000 1.8
191 @@ -1,7 +1,7 @@
192 /*
193 * Copyright 2008 Gentoo Foundation
194 * Distributed under the terms of the GNU General Public License v2
195 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v 1.7 2008/12/30 12:02:29 vapier Exp $
196 + * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v 1.8 2008/12/30 12:34:28 vapier Exp $
197 *
198 * based on scanelf by:
199 * Copyright 2003-2007 Ned Ludd - <solar@g.o>
200 @@ -10,7 +10,7 @@
201 * 2008 Fabian Groffen - <grobian@g.o>
202 */
203
204 -static const char *rcsid = "$Id: scanmacho.c,v 1.7 2008/12/30 12:02:29 vapier Exp $";
205 +static const char *rcsid = "$Id: scanmacho.c,v 1.8 2008/12/30 12:34:28 vapier Exp $";
206 const char * const argv0 = "scanmacho";
207
208 #include "paxinc.h"
209 @@ -192,7 +192,6 @@
210 return NULL;
211 }
212
213 -
214 /* scan a macho file and show all the fun stuff */
215 #define prints(str) write(fileno(stdout), str, strlen(str))
216 static int scanmacho_fatobj(fatobj *fobj)
217 @@ -523,7 +522,6 @@
218 return ret;
219 }
220
221 -
222 /* scan env PATH for paths */
223 static void scanelf_envpath(void)
224 {