d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand emalloc in-place, and remove the `rname' basename() implimenation.

Browse Source
This commit is contained in:
obrien 2001-07-24 14:06:19 +00:00
parent 6dc73139c0
commit 9032757ec8
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/ranlib/build.c
View File

@ -143,7 +143,6 @@ rexec(rfd, wfd)
struct nlist nl;
off_t r_off, w_off;
long strsize;
void *emalloc();
/* Get current offsets for original and tmp files. */
r_off = lseek(rfd, (off_t)0, SEEK_CUR);
@ -169,7 +168,8 @@ rexec(rfd, wfd)
/* Read in the string table. */
strsize -= sizeof(strsize);
strtab = emalloc(strsize);
if ((strtab = malloc(strsize)) == NULL)
error(archive);
nr = read(rfd, strtab, strsize);
if (nr != strsize) {
badread: if (nr < 0)
@ -205,8 +205,10 @@ badread: if (nr < 0)
sym = strtab + nl.n_un.n_strx - sizeof(long);
symlen = strlen(sym) + 1;
rp = (RLIB *)emalloc(sizeof(RLIB));
rp->sym = (char *)emalloc(symlen);
if ((rp = malloc(sizeof(RLIB))) == NULL)
error(archive);
if ((rp->sym = malloc(symlen)) == NULL)
error(archive);
bcopy(sym, rp->sym, symlen);
rp->symlen = symlen;
rp->pos = w_off;

20
usr.bin/ranlib/misc.c
View File

@ -79,26 +79,6 @@ tmp(void)
return(fd);
}
void *
emalloc(len)
int len;
{
void *p;
if ((p = malloc((u_int)len)) == NULL)
error(archive);
return(p);
}
char *
rname(path)
char *path;
{
register char *ind;
return((ind = rindex(path, '/')) ? ind + 1 : path);
}
void
badfmt(void)
{