d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed reading of archives

Browse source
This commit is contained in:
ceriel 1989-06-27 15:41:47 +00:00
parent b005d26d3f
commit 58f837cd33
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
util/ego/ic/ic_lib.c
View file

@ -175,14 +175,14 @@ STATIC bool is_archive(name)
char *name; char *name;
{ {
/* See if 'name' is the name of an archive file, i.e. it /* See if 'name' is the name of an archive file, i.e. it
* should end on ".a" and should at least be three characters * should end on ".ma" and should at least be four characters
* long (i.e. the name ".a" is not accepted as an archive name!). * long (i.e. the name ".ma" is not accepted as an archive name!).
*/ */
register char *p; register char *p;
for (p = name; *p; p++); for (p = name; *p; p++);
return (p > name+2) && (*--p == 'a') && (*--p == '.'); return (p > name+3) && (*--p == 'a') && (*--p == 'm') && (*--p == '.');
} }
@ -193,9 +193,29 @@ STATIC bool read_hdr()
{ {
/* Read the header of an archive module */ /* Read the header of an archive module */
char buf[AR_TOTAL];
register char *c = buf;
register char *p = hdr.ar_name;
register int i;
fread(&hdr, sizeof(hdr), 1, curfile); fread(c, AR_TOTAL, 1, curfile);
return !feof(curfile); if (feof(curfile)) return 0;
i = 14;
while (i--) {
*p++ = *c++;
}
#define get2(c) (((c)[0]&0377) | ((unsigned) ((c)[1]&0377) << 8))
hdr.ar_date = ((long) get2(c)) << 16; c += 2;
hdr.ar_date |= ((long) get2(c)) & 0xffff; c += 2;
hdr.ar_uid = *c++;
hdr.ar_gid = *c++;
hdr.ar_mode = get2(c); c += 2;
hdr.ar_size = (long) get2(c) << 16; c += 2;
hdr.ar_size |= (long) get2(c) & 0xffff;
return 1;
} }
@ -267,7 +287,7 @@ FILE *next_file(argc,argv)
error("cannot open %s",filename); error("cannot open %s",filename);
} }
if (is_archive(filename)) { if (is_archive(filename)) {
/* ends on '.a' */ /* ends on '.ma' */
arstate = ARCHIVE; arstate = ARCHIVE;
arch_init(curfile); /* read magic ar number */ arch_init(curfile); /* read magic ar number */
} else { } else {