From 79189ec2621e26b060ccb9d4a116a194bfe754ee Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 11 Jan 2013 03:16:30 +0100 Subject: mk: fix ar padding problems on 64bit (from eriks amd64mkar patch) --- sys/src/cmd/mk/archive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/src/cmd/mk/archive.c b/sys/src/cmd/mk/archive.c index 70f7cc888..d7bf27edc 100644 --- a/sys/src/cmd/mk/archive.c +++ b/sys/src/cmd/mk/archive.c @@ -60,12 +60,12 @@ atouch(char *name) if(symlook(name, S_TIME, 0)){ /* hoon off and change it in situ */ LSEEK(fd, SARMAG, 0); - while(read(fd, (char *)&h, sizeof(h)) == sizeof(h)){ + while(read(fd, &h, SAR_HDR) == SAR_HDR){ for(i = SARNAME-1; i > 0 && h.name[i] == ' '; i--) - ; + ; h.name[i+1]=0; if(strcmp(member, h.name) == 0){ - t = SARNAME-sizeof(h); /* ughgghh */ + t = SARNAME-SAR_HDR; /* ughgghh */ LSEEK(fd, t, 1); fprint(fd, "%-12ld", time(0)); break; @@ -101,7 +101,7 @@ atimes(char *ar) } at = d->mtime; free(d); - while(read(fd, (char *)&h, sizeof(h)) == sizeof(h)){ + while(read(fd, &h, SAR_HDR) == SAR_HDR){ t = atol(h.date); if(t >= at) /* new things in old archives confuses mk */ t = at-1; -- cgit v1.2.3