39c39
< __FBSDID("$FreeBSD: head/bin/sh/parser.c 213760 2010-10-13 04:01:01Z obrien $");
---
> __FBSDID("$FreeBSD: head/bin/sh/parser.c 213811 2010-10-13 22:18:03Z obrien $");
108,123c108,123
< STATIC union node *list(int);
< STATIC union node *andor(void);
< STATIC union node *pipeline(void);
< STATIC union node *command(void);
< STATIC union node *simplecmd(union node **, union node *);
< STATIC union node *makename(void);
< STATIC void parsefname(void);
< STATIC void parseheredoc(void);
< STATIC int peektoken(void);
< STATIC int readtoken(void);
< STATIC int xxreadtoken(void);
< STATIC int readtoken1(int, char const *, char *, int);
< STATIC int noexpand(char *);
< STATIC void synexpect(int) __dead2;
< STATIC void synerror(const char *) __dead2;
< STATIC void setprompt(int);
---
> static union node *list(int);
> static union node *andor(void);
> static union node *pipeline(void);
> static union node *command(void);
> static union node *simplecmd(union node **, union node *);
> static union node *makename(void);
> static void parsefname(void);
> static void parseheredoc(void);
> static int peektoken(void);
> static int readtoken(void);
> static int xxreadtoken(void);
> static int readtoken1(int, char const *, char *, int);
> static int noexpand(char *);
> static void synexpect(int) __dead2;
> static void synerror(const char *) __dead2;
> static void setprompt(int);
126c126
< STATIC void *
---
> static void *
142c142
< STATIC void *
---
> static void *
157c157
< STATIC void
---
> static void
177c177
< STATIC void
---
> static void
226c226
< STATIC union node *
---
> static union node *
299c299
< STATIC union node *
---
> static union node *
326c326
< STATIC union node *
---
> static union node *
368c368
< STATIC union node *
---
> static union node *
611c611
< STATIC union node *
---
> static union node *
673c673
< STATIC union node *
---
> static union node *
707c707
< STATIC void
---
> static void
749c749
< STATIC void
---
> static void
773c773
< STATIC int
---
> static int
783c783
< STATIC int
---
> static int
863c863
< STATIC int
---
> static int
934c934
< #define MAXNEST_STATIC 8
---
> #define MAXNEST_static 8
953c953
< STATIC char *
---
> static char *
1134c1134
< STATIC int
---
> static int
1146,1147c1146,1147
< struct tokenstate state_static[MAXNEST_STATIC];
< int maxnest = MAXNEST_STATIC;
---
> struct tokenstate state_static[MAXNEST_static];
> int maxnest = MAXNEST_static;
1557c1557
< MAXNEST_STATIC * sizeof(*state));
---
> MAXNEST_static * sizeof(*state));
1600c1600
< MAXNEST_STATIC * sizeof(*state));
---
> MAXNEST_static * sizeof(*state));
1633c1633
< STATIC int
---
> static int
1679c1679
< STATIC void
---
> static void
1694c1694
< STATIC void
---
> static void
1703c1703
< STATIC void
---
> static void