Attachment 308636 Details for Bug 450426 – patch to improve nash's environment substitutions

[patch] patch to improve nash's environment substitutions

n.patch (text/plain), 1.61 KB, created by JW on 2008-06-08 05:27:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: JW

Created: 2008-06-08 05:27:12 UTC

Size: 1.61 KB

patch

obsolete

>--- mkinitrd-6.0.19/nash/nash.c.orig	2007-09-28 03:26:43.000000000 +1000
>+++ mkinitrd-6.0.19/nash/nash.c	2008-06-08 15:12:27.000000000 +1000
>@@ -169,6 +169,47 @@
> }
> 
> static char *
>+envsubs(char *arg)
>+{
>+    char *dp;
>+    // from right to left makes most sense
>+    if ((dp = strrchr(arg, '$')))
>+    {
>+	char *name = dp+1;
>+	char rbr = '\0';
>+	if (*name == '{')
>+	{
>+	    rbr = '}';
>+	    name++;
>+	}
>+	if (*name)
>+	{
>+	    char *envname;
>+	    char *narg;
>+	    char *ep;
>+
>+	    for (ep = name; *ep && *ep != rbr; ep++)
>+		;
>+	    envname = alloca(ep - name + 1);
>+	    strncpy(envname, name, ep - name);
>+	    envname[ep - name] = '\0';
>+	    char *val = getenv(envname);
>+	    if (!val)
>+		val = "";
>+	    if (rbr && *ep == rbr)
>+		++ep;
>+
>+	    narg = malloc((dp - arg) + strlen(val) + strlen(ep) + 1);
>+	    strncpy(narg, arg, dp - arg);
>+	    strcpy(&narg[dp - arg], val);
>+	    strcat(&narg[dp - arg], ep);
>+	    return narg;
>+	}
>+    }
>+    return NULL;
>+}
>+
>+static char *
> getArg(char * cmd, char * end, char ** arg)
> {
>     char quote = '\0';
>@@ -201,14 +242,22 @@
>         *cmd = '\0';
>         cmd++;
>     } else {
>-        *arg = cmd;
>-        while (!isspace(*cmd) && cmd < end)
>-            cmd++;
>-        *cmd = '\0';
>-        if (**arg == '$')
>-            *arg = getenv(*arg+1);
>-        if (*arg == NULL)
>-            *arg = "";
>+	char *narg;
>+	int alloced = 0;
>+
>+	*arg = cmd;
>+	while (!isspace(*cmd) && cmd < end)
>+	    cmd++;
>+	*cmd = '\0';
>+
>+	while ((narg = envsubs(*arg)))
>+	{
>+fprintf(stderr, "narg=[%s]\n", narg);
>+	    if (alloced)
>+		free(*arg);
>+	    *arg = narg;
>+	    alloced = 1;
>+	}
>     }
> 
>     cmd++;

Actions: View | Diff

Attachments on bug 450426: 308636