From c8227639db90c3147ef68f33c98e96b0ab6b01d6 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Mon, 12 Nov 2001 16:57:27 +0000 Subject: Change strdup calls to xstrdup (patch from Steve Merrifield). --- shell/ash.c | 6 +++--- shell/lash.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index f218a88..c1603d7 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -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 * 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) { diff --git a/shell/lash.c b/shell/lash.c index 5b9d0a6..79fd433 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -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) { -- cgit v1.1