Skip to content

Commit 466063c

Browse files
tpoechtragertpoechtrager
committed
ld64 512.4 & cctools 949.0.1 (WIP)
1 parent 606eb7d commit 466063c

File tree

227 files changed

+25173
-9277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+25173
-9277
lines changed

‎cctools/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
289289
PROGRAM_PREFIX = @PROGRAM_PREFIX@
290290
PTHREAD_FLAGS = @PTHREAD_FLAGS@
291291
RANLIB = @RANLIB@
292+
REALLOCF_LIB = @REALLOCF_LIB@
292293
SED = @SED@
293294
SET_MAKE = @SET_MAKE@
294295
SHELL = @SHELL@

‎cctools/ar/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
261261
PROGRAM_PREFIX = @PROGRAM_PREFIX@
262262
PTHREAD_FLAGS = @PTHREAD_FLAGS@
263263
RANLIB = @RANLIB@
264+
REALLOCF_LIB = @REALLOCF_LIB@
264265
SED = @SED@
265266
SET_MAKE = @SET_MAKE@
266267
SHELL = @SHELL@

‎cctools/ar/archive.c‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,9 @@ get_arobj(fd)
239239
int fd;
240240
{
241241
struct ar_hdr *hdr;
242-
int len, nr;
242+
size_t len, nr;
243243
char *p, buf[20];
244+
long longval;
244245

245246
nr = read(fd, hb, sizeof(HDR));
246247
if (nr != sizeof(HDR)) {
@@ -260,8 +261,10 @@ get_arobj(fd)
260261
#define OCTAL 8
261262

262263
AR_ATOI(hdr->ar_date, chdr.date, sizeof(hdr->ar_date), DECIMAL);
263-
AR_ATOI(hdr->ar_uid, chdr.uid, sizeof(hdr->ar_uid), DECIMAL);
264-
AR_ATOI(hdr->ar_gid, chdr.gid, sizeof(hdr->ar_gid), DECIMAL);
264+
AR_ATOI(hdr->ar_uid, longval, sizeof(hdr->ar_uid), DECIMAL);
265+
chdr.uid = (uid_t)longval;
266+
AR_ATOI(hdr->ar_gid, longval, sizeof(hdr->ar_gid), DECIMAL);
267+
chdr.gid = (gid_t)longval;
265268
AR_ATOI(hdr->ar_mode, chdr.mode, sizeof(hdr->ar_mode), OCTAL);
266269
AR_ATOI(hdr->ar_size, chdr.size, sizeof(hdr->ar_size), DECIMAL);
267270

@@ -296,7 +299,7 @@ get_arobj(fd)
296299
return (1);
297300
}
298301

299-
static int already_written;
302+
static size_t already_written;
300303

301304
/*
302305
* put_arobj --
@@ -307,7 +310,7 @@ put_arobj(cfp, sb)
307310
CF *cfp;
308311
struct stat *sb;
309312
{
310-
unsigned int lname;
313+
size_t lname;
311314
char *name;
312315
struct ar_hdr *hdr;
313316
off_t size;
@@ -353,7 +356,8 @@ put_arobj(cfp, sb)
353356
sb->st_mode, (int64_t)sb->st_size, ARFMAG);
354357
lname = 0;
355358
} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
356-
(void)sprintf(hb, HDR1, AR_EFMT1, (lname + 3) & ~3,
359+
(void)sprintf(hb, HDR1, AR_EFMT1,
360+
(int)((lname + 3) & ~3),
357361
(long int)tv_sec,
358362
(unsigned int)(u_short)sb->st_uid,
359363
(unsigned int)(u_short)sb->st_gid,
@@ -428,7 +432,8 @@ copy_ar(cfp, size)
428432
{
429433
static char pad = '\n';
430434
off_t sz;
431-
int from, nr, nw, off, to;
435+
ssize_t nr, nw;
436+
int from, off, to;
432437
char buf[8*1024];
433438

434439
nr = 0;

‎cctools/ar/contents.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ static char rcsid[] = "$OpenBSD: contents.c,v 1.2 1996/06/26 05:31:19 deraadt Ex
8181
#include "archive.h"
8282
#include "extern.h"
8383

84-
#ifndef HAVE_STRMODE /* cctools-port */
85-
extern void strmode(int mode, char *p);
86-
#endif
84+
#include "stuff/port.h" /* cctools-port: strmode */
8785

8886
/*
8987
* contents --

‎cctools/as/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
300300
PROGRAM_PREFIX = @PROGRAM_PREFIX@
301301
PTHREAD_FLAGS = @PTHREAD_FLAGS@
302302
RANLIB = @RANLIB@
303+
REALLOCF_LIB = @REALLOCF_LIB@
303304
SED = @SED@
304305
SET_MAKE = @SET_MAKE@
305306
SHELL = @SHELL@

‎cctools/as/app.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ FILE *fp)
517517
}
518518

519519
int
520-
do_scrub_next_char_from_string()
520+
do_scrub_next_char_from_string(void)
521521
{
522522
/* State 0: beginning of normal line
523523
1: After first whitespace on normal line (flush more white)

‎cctools/as/app.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern void do_scrub_begin(
88
void);
99
extern int do_scrub_next_char(
1010
FILE *fp);
11-
extern int do_scrub_next_char_from_string();
11+
extern int do_scrub_next_char_from_string(void);
1212

1313
/*
1414
* typedefs and routines to save scrub context so .include can make recursive

0 commit comments

Comments
 (0)