Module Name: src
Committed By: maya
Date: Sat Jan 5 10:51:06 UTC 2019
Modified Files:
src/bin/csh: alloc.c csh.c csh.h dir.c dol.c err.c exec.c exp.c file.c
func.c glob.c hist.c lex.c misc.c parse.c proc.c sem.c set.c
Log Message:
Remove Free, s/xfree/free/.
Standard C says that free should be a no-op for a NULL pointer, so
we don't need an extra function to do this.
While here, add an XXX about a wrong sounding comment
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/bin/csh/alloc.c
cvs rdiff -u -r1.46 -r1.47 src/bin/csh/csh.c
cvs rdiff -u -r1.26 -r1.27 src/bin/csh/csh.h
cvs rdiff -u -r1.30 -r1.31 src/bin/csh/dir.c src/bin/csh/file.c
cvs rdiff -u -r1.29 -r1.30 src/bin/csh/dol.c src/bin/csh/sem.c
cvs rdiff -u -r1.21 -r1.22 src/bin/csh/err.c
cvs rdiff -u -r1.31 -r1.32 src/bin/csh/exec.c src/bin/csh/lex.c
cvs rdiff -u -r1.20 -r1.21 src/bin/csh/exp.c src/bin/csh/hist.c \
src/bin/csh/misc.c
cvs rdiff -u -r1.40 -r1.41 src/bin/csh/func.c
cvs rdiff -u -r1.28 -r1.29 src/bin/csh/glob.c
cvs rdiff -u -r1.17 -r1.18 src/bin/csh/parse.c
cvs rdiff -u -r1.36 -r1.37 src/bin/csh/proc.c
cvs rdiff -u -r1.33 -r1.34 src/bin/csh/set.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/alloc.c
diff -u src/bin/csh/alloc.c:1.13 src/bin/csh/alloc.c:1.14
--- src/bin/csh/alloc.c:1.13 Tue Jan 22 19:28:00 2013
+++ src/bin/csh/alloc.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.13 2013/01/22 19:28:00 christos Exp $ */
+/* $NetBSD: alloc.c,v 1.14 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1983, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: alloc.c,v 1.13 2013/01/22 19:28:00 christos Exp $");
+__RCSID("$NetBSD: alloc.c,v 1.14 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -82,10 +82,3 @@ Calloc(size_t s, size_t n)
}
return (ptr);
}
-
-void
-Free(ptr_t p)
-{
- if (p)
- free(p);
-}
Index: src/bin/csh/csh.c
diff -u src/bin/csh/csh.c:1.46 src/bin/csh/csh.c:1.47
--- src/bin/csh/csh.c:1.46 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/csh.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.46 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: csh.c,v 1.47 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-__RCSID("$NetBSD: csh.c,v 1.46 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: csh.c,v 1.47 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -641,7 +641,7 @@ srccat(Char *cp, Char *dp)
ep = Strspl(cp, dp);
ptr = short2str(ep);
- xfree((ptr_t) ep);
+ free((ptr_t) ep);
return srcfile(ptr, mflag ? 0 : 1, 0);
}
@@ -757,10 +757,11 @@ srcunit(int unit, int onlyown, int hflg)
int i;
/* We made it to the new state... free up its storage */
- /* This code could get run twice but xfree doesn't care */
+ /* This code could get run twice but free doesn't care */
+ /* XXX yes it does */
for (i = 0; i < fblocks; i++)
- xfree((ptr_t) fbuf[i]);
- xfree((ptr_t) fbuf);
+ free((ptr_t) fbuf[i]);
+ free((ptr_t) fbuf);
/* Reset input arena */
(void)memcpy(&B, &saveB, sizeof(B));
@@ -1061,7 +1062,7 @@ process(int catch)
(void)fflush(cshout);
}
if (seterr) {
- xfree((ptr_t) seterr);
+ free((ptr_t) seterr);
seterr = NULL;
}
@@ -1145,7 +1146,7 @@ dosource(Char **v, struct command *t)
(void)Strcpy(buf, *v);
f = globone(buf, G_ERROR);
(void)strcpy((char *)buf, short2str(f));
- xfree((ptr_t) f);
+ free((ptr_t) f);
if (!srcfile((char *)buf, 0, hflg) && !hflg)
stderror(ERR_SYSTEM, (char *)buf, strerror(errno));
}
Index: src/bin/csh/csh.h
diff -u src/bin/csh/csh.h:1.26 src/bin/csh/csh.h:1.27
--- src/bin/csh/csh.h:1.26 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/csh.h Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.26 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: csh.h,v 1.27 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -89,7 +89,6 @@ typedef void *ptr_t;
#define xmalloc(i) Malloc(i)
#define xrealloc(p, i) Realloc(p, i)
#define xcalloc(n, s) Calloc(n, s)
-#define xfree(p) Free(p)
#include <stdio.h>
FILE *cshin, *cshout, *csherr;
Index: src/bin/csh/dir.c
diff -u src/bin/csh/dir.c:1.30 src/bin/csh/dir.c:1.31
--- src/bin/csh/dir.c:1.30 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/dir.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.30 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: dir.c,v 1.31 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dir.c,v 1.30 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: dir.c,v 1.31 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -312,7 +312,7 @@ dnormalize(Char *cp)
cwd[dotdot = Strlen(cwd)] = '/';
cwd[dotdot + 1] = '\0';
dp = Strspl(cwd, cp);
- xfree((ptr_t) cwd);
+ free((ptr_t) cwd);
return dp;
}
else {
@@ -396,7 +396,7 @@ dgoto(Char *cp)
p--; /* don't add a / after root */
for (q = cp; (*p++ = *q++) != '\0';)
continue;
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = dp;
dp += cwdlen;
}
@@ -424,11 +424,11 @@ dfollow(Char *cp)
*/
dp = dnormalize(cp);
if (chdir(short2str(dp)) >= 0) {
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
return dgoto(dp);
}
else {
- xfree((ptr_t) dp);
+ free((ptr_t) dp);
if (chdir(short2str(cp)) >= 0)
return dgoto(cp);
serrno = errno;
@@ -448,7 +448,7 @@ dfollow(Char *cp)
continue;
if (chdir(short2str(buf)) >= 0) {
printd = 1;
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = Strsave(buf);
return dgoto(cp);
}
@@ -456,13 +456,13 @@ dfollow(Char *cp)
}
dp = value(cp);
if ((dp[0] == '/' || dp[0] == '.') && chdir(short2str(dp)) >= 0) {
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = Strsave(dp);
printd = 1;
return dgoto(cp);
}
(void)strcpy(ebuf, short2str(cp));
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
stderror(ERR_SYSTEM, ebuf, strerror(serrno));
/* NOTREACHED */
}
@@ -596,8 +596,8 @@ dfree(struct directory *dp)
dp->di_next = dp->di_prev = 0;
}
else {
- xfree((char *) dp->di_name);
- xfree((ptr_t) dp);
+ free((char *) dp->di_name);
+ free((ptr_t) dp);
}
}
@@ -632,7 +632,7 @@ dcanon(Char *cp, Char *p)
(void)Strcpy(tmpdir, p1);
(void)Strcat(tmpdir, STRslash);
(void)Strcat(tmpdir, cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = p = Strsave(tmpdir);
}
@@ -737,7 +737,7 @@ dcanon(Char *cp, Char *p)
*/
p = newcp;
}
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = newcp;
continue; /* canonicalize the link */
}
@@ -826,7 +826,7 @@ dcanon(Char *cp, Char *p)
*/
p = newcp;
}
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = newcp;
continue; /* canonicalize the link */
}
@@ -880,7 +880,7 @@ dcanon(Char *cp, Char *p)
* Use STRhome to make '~' work
*/
newcp = Strspl(p1, cp + Strlen(p2));
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = newcp;
}
}
Index: src/bin/csh/file.c
diff -u src/bin/csh/file.c:1.30 src/bin/csh/file.c:1.31
--- src/bin/csh/file.c:1.30 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/file.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.30 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: file.c,v 1.31 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: file.c,v 1.30 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: file.c,v 1.31 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -459,8 +459,8 @@ free_items(Char **items, size_t numitems
size_t i;
for (i = 0; i < numitems; i++)
- xfree((ptr_t) items[i]);
- xfree((ptr_t) items);
+ free((ptr_t) items[i]);
+ free((ptr_t) items);
}
#define FREE_ITEMS(items, numitems) { \
Index: src/bin/csh/dol.c
diff -u src/bin/csh/dol.c:1.29 src/bin/csh/dol.c:1.30
--- src/bin/csh/dol.c:1.29 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/dol.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.29 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: dol.c,v 1.30 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dol.c,v 1.29 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: dol.c,v 1.30 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -416,7 +416,7 @@ Dgetdol(void)
stderror(ERR_SYNTAX);
if (backpid != 0) {
if (dolbang)
- xfree((ptr_t)dolbang);
+ free((ptr_t)dolbang);
setDolp(dolbang = putn(backpid));
}
goto eatbrac;
@@ -595,7 +595,7 @@ Dgetdol(void)
Char *cp = putn(upb - lwb + 1);
addla(cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
}
else {
eatmod:
@@ -717,7 +717,7 @@ setDolp(Char *cp)
(void)Strcpy(np + (dp - cp), rhsub);
(void)Strcpy(np + (dp - cp) + rhlen, dp + lhlen);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
dp = cp = np;
didmod = 1;
} else {
@@ -741,12 +741,12 @@ setDolp(Char *cp)
if ((dp = domod(cp, dolmod[i]))) {
didmod = 1;
if (Strcmp(cp, dp) == 0) {
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = dp;
break;
}
else {
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
cp = dp;
}
}
@@ -764,11 +764,11 @@ setDolp(Char *cp)
if (dp) {
addla(dp);
- xfree((ptr_t) dp);
+ free((ptr_t) dp);
}
else {
addla(cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
}
dolp = STRNULL;
@@ -833,7 +833,7 @@ again:
mbp = putn((((int)tv.tv_sec) ^
((int)tv.tv_nsec) ^ ((int)getpid())) & 0x00ffffff);
shtemp = Strspl(STRtmpsh, mbp);
- xfree((ptr_t)mbp);
+ free((ptr_t)mbp);
}
goto again;
}
Index: src/bin/csh/sem.c
diff -u src/bin/csh/sem.c:1.29 src/bin/csh/sem.c:1.30
--- src/bin/csh/sem.c:1.29 Mon Aug 29 14:51:17 2011
+++ src/bin/csh/sem.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.29 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: sem.c,v 1.30 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: sem.c,v 1.29 2011/08/29 14:51:17 joerg Exp $");
+__RCSID("$NetBSD: sem.c,v 1.30 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -276,11 +276,11 @@ execute(struct command *t, int wtty, int
csigset = ocsigset;
nosigchld = onosigchld;
- xfree((ptr_t) Vsav);
+ free((ptr_t) Vsav);
Vsav = 0;
- xfree((ptr_t) Vdp);
+ free((ptr_t) Vdp);
Vdp = 0;
- xfree((ptr_t) Vexpath);
+ free((ptr_t) Vexpath);
Vexpath = 0;
blkfree((Char **) Vt);
Vt = 0;
@@ -453,11 +453,11 @@ vffree(int i)
if ((v = gargv) != NULL) {
gargv = 0;
- xfree((ptr_t) v);
+ free((ptr_t) v);
}
if ((v = pargv) != NULL) {
pargv = 0;
- xfree((ptr_t) v);
+ free((ptr_t) v);
}
_exit(i);
/* NOTREACHED */
@@ -494,24 +494,24 @@ splicepipe(struct command *t, Char *cp /
pv = globall(blk);
if (pv == NULL) {
setname(vis_str(blk[0]));
- xfree((ptr_t) blk[0]);
+ free((ptr_t) blk[0]);
stderror(ERR_NAME | ERR_NOMATCH);
/* NOTREACHED */
}
gargv = NULL;
if (pv[1] != NULL) { /* we need to fix the command vector */
Char **av = blkspl(t->t_dcom, &pv[1]);
- xfree((ptr_t) t->t_dcom);
+ free((ptr_t) t->t_dcom);
t->t_dcom = av;
}
- xfree((ptr_t) blk[0]);
+ free((ptr_t) blk[0]);
blk[0] = pv[0];
- xfree((ptr_t) pv);
+ free((ptr_t) pv);
}
}
else {
blk[0] = globone(blk[1] = Dfix1(cp), G_ERROR);
- xfree((ptr_t) blk[1]);
+ free((ptr_t) blk[1]);
}
return(blk[0]);
}
@@ -541,7 +541,7 @@ doio(struct command *t, int *pipein, int
(void)dcopy(SHERR, 2);
cp = splicepipe(t, t->t_dlef);
(void)strlcpy(tmp, short2str(cp), sizeof(tmp));
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
if ((fd = open(tmp, O_RDONLY)) < 0) {
stderror(ERR_SYSTEM, tmp, strerror(errno));
/* NOTREACHED */
@@ -569,7 +569,7 @@ doio(struct command *t, int *pipein, int
cp = splicepipe(t, t->t_drit);
(void)strlcpy(tmp, short2str(cp), sizeof(tmp));
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
/*
* so > /dev/std{out,err} work
*/
Index: src/bin/csh/err.c
diff -u src/bin/csh/err.c:1.21 src/bin/csh/err.c:1.22
--- src/bin/csh/err.c:1.21 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/err.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.21 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: err.c,v 1.22 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: err.c,v 1.21 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: err.c,v 1.22 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -357,7 +357,7 @@ stderror(int id, ...)
}
if (seterr) {
- xfree((ptr_t) seterr);
+ free((ptr_t) seterr);
seterr = NULL;
}
Index: src/bin/csh/exec.c
diff -u src/bin/csh/exec.c:1.31 src/bin/csh/exec.c:1.32
--- src/bin/csh/exec.c:1.31 Wed Mar 16 22:35:44 2016
+++ src/bin/csh/exec.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.31 2016/03/16 22:35:44 christos Exp $ */
+/* $NetBSD: exec.c,v 1.32 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.31 2016/03/16 22:35:44 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.32 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -169,8 +169,8 @@ doexec(Char **v, struct command *t)
blkfree(t->t_dcom);
t->t_dcom = blkspl(pv, av);
- xfree((ptr_t) pv);
- xfree((ptr_t) av);
+ free((ptr_t) pv);
+ free((ptr_t) av);
av = t->t_dcom;
trim(av);
@@ -226,7 +226,7 @@ doexec(Char **v, struct command *t)
Vdp = dp;
texec(dp, av);
Vdp = 0;
- xfree((ptr_t)dp);
+ free((ptr_t)dp);
}
misses++;
cont:
@@ -235,7 +235,7 @@ cont:
} while (*pv);
hits--;
Vsav = 0;
- xfree((ptr_t)sav);
+ free((ptr_t)sav);
pexerr();
/* NOTREACHED */
}
@@ -247,7 +247,7 @@ pexerr(void)
if (expath) {
setname(vis_str(expath));
Vexpath = 0;
- xfree((ptr_t)expath);
+ free((ptr_t)expath);
expath = 0;
}
else
@@ -330,7 +330,7 @@ texec(Char *sf, Char **st)
/* The order for the conversions is significant */
t = short2blk(st);
f = short2str(sf);
- xfree((ptr_t) st);
+ free((ptr_t) st);
Vt = t;
(void)execve(f, t, environ);
Vt = 0;
@@ -348,7 +348,7 @@ texec(Char *sf, Char **st)
if (exerr == 0) {
exerr = strerror(errno);
if (expath)
- xfree((ptr_t) expath);
+ free((ptr_t) expath);
expath = Strsave(sf);
Vexpath = expath;
}
@@ -531,13 +531,13 @@ iscommand(Char *name)
}
if (pv[0][0] == 0 || eq(pv[0], STRdot)) { /* don't make ./xxx */
if (executable(NULL, name, 0)) {
- xfree((ptr_t) sav);
+ free((ptr_t) sav);
return i + 1;
}
}
else {
if (executable(*pv, sav, 0)) {
- xfree((ptr_t) sav);
+ free((ptr_t) sav);
return i + 1;
}
}
@@ -545,7 +545,7 @@ cont:
pv++;
i++;
} while (*pv);
- xfree((ptr_t) sav);
+ free((ptr_t) sav);
return 0;
}
@@ -714,7 +714,7 @@ tellmewhat(struct wordent *lexp, Char *s
if (!slash) {
sp->word = Strspl(STRdotsl, sp->word);
prlex(cshout, lexp);
- xfree((ptr_t) sp->word);
+ free((ptr_t) sp->word);
}
else
prlex(cshout, lexp);
@@ -722,12 +722,12 @@ tellmewhat(struct wordent *lexp, Char *s
else {
s1 = Strspl(*pv, STRslash);
sp->word = Strspl(s1, sp->word);
- xfree((ptr_t) s1);
+ free((ptr_t) s1);
if (str == NULL)
prlex(cshout, lexp);
else
(void)Strcpy(str, sp->word);
- xfree((ptr_t) sp->word);
+ free((ptr_t) sp->word);
}
found = 1;
}
@@ -743,6 +743,6 @@ tellmewhat(struct wordent *lexp, Char *s
found = 0;
}
sp->word = s0; /* we save and then restore this */
- xfree((ptr_t) cmd);
+ free((ptr_t) cmd);
return found;
}
Index: src/bin/csh/lex.c
diff -u src/bin/csh/lex.c:1.31 src/bin/csh/lex.c:1.32
--- src/bin/csh/lex.c:1.31 Tue Aug 6 05:42:43 2013
+++ src/bin/csh/lex.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.31 2013/08/06 05:42:43 christos Exp $ */
+/* $NetBSD: lex.c,v 1.32 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: lex.c,v 1.31 2013/08/06 05:42:43 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.32 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -247,8 +247,8 @@ freelex(struct wordent *vp)
while (vp->next != vp) {
fp = vp->next;
vp->next = fp->next;
- xfree((ptr_t) fp->word);
- xfree((ptr_t) fp);
+ free((ptr_t) fp->word);
+ free((ptr_t) fp);
}
vp->prev = vp;
}
@@ -897,11 +897,11 @@ dosub(int sc, struct wordent *en, int gl
otword = tword;
tword = subword(otword, sc, &didone);
if (Strcmp(tword, otword) == 0) {
- xfree((ptr_t) otword);
+ free((ptr_t) otword);
break;
}
else
- xfree((ptr_t)otword);
+ free((ptr_t)otword);
}
}
}
@@ -1224,7 +1224,7 @@ gethent(int sc)
}
np = putn(event);
str = vis_str(np);
- xfree((ptr_t) np);
+ free((ptr_t) np);
seterror(ERR_NOEVENT, str);
return (0);
}
@@ -1456,7 +1456,7 @@ again:
nfbuf = (Char **)xcalloc((size_t) (fblocks + 2), sizeof(char **));
if (fbuf) {
(void)blkcpy(nfbuf, fbuf);
- xfree((ptr_t) fbuf);
+ free((ptr_t) fbuf);
}
fbuf = nfbuf;
fbuf[fblocks] = (Char *)xcalloc(BUFSIZE, sizeof(Char));
@@ -1550,7 +1550,7 @@ bfree(void)
sb = (int)(fseekp - 1) / BUFSIZE;
if (sb > 0) {
for (i = 0; i < sb; i++)
- xfree((ptr_t) fbuf[i]);
+ free((ptr_t) fbuf[i]);
(void)blkcpy(fbuf, &fbuf[sb]);
fseekp -= BUFSIZE * sb;
feobp -= BUFSIZE * sb;
Index: src/bin/csh/exp.c
diff -u src/bin/csh/exp.c:1.20 src/bin/csh/exp.c:1.21
--- src/bin/csh/exp.c:1.20 Sat Feb 14 07:12:29 2009
+++ src/bin/csh/exp.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exp.c,v 1.20 2009/02/14 07:12:29 lukem Exp $ */
+/* $NetBSD: exp.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: exp.c,v 1.20 2009/02/14 07:12:29 lukem Exp $");
+__RCSID("$NetBSD: exp.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -237,12 +237,12 @@ exp2c(Char ***vp, int ignore)
i = !Gmatch(p1, p2);
break;
}
- xfree((ptr_t) p1);
- xfree((ptr_t) p2);
+ free((ptr_t) p1);
+ free((ptr_t) p2);
return (i);
}
i = egetn(p1);
- xfree((ptr_t) p1);
+ free((ptr_t) p1);
return (i);
}
@@ -279,8 +279,8 @@ exp3(Char ***vp, int ignore)
i = egetn(p1) <= egetn(p2);
break;
}
- xfree((ptr_t) p1);
- xfree((ptr_t) p2);
+ free((ptr_t) p1);
+ free((ptr_t) p2);
return (putn(i));
}
return (p1);
@@ -307,8 +307,8 @@ exp3a(Char ***vp, int ignore)
i = egetn(p1) << egetn(p2);
else
i = egetn(p1) >> egetn(p2);
- xfree((ptr_t) p1);
- xfree((ptr_t) p2);
+ free((ptr_t) p1);
+ free((ptr_t) p2);
return (putn(i));
}
return (p1);
@@ -342,8 +342,8 @@ exp4(Char ***vp, int ignore)
i = egetn(p1) - egetn(p2);
break;
}
- xfree((ptr_t) p1);
- xfree((ptr_t) p2);
+ free((ptr_t) p1);
+ free((ptr_t) p2);
return (putn(i));
}
return (p1);
@@ -386,8 +386,8 @@ exp5(Char ***vp, int ignore)
i = egetn(p1) % i;
break;
}
- xfree((ptr_t) p1);
- xfree((ptr_t) p2);
+ free((ptr_t) p1);
+ free((ptr_t) p2);
return (putn(i));
}
return (p1);
@@ -409,7 +409,7 @@ exp6(Char ***vp, int ignore)
etracc("exp6 ! cp", cp, vp);
#endif
i = egetn(cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
return (putn(!i));
}
if (eq(**vp, STRtilde)) {
@@ -419,7 +419,7 @@ exp6(Char ***vp, int ignore)
etracc("exp6 ~ cp", cp, vp);
#endif
i = egetn(cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
return (putn(~i));
}
if (eq(**vp, STRLparen)) {
@@ -502,7 +502,7 @@ exp6(Char ***vp, int ignore)
default:
if (cp[1] == 'l' ?
lstat(short2str(ep), &stb) : stat(short2str(ep), &stb)) {
- xfree((ptr_t) ep);
+ free((ptr_t) ep);
return (Strsave(STR0));
}
switch (cp[1]) {
@@ -547,7 +547,7 @@ exp6(Char ***vp, int ignore)
#ifdef EDEBUG
etraci("exp6 -? i", i, vp);
#endif
- xfree((ptr_t) ep);
+ free((ptr_t) ep);
return (putn(i));
}
#ifdef EDEBUG
Index: src/bin/csh/hist.c
diff -u src/bin/csh/hist.c:1.20 src/bin/csh/hist.c:1.21
--- src/bin/csh/hist.c:1.20 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/hist.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.20 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: hist.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: hist.c,v 1.20 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -131,7 +131,7 @@ static void
hfree(struct Hist *hp)
{
freelex(&hp->Hlex);
- xfree((ptr_t) hp);
+ free((ptr_t) hp);
}
void
Index: src/bin/csh/misc.c
diff -u src/bin/csh/misc.c:1.20 src/bin/csh/misc.c:1.21
--- src/bin/csh/misc.c:1.20 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/misc.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.20 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: misc.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: misc.c,v 1.20 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -135,8 +135,8 @@ blkfree(Char **av0)
if (!av0)
return;
for (; *av; av++)
- xfree((ptr_t) * av);
- xfree((ptr_t) av0);
+ free((ptr_t) * av);
+ free((ptr_t) av0);
}
Char **
@@ -316,7 +316,7 @@ lshift(Char **v, size_t c)
Char **u;
for (u = v; *u && c-- > 0; u++)
- xfree((ptr_t) *u);
+ free((ptr_t) *u);
(void)blkcpy(v, u);
}
Index: src/bin/csh/func.c
diff -u src/bin/csh/func.c:1.40 src/bin/csh/func.c:1.41
--- src/bin/csh/func.c:1.40 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/func.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.40 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: func.c,v 1.41 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: func.c,v 1.40 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: func.c,v 1.41 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -141,7 +141,7 @@ doonintr(Char **v, struct command *t)
stderror(ERR_NAME | ERR_TERMINAL);
cp = gointr;
gointr = 0;
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
if (vv == 0) {
if (setintr) {
sigemptyset(&nsigset);
@@ -316,7 +316,7 @@ dogoto(Char **v, struct command *t)
Char *lp;
gotolab(lp = globone(v[1], G_ERROR));
- xfree((ptr_t) lp);
+ free((ptr_t) lp);
}
void
@@ -356,7 +356,7 @@ doswitch(Char **v, struct command *t)
if (*v)
stderror(ERR_SYNTAX);
search(T_SWITCH, 0, lp = globone(cp, G_ERROR));
- xfree((ptr_t) lp);
+ free((ptr_t) lp);
}
void
@@ -621,7 +621,7 @@ search(int type, int level, Char *goal)
cp = strip(Dfix1(aword));
if (Gmatch(goal, cp))
level = -1;
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
break;
case T_DEFAULT:
if (type == T_SWITCH && level == 0)
@@ -695,8 +695,8 @@ wpfree(struct whyle *wp)
if (wp->w_fe0)
blkfree(wp->w_fe0);
if (wp->w_fename)
- xfree((ptr_t) wp->w_fename);
- xfree((ptr_t) wp);
+ free((ptr_t) wp->w_fename);
+ free((ptr_t) wp);
}
static int
@@ -955,7 +955,7 @@ dosetenv(Char **v, struct command *t)
AsciiOnly = 0;
#endif /* NLS */
}
- xfree((ptr_t) lp);
+ free((ptr_t) lp);
}
void
@@ -967,7 +967,7 @@ dounsetenv(Char **v, struct command *t)
int i, maxi;
if (name)
- xfree((ptr_t) name);
+ free((ptr_t) name);
/*
* Find the longest environment variable
*/
@@ -1008,7 +1008,7 @@ dounsetenv(Char **v, struct command *t)
Unsetenv(name);
break;
}
- xfree((ptr_t) name);
+ free((ptr_t) name);
name = NULL;
}
@@ -1026,21 +1026,21 @@ Setenv(Char *name, Char *val)
if (*cp != 0 || *dp != '=')
continue;
cp = Strspl(STRequal, val);
- xfree((ptr_t)* ep);
+ free((ptr_t)* ep);
*ep = strip(Strspl(name, cp));
- xfree((ptr_t)cp);
+ free((ptr_t)cp);
blkfree((Char **)environ);
environ = short2blk(STR_environ);
return;
}
cp = Strspl(name, STRequal);
blk[0] = strip(Strspl(cp, val));
- xfree((ptr_t)cp);
+ free((ptr_t)cp);
blk[1] = 0;
STR_environ = blkspl(STR_environ, blk);
blkfree((Char **)environ);
environ = short2blk(STR_environ);
- xfree((ptr_t) oep);
+ free((ptr_t) oep);
}
static void
@@ -1061,8 +1061,8 @@ Unsetenv(Char *name)
STR_environ = blkspl(STR_environ, ep + 1);
environ = short2blk(STR_environ);
*ep = cp;
- xfree((ptr_t) cp);
- xfree((ptr_t) oep);
+ free((ptr_t) cp);
+ free((ptr_t) oep);
return;
}
}
Index: src/bin/csh/glob.c
diff -u src/bin/csh/glob.c:1.28 src/bin/csh/glob.c:1.29
--- src/bin/csh/glob.c:1.28 Thu Apr 27 18:50:34 2017
+++ src/bin/csh/glob.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.c,v 1.28 2017/04/27 18:50:34 christos Exp $ */
+/* $NetBSD: glob.c,v 1.29 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: glob.c,v 1.28 2017/04/27 18:50:34 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.29 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -119,7 +119,7 @@ globtilde(Char **nv, Char *s)
*b++ = *s++;
*b = EOS;
--u;
- xfree((ptr_t) u);
+ free((ptr_t) u);
return (Strsave(gstart));
}
@@ -234,13 +234,13 @@ expbrace(Char ***nvp, Char ***elp, size_
int len;
if ((len = globbrace(s, b, &bl)) < 0) {
- xfree((ptr_t)nv);
+ free((ptr_t)nv);
stderror(ERR_MISSING, -len);
}
- xfree((ptr_t) s);
+ free((ptr_t) s);
if (len == 1) {
*vl-- = *bl;
- xfree((ptr_t) bl);
+ free((ptr_t) bl);
continue;
}
len = blklen(bl);
@@ -265,7 +265,7 @@ expbrace(Char ***nvp, Char ***elp, size_
vp++;
for (bp = bl + 1; *bp; *vp++ = *bp++)
continue;
- xfree((ptr_t)bl);
+ free((ptr_t)bl);
}
}
@@ -301,7 +301,7 @@ globexpand(Char **v)
vl = &nv[size - GLOBSPACE];
}
}
- xfree((ptr_t)pargv);
+ free((ptr_t)pargv);
pargv = NULL;
}
else {
@@ -353,9 +353,9 @@ handleone(Char *str, Char **vl, int acti
str = Strsave(*vlp++);
do {
cp = Strspl(str, STRspace);
- xfree((ptr_t)str);
+ free((ptr_t)str);
str = Strspl(cp, *vlp);
- xfree((ptr_t)cp);
+ free((ptr_t)cp);
}
while (*++vlp);
blkfree(vl);
@@ -440,14 +440,14 @@ globone(Char *str, int action)
vo = globexpand(v);
if (noglob || (gflg & G_GLOB) == 0) {
if (vo[0] == NULL) {
- xfree((ptr_t)vo);
+ free((ptr_t)vo);
return (Strsave(STRNULL));
}
if (vo[1] != NULL)
return (handleone(str, vo, action));
else {
str = strip(vo[0]);
- xfree((ptr_t) vo);
+ free((ptr_t) vo);
return (str);
}
}
@@ -465,14 +465,14 @@ globone(Char *str, int action)
stderror(ERR_NAME | ERR_NOMATCH);
}
if (vl[0] == NULL) {
- xfree((ptr_t)vl);
+ free((ptr_t)vl);
return (Strsave(STRNULL));
}
if (vl[1] != NULL)
return (handleone(str, vl, action));
else {
str = strip(*vl);
- xfree((ptr_t)vl);
+ free((ptr_t)vl);
return (str);
}
}
@@ -709,7 +709,7 @@ backeval(Char *cp, int literal)
execute(t, -1, NULL, NULL);
exitstat();
}
- xfree((ptr_t)cp);
+ free((ptr_t)cp);
(void)close(pvec[1]);
c = 0;
ip = NULL;
Index: src/bin/csh/parse.c
diff -u src/bin/csh/parse.c:1.17 src/bin/csh/parse.c:1.18
--- src/bin/csh/parse.c:1.17 Mon Jul 16 18:26:10 2007
+++ src/bin/csh/parse.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.17 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: parse.c,v 1.18 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.17 2007/07/16 18:26:10 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.18 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -171,7 +171,7 @@ asyn3(struct wordent *p1, struct wordent
cp = alout.next->word;
alout.next->word = Strspl(STRQNULL, cp);
- xfree((ptr_t) cp);
+ free((ptr_t) cp);
}
p1 = freenod(p1, redid ? p2 : p1->next);
if (alout.next != &alout) {
@@ -179,8 +179,8 @@ asyn3(struct wordent *p1, struct wordent
alout.prev->prev->next = p1->next;
alout.next->prev = p1;
p1->next = alout.next;
- xfree((ptr_t)alout.prev->word);
- xfree((ptr_t)(alout.prev));
+ free((ptr_t)alout.prev->word);
+ free((ptr_t)(alout.prev));
}
reset(); /* throw! */
}
@@ -192,9 +192,9 @@ freenod(struct wordent *p1, struct worde
retp = p1->prev;
while (p1 != p2) {
- xfree((ptr_t)p1->word);
+ free((ptr_t)p1->word);
p1 = p1->next;
- xfree((ptr_t) (p1->prev));
+ free((ptr_t) (p1->prev));
}
retp->next = p2;
p2->prev = retp;
@@ -619,15 +619,15 @@ freesyn(struct command *t)
switch (t->t_dtyp) {
case NODE_COMMAND:
for (v = t->t_dcom; *v; v++)
- xfree((ptr_t) * v);
- xfree((ptr_t)(t->t_dcom));
- xfree((ptr_t)t->t_dlef);
- xfree((ptr_t)t->t_drit);
+ free((ptr_t) * v);
+ free((ptr_t)(t->t_dcom));
+ free((ptr_t)t->t_dlef);
+ free((ptr_t)t->t_drit);
break;
case NODE_PAREN:
freesyn(t->t_dspr);
- xfree((ptr_t)t->t_dlef);
- xfree((ptr_t)t->t_drit);
+ free((ptr_t)t->t_dlef);
+ free((ptr_t)t->t_drit);
break;
case NODE_AND:
case NODE_OR:
@@ -636,5 +636,5 @@ freesyn(struct command *t)
freesyn(t->t_dcar), freesyn(t->t_dcdr);
break;
}
- xfree((ptr_t)t);
+ free((ptr_t)t);
}
Index: src/bin/csh/proc.c
diff -u src/bin/csh/proc.c:1.36 src/bin/csh/proc.c:1.37
--- src/bin/csh/proc.c:1.36 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/proc.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.c,v 1.36 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: proc.c,v 1.37 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: proc.c,v 1.36 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: proc.c,v 1.37 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -231,11 +231,11 @@ pwait(void)
for (pp = (fp = &proclist)->p_next; pp != NULL; pp = (fp = pp)->p_next)
if (pp->p_pid == 0) {
fp->p_next = pp->p_next;
- xfree((ptr_t) pp->p_command);
+ free((ptr_t) pp->p_command);
if (pp->p_cwd && --pp->p_cwd->di_count == 0)
if (pp->p_cwd->di_next == 0)
dfree(pp->p_cwd);
- xfree((ptr_t) pp);
+ free((ptr_t) pp);
pp = fp;
}
(void)sigprocmask(SIG_SETMASK, &osigset, NULL);
Index: src/bin/csh/set.c
diff -u src/bin/csh/set.c:1.33 src/bin/csh/set.c:1.34
--- src/bin/csh/set.c:1.33 Tue Jul 16 17:47:43 2013
+++ src/bin/csh/set.c Sat Jan 5 10:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.33 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: set.c,v 1.34 2019/01/05 10:51:06 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: set.c,v 1.33 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.34 2019/01/05 10:51:06 maya Exp $");
#endif
#endif /* not lint */
@@ -108,7 +108,7 @@ update_vars(Char *vp)
Setenv(STRHOME, cp);
/* fix directory stack for new tilde home */
dtilde();
- xfree((ptr_t)cp);
+ free((ptr_t)cp);
}
#ifdef FILEC
else if (eq(vp, STRfilec))
@@ -215,7 +215,7 @@ asx(Char *vp, int subscr, Char *p)
struct varent *v;
v = getvx(vp, subscr);
- xfree((ptr_t) v->vec[subscr - 1]);
+ free((ptr_t) v->vec[subscr - 1]);
v->vec[subscr - 1] = globone(p, G_APPEND);
}
@@ -315,9 +315,9 @@ dolet(Char **v, struct command *t)
dohash(NULL, NULL);
}
}
- xfree((ptr_t) vp);
+ free((ptr_t) vp);
if (c != '=')
- xfree((ptr_t) p);
+ free((ptr_t) p);
} while ((p = *v++) != NULL);
}
@@ -329,7 +329,7 @@ xset(Char *cp, Char ***vp)
if (*cp) {
dp = Strsave(cp);
--(*vp);
- xfree((ptr_t) ** vp);
+ free((ptr_t) ** vp);
**vp = dp;
}
return (putn(expr(vp)));
@@ -570,7 +570,7 @@ unsetv1(struct varent *p)
* Free associated memory first to avoid complications.
*/
blkfree(p->vec);
- xfree((ptr_t) p->v_name);
+ free((ptr_t) p->v_name);
/*
* If p is missing one child, then we can move the other into where p is.
* Otherwise, we find the predecessor of p, which is guaranteed to have no
@@ -598,7 +598,7 @@ unsetv1(struct varent *p)
/*
* Free the deleted node, and rebalance.
*/
- xfree((ptr_t) p);
+ free((ptr_t) p);
balance(pp, f, 1);
}
