39c39
< __FBSDID("$FreeBSD: head/bin/sh/var.c 200943 2009-12-24 15:14:22Z jilles $");
---
> __FBSDID("$FreeBSD: head/bin/sh/var.c 200956 2009-12-24 18:41:14Z jilles $");
125,127c125,127
< STATIC struct var **hashvar(char *);
< STATIC int varequal(char *, char *);
< STATIC int localevar(char *);
---
> STATIC struct var **hashvar(const char *);
> STATIC int varequal(const char *, const char *);
> STATIC int localevar(const char *);
193c193
< setvarsafe(char *name, char *val, int flags)
---
> setvarsafe(const char *name, const char *val, int flags)
218c218
< setvar(char *name, char *val, int flags)
---
> setvar(const char *name, const char *val, int flags)
220c220
< char *p, *q;
---
> const char *p;
248,253c248,250
< p = nameeq = ckmalloc(len);
< q = name;
< while (--namelen >= 0)
< *p++ = *q++;
< *p++ = '=';
< *p = '\0';
---
> nameeq = ckmalloc(len);
> memcpy(nameeq, name, namelen);
> nameeq[namelen] = '=';
255c252,254
< scopy(val, p);
---
> scopy(val, nameeq + namelen + 1);
> else
> nameeq[namelen + 1] = '\0';
260c259
< localevar(char *s)
---
> localevar(const char *s)
286c285
< change_env(char *s, int set)
---
> change_env(const char *s, int set)
392c391
< lookupvar(char *name)
---
> lookupvar(const char *name)
415c414
< bltinlookup(char *name, int doall)
---
> bltinlookup(const char *name, int doall)
799c798
< unsetvar(char *s)
---
> unsetvar(const char *s)
839c838
< hashvar(char *p)
---
> hashvar(const char *p)
858c857
< varequal(char *p, char *q)
---
> varequal(const char *p, const char *q)