emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change strdup calls to xstrdup (patch from Steve Merrifield).

Browse Source
This commit is contained in:
Matt Kraai
2001-11-12 16:57:27 +00:00
parent 357cfc739e
commit c8227639db
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -12090,7 +12090,7 @@ initvar() {
vpp = hashvar(ip->text);
vp->next = *vpp;
*vpp = vp;
vp->text = strdup(ip->text);
vp->text = xstrdup(ip->text);
vp->flags = ip->flags;
vp->func = ip->func;
}
@ -12102,7 +12102,7 @@ initvar() {
vpp = hashvar("PS1=");
vps1.next = *vpp;
*vpp = &vps1;
vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
vps1.text = xstrdup(geteuid() ? "PS1=$ " : "PS1=# ");
vps1.flags = VSTRFIXED|VTEXTFIXED;
}
}
@ -12646,7 +12646,7 @@ findvar(struct var **vpp, const char *name)
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin.
* $Id: ash.c,v 1.35 2001/11/12 16:44:55 kraai Exp $
* $Id: ash.c,v 1.36 2001/11/12 16:57:26 kraai Exp $
*/
static int timescmd (int argc, char **argv)
{

2
shell/lash.c
View File

@ -820,7 +820,7 @@ static int expand_arguments(char *command)
/* We need a clean copy, so strsep can mess up the copy while
* we write stuff into the original (in a minute) */
cmd = cmd_copy = strdup(command);
cmd = cmd_copy = xstrdup(command);
*command = '\0';
for (ix = 0, tmpcmd = cmd;
(tmpcmd = strsep_space(cmd, &ix)) != NULL; cmd += ix, ix=0) {