39c39
< __FBSDID("$FreeBSD: head/bin/sh/exec.c 200956 2009-12-24 18:41:14Z jilles $");
---
> __FBSDID("$FreeBSD: head/bin/sh/exec.c 201053 2009-12-27 18:04:05Z jilles $");
112c112
< shellexec(char **argv, char **envp, const char *path, int index)
---
> shellexec(char **argv, char **envp, const char *path, int idx)
123c123
< if (--index < 0 && pathopt == NULL) {
---
> if (--idx < 0 && pathopt == NULL) {
271c271
< int index;
---
> int idx;
276c276
< index = cmdp->param.index;
---
> idx = cmdp->param.index;
281c281
< } while (--index >= 0);
---
> } while (--idx >= 0);
317c317
< int index;
---
> int idx;
357c357
< index = -1;
---
> idx = -1;
361c361
< index++;
---
> idx++;
380,381c380,381
< if (fullname[0] == '/' && index <= prev) {
< if (index < prev)
---
> if (fullname[0] == '/' && idx <= prev) {
> if (idx < prev)
418c418
< cmdp->param.index = index;
---
> cmdp->param.index = idx;
497c497
< int index;
---
> int idx;
504c504
< index = 0;
---
> idx = 0;
508c508
< firstchange = index;
---
> firstchange = idx;
517c517
< bltin = index;
---
> bltin = idx;
519c519
< index++;
---
> idx++;
727c727
< char **pp;
---
> const char *const *pp;
730,731c730
< int error = 0;
< extern char *const parsekwd[];
---
> int error1 = 0;
735c734
< for (pp = (char **)parsekwd; *pp; pp++)
---
> for (pp = parsekwd; *pp; pp++)
796c795
< error |= 127;
---
> error1 |= 127;
821c820
< error |= 127;
---
> error1 |= 127;
825c824
< return error;
---
> return error1;