From 492efe0581832444d26594b19a3363250e26e2e9 Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Fri, 19 Mar 2004 18:39:41 +0000
Subject: [PATCH] Clean up the code in bin/ to reduce warnings from GCC3.

Stage 5 of 5: clean up sh.
- Add ``const'' to  appropriate variable declarations and casts.
- Add function prototypes and #include's as needed.
- Convert K&R style declarations to ANSI style.

Submitted-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
---
 bin/sh/alias.c       |  4 ++--
 bin/sh/arith.h       |  4 ++--
 bin/sh/arith.y       | 15 +++++++-----
 bin/sh/arith_lex.l   |  8 +++++--
 bin/sh/bltin/bltin.h |  4 +++-
 bin/sh/cd.c          |  6 ++---
 bin/sh/error.c       |  8 +++----
 bin/sh/error.h       |  4 ++--
 bin/sh/eval.c        | 10 ++++----
 bin/sh/eval.h        |  4 ++--
 bin/sh/exec.c        | 28 +++++++++++-----------
 bin/sh/exec.h        | 10 ++++----
 bin/sh/expand.c      | 24 +++++++++----------
 bin/sh/histedit.c    | 10 ++++----
 bin/sh/input.c       |  4 ++--
 bin/sh/input.h       |  4 ++--
 bin/sh/jobs.c        | 11 +++++----
 bin/sh/mail.c        |  5 ++--
 bin/sh/main.c        | 16 ++++++-------
 bin/sh/miscbltin.c   |  8 +++++--
 bin/sh/mkbuiltins    | 10 ++++----
 bin/sh/mkinit.c      | 55 ++++++++++++++++++++++----------------------
 bin/sh/mksyntax.c    | 24 +++++++++----------
 bin/sh/mktokens      |  4 ++--
 bin/sh/myhistedit.h  |  4 ++--
 bin/sh/mystring.c    |  4 ++--
 bin/sh/options.c     | 10 ++++----
 bin/sh/options.h     |  8 +++----
 bin/sh/parser.c      |  8 +++----
 bin/sh/parser.h      |  4 ++--
 bin/sh/var.c         | 55 ++++++++++++++++++++++----------------------
 bin/sh/var.h         | 12 +++++-----
 32 files changed, 202 insertions(+), 183 deletions(-)

diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 69d411a610..d1c00f946b 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -35,7 +35,7 @@
  *
  * @(#)alias.c	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/alias.c,v 1.12.2.2 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/alias.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/alias.c,v 1.4 2004/03/19 18:39:40 cpressey Exp $
  */
 
 #include <stdlib.h>
@@ -144,7 +144,7 @@ unalias(char *name)
 }
 
 #ifdef mkinit
-MKINIT void rmaliases();
+MKINIT void rmaliases(void);
 
 SHELLPROC {
 	rmaliases();
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 141b1e8286..856eaa6faf 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -32,8 +32,8 @@
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/arith.h,v 1.5.2.1 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/arith.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/arith.h,v 1.3 2004/03/19 18:39:40 cpressey Exp $
  */
 
-int arith(char *);
+int arith(const char *);
 int expcmd(int , char **);
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 74a334c040..2dbb914b35 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -90,7 +90,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
  *
  * @(#)arith.y	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/arith.y,v 1.10.2.2 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/arith.y,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/arith.y,v 1.3 2004/03/19 18:39:40 cpressey Exp $
  */
 
 #include "shell.h"
@@ -98,14 +98,17 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
 #include "output.h"
 #include "memalloc.h"
 
-char *arith_buf, *arith_startbuf;
-extern void arith_lex_reset();
+#include "arith.h"
+
+const char *arith_buf, *arith_startbuf;
+extern void arith_lex_reset(void);
 
 int yylex(void);
 int yyparse(void);
+void yyerror(const char *s);
 
 int
-arith(char *s)
+arith(const char *s)
 {
 	long result;
 
@@ -120,7 +123,7 @@ arith(char *s)
 }
 
 void
-yyerror(char *s)
+yyerror(const char *s)
 {
 
 	yyerrok;
@@ -135,7 +138,7 @@ yyerror(char *s)
 int
 expcmd(int argc, char **argv)
 {
-	char *p;
+	const char *p;
 	char *concat;
 	char **ap;
 	long i;
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 11855cfe1c..5408b8d8c4 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -36,18 +36,22 @@
  *
  * @(#)arith_lex.l	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/arith_lex.l,v 1.14.2.2 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/arith_lex.l,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/arith_lex.l,v 1.3 2004/03/19 18:39:40 cpressey Exp $
  */
 
 #include "y.tab.h"
 #include "error.h"
 
+extern int yylex(void);
+
 extern int yylval;
-extern char *arith_buf, *arith_startbuf;
+extern const char *arith_buf, *arith_startbuf;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
 	result = (*buf = *arith_buf++) ? 1 : YY_NULL;
 #define YY_NO_UNPUT
+
+void arith_lex_reset(void);
 %}
 
 %%
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index a6d8f512cd..09dfdd37d3 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -35,7 +35,7 @@
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.10.2.2 2002/07/19 04:38:54 tjr Exp $
- * $DragonFly: src/bin/sh/bltin/bltin.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/bltin/bltin.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -77,6 +77,8 @@
 	error("%s", buf);				\
 }
 
+int main(int, char *[]);
+
 #else
 #undef NULL
 #include <stdio.h>
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index ac8af45a45..2108b3dff5 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -35,7 +35,7 @@
  *
  * @(#)cd.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/cd.c,v 1.20.2.3 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/cd.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/cd.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <sys/types.h>
@@ -77,8 +77,8 @@ STATIC char *cdcomppath;
 int
 cdcmd(int argc, char **argv)
 {
-	char *dest;
-	char *path;
+	const char *dest;
+	const char *path;
 	char *p;
 	struct stat statb;
 	int ch, phys, print = 0;
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 883dac63a4..1a5c3c39d4 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -35,7 +35,7 @@
  *
  * @(#)error.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/error.c,v 1.15.2.4 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/error.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/error.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -47,6 +47,7 @@
 #include "options.h"
 #include "output.h"
 #include "error.h"
+#include "eval.h"  /* defines commandname */
 #include "nodes.h" /* show.h needs nodes.h */
 #include "show.h"
 #include "trap.h"
@@ -64,7 +65,6 @@ struct jmploc *handler;
 volatile sig_atomic_t exception;
 volatile sig_atomic_t suppressint;
 volatile sig_atomic_t intpending;
-char *commandname;
 
 
 static void exverror(int, const char *, va_list) __printf0like(2, 0);
@@ -186,7 +186,7 @@ exerror(int cond, const char *msg, ...)
 struct errname {
 	short errcode;		/* error number */
 	short action;		/* operation which encountered the error */
-	char *msg;		/* text describing the error */
+	const char *msg;	/* text describing the error */
 };
 
 
@@ -251,7 +251,7 @@ STATIC const struct errname errormsg[] = {
  * Action describes the operation that got the error.
  */
 
-char *
+const char *
 errmsg(int e, int action)
 {
 	struct errname const *ep;
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 581a7e8c72..4fb4d649d1 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -35,7 +35,7 @@
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/error.h,v 1.11.2.4 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/error.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/error.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -94,7 +94,7 @@ void exraise(int);
 void onint(void);
 void error(const char *, ...) __printf0like(1, 2);
 void exerror(int, const char *, ...) __printf0like(2, 3);
-char *errmsg(int, int);
+const char *errmsg(int, int);
 
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 560788564d..fb29580db2 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -35,7 +35,7 @@
  *
  * @(#)eval.c	8.9 (Berkeley) 6/8/95
  * $FreeBSD: src/bin/sh/eval.c,v 1.27.2.5 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/eval.c,v 1.3 2004/01/28 16:25:29 joerg Exp $
+ * $DragonFly: src/bin/sh/eval.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <sys/wait.h> /* For WIFSIGNALED(status) */
@@ -85,7 +85,7 @@ MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
 
 
-char *commandname;
+const char *commandname;
 struct strlist *cmdenviron;
 int exitstatus;			/* exit status of last command */
 int oexitstatus;		/* saved exit status */
@@ -605,7 +605,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 	struct job *jp;
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler;
-	char *volatile savecmdname;
+	const char *volatile savecmdname;
 	volatile struct shparam saveparam;
 	struct localvar *volatile savelocalvars;
 	volatile int e;
@@ -683,7 +683,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 		cmdentry.u.index = BLTINCMD;
 	} else {
 		static const char PATH[] = "PATH=";
-		char *path = pathval();
+		const char *path = pathval();
 
 		/*
 		 * Modify the command lookup path, if a PATH= assignment
@@ -997,7 +997,7 @@ commandcmd(int argc, char **argv)
 	static char stdpath[] = _PATH_STDPATH;
 	struct jmploc loc, *old;
 	struct strlist *sp;
-	char *path;
+	const char *path;
 	int ch;
 
 	for (sp = cmdenviron; sp ; sp = sp->next)
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 168ec1aed3..390fe74c5d 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -35,10 +35,10 @@
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/eval.h,v 1.7.2.2 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/eval.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/eval.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
-extern char *commandname;	/* currently executing command */
+extern const char *commandname;	/* currently executing command */
 extern int exitstatus;		/* exit status of last command */
 extern struct strlist *cmdenviron;  /* environment for builtin command */
 
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 08e23da86c..6e896c1046 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -35,7 +35,7 @@
  *
  * @(#)exec.c	8.4 (Berkeley) 6/8/95
  * $FreeBSD: src/bin/sh/exec.c,v 1.14.2.4 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/exec.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/exec.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <sys/types.h>
@@ -108,7 +108,7 @@ STATIC void delete_cmd_entry(void);
  */
 
 void
-shellexec(char **argv, char **envp, char *path, int index)
+shellexec(char **argv, char **envp, const char *path, int index)
 {
 	char *cmdname;
 	int e;
@@ -172,13 +172,14 @@ tryexec(char *cmd, char **argv, char **envp)
  * NULL.
  */
 
-char *pathopt;
+const char *pathopt;
 
 char *
-padvance(char **path, char *name)
+padvance(const char **path, const char *name)
 {
-	char *p, *q;
-	char *start;
+	const char *p;
+	char *q;
+	const char *start;
 	int len;
 
 	if (*path == NULL)
@@ -265,7 +266,7 @@ STATIC void
 printentry(struct tblentry *cmdp, int verbose)
 {
 	int index;
-	char *path;
+	const char *path;
 	char *name;
 
 	if (cmdp->cmdtype == CMDNORMAL) {
@@ -306,7 +307,7 @@ printentry(struct tblentry *cmdp, int verbose)
  */
 
 void
-find_command(char *name, struct cmdentry *entry, int printerr, char *path)
+find_command(char *name, struct cmdentry *entry, int printerr, const char *path)
 {
 	struct tblentry *cmdp;
 	int index;
@@ -549,7 +550,7 @@ clearcmdentry(int firstchange)
  */
 
 #ifdef mkinit
-MKINIT void deletefuncs();
+MKINIT void deletefuncs(void);
 
 SHELLPROC {
 	deletefuncs();
@@ -707,16 +708,16 @@ typecmd(int argc, char **argv)
 {
 	struct cmdentry entry;
 	struct tblentry *cmdp;
-	char **pp;
+	const char * const *pp;
 	struct alias *ap;
 	int i;
 	int error = 0;
-	extern char *const parsekwd[];
+	extern const char *const parsekwd[];
 
 	for (i = 1; i < argc; i++) {
 		out1str(argv[i]);
 		/* First look at the keywords */
-		for (pp = (char **)parsekwd; *pp; pp++)
+		for (pp = parsekwd; *pp; pp++)
 			if (**pp == *argv[i] && equal(*pp, argv[i]))
 				break;
 
@@ -744,7 +745,8 @@ typecmd(int argc, char **argv)
 		switch (entry.cmdtype) {
 		case CMDNORMAL: {
 			if (strchr(argv[i], '/') == NULL) {
-				char *path = pathval(), *name;
+				const char *path = pathval();
+				char *name;
 				int j = entry.u.index;
 				do {
 					name = padvance(&path, argv[i]);
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 472d4217a9..464a72d52f 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -35,7 +35,7 @@
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
  * $FreeBSD: src/bin/sh/exec.h,v 1.9.2.1 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/exec.h,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/exec.h,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /* values of cmdtype */
@@ -54,13 +54,13 @@ struct cmdentry {
 };
 
 
-extern char *pathopt;		/* set by padvance */
+extern const char *pathopt;		/* set by padvance */
 extern int exerrno;		/* last exec error */
 
-void shellexec(char **, char **, char *, int);
-char *padvance(char **, char *);
+void shellexec(char **, char **, const char *, int);
+char *padvance(const char **, const char *);
 int hashcmd(int, char **);
-void find_command(char *, struct cmdentry *, int, char *);
+void find_command(char *, struct cmdentry *, int, const char *);
 int find_builtin(char *);
 void hashcd(void);
 void changepath(const char *);
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 54689e3f37..8e189fb312 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -35,7 +35,7 @@
  *
  * @(#)expand.c	8.5 (Berkeley) 5/15/95
  * $FreeBSD: src/bin/sh/expand.c,v 1.31.2.5 2003/01/17 07:44:01 tjr Exp $
- * $DragonFly: src/bin/sh/expand.c,v 1.4 2004/02/05 19:07:24 joerg Exp $
+ * $DragonFly: src/bin/sh/expand.c,v 1.5 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <sys/types.h>
@@ -957,7 +957,7 @@ ifsbreakup(char *string, struct arglist *arglist)
 	char *start;
 	char *p;
 	char *q;
-	char *ifs;
+	const char *ifs;
 	int ifsspc;
 	int nulonly;
 
@@ -1103,7 +1103,7 @@ STATIC void
 expmeta(char *enddir, char *name)
 {
 	char *p;
-	char *q;
+	const char *q;
 	char *start;
 	char *endname;
 	int metaflag;
@@ -1176,14 +1176,14 @@ expmeta(char *enddir, char *name)
 		}
 	}
 	if (enddir == expdir) {
-		p = ".";
+		q = ".";
 	} else if (enddir == expdir + 1 && *expdir == '/') {
-		p = "/";
+		q = "/";
 	} else {
-		p = expdir;
+		q = expdir;
 		enddir[-1] = '\0';
 	}
-	if ((dirp = opendir(p)) == NULL)
+	if ((dirp = opendir(q)) == NULL)
 		return;
 	if (enddir != expdir)
 		enddir[-1] = '/';
@@ -1209,12 +1209,12 @@ expmeta(char *enddir, char *name)
 				scopy(dp->d_name, enddir);
 				addfname(expdir);
 			} else {
-				char *q;
-				for (p = enddir, q = dp->d_name;
-				     (*p++ = *q++) != '\0';)
+				char *t;
+				for (t = enddir, q = dp->d_name;
+				     (*t++ = *q++) != '\0';)
 					continue;
-				p[-1] = '/';
-				expmeta(p, endname);
+				t[-1] = '/';
+				expmeta(t, endname);
 			}
 		}
 	}
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index eb50cc978f..6020e41a4d 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -35,7 +35,7 @@
  *
  * @(#)histedit.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/histedit.c,v 1.13.2.4 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/histedit.c,v 1.3 2004/01/28 16:25:29 joerg Exp $
+ * $DragonFly: src/bin/sh/histedit.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <sys/param.h>
@@ -165,11 +165,11 @@ int
 histcmd(int argc, char **argv)
 {
 	int ch;
-	char *editor = NULL;
+	const char *editor = NULL;
 	const HistEvent *he;
 	int lflg = 0, nflg = 0, rflg = 0, sflg = 0;
 	int i;
-	char *firststr, *laststr;
+	const char *firststr, *laststr;
 	int first, last, direction;
 	char *pat = NULL, *repl;	/* ksh "fc old=new" crap */
 	static int active = 0;
@@ -420,10 +420,10 @@ not_fcnumber(char *s)
 }
 
 int
-str_to_event(char *str, int last)
+str_to_event(const char *str, int last)
 {
 	const HistEvent *he;
-	char *s = str;
+	const char *s = str;
 	int relative = 0;
 	int i;
 
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 13c0ef0cf1..3dcaa25fa9 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -35,7 +35,7 @@
  *
  * @(#)input.c	8.3 (Berkeley) 6/9/95
  * $FreeBSD: src/bin/sh/input.c,v 1.14.2.2 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/input.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/input.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <stdio.h>	/* defines BUFSIZ */
@@ -373,7 +373,7 @@ popstring(void)
  */
 
 void
-setinputfile(char *fname, int push)
+setinputfile(const char *fname, int push)
 {
 	int fd;
 	int fd2;
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 2d1c00158d..948eec8e51 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -35,7 +35,7 @@
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/input.h,v 1.7.2.1 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/input.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/input.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
@@ -56,7 +56,7 @@ int preadbuffer(void);
 void pungetc(void);
 void pushstring(char *, int, void *);
 void popstring(void);
-void setinputfile(char *, int);
+void setinputfile(const char *, int);
 void setinputfd(int, int);
 void setinputstring(char *, int);
 void popfile(void);
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index a6c006e48e..52fc842d9a 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -35,7 +35,7 @@
  *
  * @(#)jobs.c	8.5 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/jobs.c,v 1.27.2.10 2003/04/04 08:16:26 tjr Exp $
- * $DragonFly: src/bin/sh/jobs.c,v 1.4 2003/10/14 23:03:08 dillon Exp $
+ * $DragonFly: src/bin/sh/jobs.c,v 1.5 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <fcntl.h>
@@ -92,7 +92,7 @@ STATIC struct job *getjob(char *);
 STATIC pid_t dowait(int, struct job *);
 STATIC pid_t waitproc(int, int *);
 STATIC void cmdtxt(union node *);
-STATIC void cmdputs(char *);
+STATIC void cmdputs(const char *);
 #if JOBS
 STATIC void setcurjob(struct job *);
 STATIC void deljob(struct job *);
@@ -1073,7 +1073,7 @@ cmdtxt(union node *n)
 {
 	union node *np;
 	struct nodelist *lp;
-	char *p;
+	const char *p;
 	int i;
 	char s[2];
 
@@ -1202,9 +1202,10 @@ redir:
 
 
 STATIC void
-cmdputs(char *s)
+cmdputs(const char *s)
 {
-	char *p, *q;
+	const char *p;
+	char *q;
 	char c;
 	int subtype = 0;
 
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 39df8b079d..658e00a599 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -35,7 +35,7 @@
  *
  * @(#)mail.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/mail.c,v 1.9.2.2 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/mail.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/mail.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -52,6 +52,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
+#include "mail.h"
 
 #define MAXMBOXES 10
 
@@ -71,7 +72,7 @@ void
 chkmail(int silent)
 {
 	int i;
-	char *mpath;
+	const char *mpath;
 	char *p;
 	char *q;
 	struct stackmark smark;
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 54f36a5d3b..ac6ce1bc7e 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/28/95
  * $FreeBSD: src/bin/sh/main.c,v 1.18.2.3 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/main.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/main.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <stdio.h>
@@ -77,8 +77,8 @@ short profile_buf[16384];
 extern int etext();
 #endif
 
-STATIC void read_profile(char *);
-STATIC char *find_dot_file(char *);
+STATIC void read_profile(const char *);
+STATIC const char *find_dot_file(const char *);
 
 /*
  * Main routine.  We initialize things, parse the arguments, execute
@@ -257,7 +257,7 @@ cmdloop(int top)
  */
 
 STATIC void
-read_profile(char *name)
+read_profile(const char *name)
 {
 	int fd;
 
@@ -300,12 +300,12 @@ readcmdfile(char *name)
  */
 
 
-STATIC char *
-find_dot_file(char *basename)
+STATIC const char *
+find_dot_file(const char *basename)
 {
 	static char localname[FILENAME_MAX+1];
 	char *fullname;
-	char *path = pathval();
+	const char *path = pathval();
 	struct stat statb;
 
 	/* don't try this for absolute or relative paths */
@@ -331,7 +331,7 @@ dotcmd(int argc, char **argv)
 		setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED);
 
 	if (argc >= 2) {		/* That's what SVR2 does */
-		char *fullname = find_dot_file(argv[1]);
+		const char *fullname = find_dot_file(argv[1]);
 
 		setinputfile(fullname, 1);
 		commandname = fullname;
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index f09f1120d4..c9c51b0cb1 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -35,7 +35,7 @@
  *
  * @(#)miscbltin.c	8.4 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/miscbltin.c,v 1.22.2.3 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/miscbltin.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/miscbltin.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -61,6 +61,10 @@
 #include "error.h"
 #include "mystring.h"
 
+int readcmd(int, char **);
+int umaskcmd(int, char **);
+int ulimitcmd(int, char **);
+
 #undef eflag
 
 /*
@@ -77,7 +81,7 @@ readcmd(int argc __unused, char **argv __unused)
 	int backslash;
 	char c;
 	int rflag;
-	char *prompt;
+	const char *prompt;
 	char *ifs;
 	char *p;
 	int startword;
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index e66322c1c8..618167b724 100644
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -36,7 +36,7 @@
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
 # $FreeBSD: src/bin/sh/mkbuiltins,v 1.8.2.3 2002/11/30 07:54:49 tjr Exp $
-# $DragonFly: src/bin/sh/mkbuiltins,v 1.2 2003/06/17 04:22:50 dillon Exp $
+# $DragonFly: src/bin/sh/mkbuiltins,v 1.3 2004/03/19 18:39:41 cpressey Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
@@ -62,9 +62,9 @@ cat <<\!
 !
 awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \
     print $0}' builtins.def | sed 's/-[hj]//' > $temp
-awk '{	printf "int %s();\n", $1}' $temp
+awk '{	printf "int %s(int, char *[]);\n", $1}' $temp
 echo '
-int (*const builtinfunc[])() = {'
+int (*const builtinfunc[])(int, char *[]) = {'
 awk '/^[^#]/ {	printf "\t%s,\n", $1}' $temp
 echo '};
 
@@ -87,10 +87,10 @@ tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ < $temp |
 	awk '{	printf "#define %s %d\n", $1, NR-1}'
 echo '
 struct builtincmd {
-      char *name;
+      const char *name;
       int code;
 };
 
-extern int (*const builtinfunc[])();
+extern int (*const builtinfunc[])(int, char *[]);
 extern const struct builtincmd builtincmd[];'
 rm -f $temp
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index a22cd78bc7..fd2ca19a18 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)mkinit.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/mkinit.c,v 1.14.2.1 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/mkinit.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/mkinit.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -97,9 +97,9 @@ struct block {
  */
 
 struct event {
-	char *name;		/* name of event (e.g. INIT) */
-	char *routine;		/* name of routine called on event */
-	char *comment;		/* comment describing routine */
+	const char *name;   	/* name of event (e.g. INIT) */
+	const char *routine;	/* name of routine called on event */
+	const char *comment;	/* comment describing routine */
 	struct text code;	/* code for handling event */
 };
 
@@ -135,28 +135,28 @@ struct event event[] = {
 };
 
 
-char *curfile;				/* current file */
+const char *curfile;			/* current file */
 int linno;				/* current line */
-char *header_files[200];		/* list of header files */
+const char *header_files[200];		/* list of header files */
 struct text defines;			/* #define statements */
 struct text decls;			/* declarations */
 int amiddecls;				/* for formatting */
 
 
-void readfile(char *);
-int match(char *, char *);
-int gooddefine(char *);
-void doevent(struct event *, FILE *, char *);
+void readfile(const char *);
+int match(const char *, const char *);
+int gooddefine(const char *);
+void doevent(struct event *, FILE *, const char *);
 void doinclude(char *);
 void dodecl(char *, FILE *);
 void output(void);
-void addstr(char *, struct text *);
+void addstr(const char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
-FILE *ckfopen(char *, char *);
+FILE *ckfopen(const char *, const char *);
 void *ckmalloc(int);
-char *savestr(char *);
-void error(char *);
+char *savestr(const char *);
+void error(const char *);
 
 #define equal(s1, s2)	(strcmp(s1, s2) == 0)
 
@@ -167,6 +167,7 @@ main(int argc __unused, char *argv[])
 
 	header_files[0] = "\"shell.h\"";
 	header_files[1] = "\"mystring.h\"";
+	header_files[2] = "\"init.h\"";
 	for (ap = argv + 1 ; *ap ; ap++)
 		readfile(*ap);
 	output();
@@ -180,7 +181,7 @@ main(int argc __unused, char *argv[])
  */
 
 void
-readfile(char *fname)
+readfile(const char *fname)
 {
 	FILE *fp;
 	char line[1024];
@@ -224,9 +225,9 @@ readfile(char *fname)
 
 
 int
-match(char *name, char *line)
+match(const char *name, const char *line)
 {
-	char *p, *q;
+	const char *p, *q;
 
 	p = name, q = line;
 	while (*p) {
@@ -240,9 +241,9 @@ match(char *name, char *line)
 
 
 int
-gooddefine(char *line)
+gooddefine(const char *line)
 {
-	char *p;
+	const char *p;
 
 	if (! match("#define", line))
 		return 0;			/* not a define */
@@ -263,7 +264,7 @@ gooddefine(char *line)
 
 
 void
-doevent(struct event *ep, FILE *fp, char *fname)
+doevent(struct event *ep, FILE *fp, const char *fname)
 {
 	char line[1024];
 	int indent;
@@ -304,7 +305,7 @@ doinclude(char *line)
 {
 	char *p;
 	char *name;
-	char **pp;
+	const char **pp;
 
 	for (p = line ; *p != '"' && *p != '<' && *p != '\0' ; p++);
 	if (*p == '\0')
@@ -372,7 +373,7 @@ void
 output(void)
 {
 	FILE *fp;
-	char **pp;
+	const char * const *pp;
 	struct event *ep;
 
 	fp = ckfopen(OUTTEMP, "w");
@@ -386,7 +387,7 @@ output(void)
 	for (ep = event ; ep->name ; ep++) {
 		fputs("\n\n\n", fp);
 		fputs(ep->comment, fp);
-		fprintf(fp, "\nvoid\n%s() {\n", ep->routine);
+		fprintf(fp, "\nvoid\n%s(void) {\n", ep->routine);
 		writetext(&ep->code, fp);
 		fprintf(fp, "}\n");
 	}
@@ -401,7 +402,7 @@ output(void)
  */
 
 void
-addstr(char *s, struct text *text)
+addstr(const char *s, struct text *text)
 {
 	while (*s) {
 		if (--text->nleft < 0)
@@ -446,7 +447,7 @@ writetext(struct text *text, FILE *fp)
 }
 
 FILE *
-ckfopen(char *file, char *mode)
+ckfopen(const char *file, const char *mode)
 {
 	FILE *fp;
 
@@ -468,7 +469,7 @@ ckmalloc(int nbytes)
 }
 
 char *
-savestr(char *s)
+savestr(const char *s)
 {
 	char *p;
 
@@ -478,7 +479,7 @@ savestr(char *s)
 }
 
 void
-error(char *msg)
+error(const char *msg)
 {
 	if (curfile != NULL)
 		fprintf(stderr, "%s:%d: ", curfile, linno);
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 0ef61dd934..ce3874ef73 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)mksyntax.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/mksyntax.c,v 1.14.2.3 2002/07/19 04:38:51 tjr Exp $
- * $DragonFly: src/bin/sh/mksyntax.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/mksyntax.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -50,8 +50,8 @@
 
 
 struct synclass {
-	char *name;
-	char *comment;
+	const char *name;
+	const char *comment;
 };
 
 /* Syntax classes */
@@ -96,16 +96,16 @@ static char writer[] = "\
 
 static FILE *cfile;
 static FILE *hfile;
-static char *syntax[513];
+static const char *syntax[513];
 static int base;
 static int size;	/* number of values which a char variable can have */
 static int nbits;	/* number of bits in a character */
 static int digit_contig;/* true if digits are contiguous */
 
-static void filltable(char *);
+static void filltable(const char *);
 static void init(void);
-static void add(char *, char *);
-static void print(char *);
+static void add(const char *, const char *);
+static void print(const char *);
 static void output_type_macros(void);
 static void digit_convert(void);
 
@@ -257,7 +257,7 @@ main(int argc __unused, char **argv __unused)
  */
 
 static void
-filltable(char *dftval)
+filltable(const char *dftval)
 {
 	int i;
 
@@ -291,7 +291,7 @@ init(void)
  */
 
 static void
-add(char *p, char *type)
+add(const char *p, const char *type)
 {
 	while (*p)
 		syntax[*p++ + base] = type;
@@ -304,7 +304,7 @@ add(char *p, char *type)
  */
 
 static void
-print(char *name)
+print(const char *name)
 {
 	int i;
 	int col;
@@ -336,7 +336,7 @@ print(char *name)
  * contiguous, we can test for them quickly.
  */
 
-static char *macro[] = {
+static const char *macro[] = {
 	"#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)",
 	"#define is_alpha(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))",
 	"#define is_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))",
@@ -348,7 +348,7 @@ static char *macro[] = {
 static void
 output_type_macros(void)
 {
-	char **pp;
+	const char **pp;
 
 	if (digit_contig)
 		macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 411b95cac3..717a03e3e9 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -36,7 +36,7 @@
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
 # $FreeBSD: src/bin/sh/mktokens,v 1.6.2.2 2002/07/19 04:38:51 tjr Exp $
-# $DragonFly: src/bin/sh/mktokens,v 1.2 2003/06/17 04:22:50 dillon Exp $
+# $DragonFly: src/bin/sh/mktokens,v 1.3 2004/03/19 18:39:41 cpressey Exp $
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
@@ -91,7 +91,7 @@ echo '};
 sed 's/"//g' $temp | awk '
 /TIF/{print "#define KWDOFFSET " NR-1; print ""; print "const char *const parsekwd[] = {"}
 /TIF/,/neverfound/{print "	\"" $3 "\","}'
-echo '	0
+echo '	NULL
 };'
 
 rm $temp
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index e26ac3a848..ec1b2499c1 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -32,7 +32,7 @@
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/myhistedit.h,v 1.7.2.2 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/myhistedit.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/myhistedit.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <histedit.h>
@@ -45,6 +45,6 @@ void histedit(void);
 void sethistsize(const char *);
 int histcmd(int, char **);
 int not_fcnumber(char *);
-int str_to_event(char *, int);
+int str_to_event(const char *, int);
 int bindcmd(int, char **);
 
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 64241a67de..de89228f71 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -35,7 +35,7 @@
  *
  * @(#)mystring.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/mystring.c,v 1.10.2.1 2002/07/19 04:38:52 tjr Exp $
- * $DragonFly: src/bin/sh/mystring.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/mystring.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -108,7 +108,7 @@ int
 number(const char *s)
 {
 	if (! is_number(s))
-		error("Illegal number: %s", (char *)s);
+		error("Illegal number: %s", s);
 	return atoi(s);
 }
 
diff --git a/bin/sh/options.c b/bin/sh/options.c
index d4c9cb1451..cb392d7f0e 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -35,7 +35,7 @@
  *
  * @(#)options.c	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/options.c,v 1.15.2.2 2002/07/19 04:38:52 tjr Exp $
- * $DragonFly: src/bin/sh/options.c,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/options.c,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <signal.h>
@@ -63,8 +63,8 @@
 char *arg0;			/* value of $0 */
 struct shparam shellparam;	/* current positional parameters */
 char **argptr;			/* argument list for builtin commands */
-char *shoptarg;			/* set by nextopt (like getopt) */
-char *optptr;			/* used by nextopt */
+const char *shoptarg;		/* set by nextopt (like getopt) */
+const char *optptr;		/* used by nextopt */
 
 char *minusc;			/* argument to -c option */
 
@@ -506,9 +506,9 @@ out:
  */
 
 int
-nextopt(char *optstring)
+nextopt(const char *optstring)
 {
-	char *p, *q;
+	const char *p, *q;
 	char c;
 
 	if ((p = optptr) == NULL || *p == '\0') {
diff --git a/bin/sh/options.h b/bin/sh/options.h
index a063e01a90..b661ef6d8a 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -35,7 +35,7 @@
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/options.h,v 1.9.2.3 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/options.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/options.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 struct shparam {
@@ -106,8 +106,8 @@ extern char *minusc;		/* argument to -c option */
 extern char *arg0;		/* $0 */
 extern struct shparam shellparam;  /* $@ */
 extern char **argptr;		/* argument list for builtin commands */
-extern char *shoptarg;		/* set by nextopt */
-extern char *optptr;		/* used by nextopt */
+extern const char *shoptarg;	/* set by nextopt */
+extern const char *optptr;	/* used by nextopt */
 
 void procargs(int, char **);
 void optschanged(void);
@@ -116,5 +116,5 @@ void freeparam(struct shparam *);
 int shiftcmd(int, char **);
 int setcmd(int, char **);
 int getoptscmd(int, char **);
-int nextopt(char *);
+int nextopt(const char *);
 void getoptsreset(const char *);
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 63b56a508a..1594670320 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -35,7 +35,7 @@
  *
  * @(#)parser.c	8.7 (Berkeley) 5/16/95
  * $FreeBSD: src/bin/sh/parser.c,v 1.29.2.9 2002/10/18 11:24:04 tjr Exp $
- * $DragonFly: src/bin/sh/parser.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/parser.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <stdlib.h>
@@ -118,7 +118,7 @@ STATIC int xxreadtoken(void);
 STATIC int readtoken1(int, char const *, char *, int);
 STATIC int noexpand(char *);
 STATIC void synexpect(int);
-STATIC void synerror(char *);
+STATIC void synerror(const char *);
 STATIC void setprompt(int);
 
 
@@ -1544,7 +1544,7 @@ synexpect(int token)
 
 
 STATIC void
-synerror(char *msg)
+synerror(const char *msg)
 {
 	if (commandname)
 		outfmt(&errout, "%s: %d: ", commandname, startlinno);
@@ -1567,7 +1567,7 @@ setprompt(int which)
  * called by editline -- any expansions to the prompt
  *    should be added here.
  */
-char *
+const char *
 getprompt(void *unused __unused)
 {
 	switch (whichprompt) {
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index cf71a3a849..c493708174 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -35,7 +35,7 @@
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/parser.h,v 1.8.2.1 2002/07/19 04:38:52 tjr Exp $
- * $DragonFly: src/bin/sh/parser.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/parser.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /* control characters in argument strings */
@@ -80,4 +80,4 @@ extern int whichprompt;		/* 1 == PS1, 2 == PS2 */
 union node *parsecmd(int);
 void fixredir(union node *, const char *, int);
 int goodname(char *);
-char *getprompt(void *);
+const char *getprompt(void *);
diff --git a/bin/sh/var.c b/bin/sh/var.c
index eaaf50b72a..2e1699ad9a 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -35,7 +35,7 @@
  *
  * @(#)var.c	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/var.c,v 1.15.2.2 2002/08/27 01:36:28 tjr Exp $
- * $DragonFly: src/bin/sh/var.c,v 1.3 2003/08/24 16:26:00 drhodus Exp $
+ * $DragonFly: src/bin/sh/var.c,v 1.4 2004/03/19 18:39:41 cpressey Exp $
  */
 
 #include <unistd.h>
@@ -72,7 +72,7 @@
 struct varinit {
 	struct var *var;
 	int flags;
-	char *text;
+	const char *text;
 	void (*func)(const char *);
 };
 
@@ -132,12 +132,12 @@ STATIC const struct varinit varinit[] = {
 
 STATIC struct var *vartab[VTABSIZE];
 
-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 *);
 
 /*
- * Initialize the varable symbol tables and import the environment
+ * Initialize the variable symbol tables and import the environment.
  */
 
 #ifdef mkinit
@@ -200,7 +200,7 @@ initvar(void)
  */
 
 int
-setvarsafe(char *name, char *val, int flags)
+setvarsafe(const char *name, const char *val, int flags)
 {
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
@@ -226,28 +226,29 @@ setvarsafe(char *name, char *val, int flags)
  */
 
 void
-setvar(char *name, char *val, int flags)
+setvar(const char *name, const char *val, int flags)
 {
-	char *p, *q;
+	const char *cp;
+	char *p;
 	int len;
 	int namelen;
 	char *nameeq;
 	int isbad;
 
 	isbad = 0;
-	p = name;
-	if (! is_name(*p))
+	cp = name;
+	if (!is_name(*cp))
 		isbad = 1;
-	p++;
+	cp++;
 	for (;;) {
-		if (! is_in_name(*p)) {
-			if (*p == '\0' || *p == '=')
+		if (!is_in_name(*cp)) {
+			if (*cp == '\0' || *cp == '=')
 				break;
 			isbad = 1;
 		}
-		p++;
+		cp++;
 	}
-	namelen = p - name;
+	namelen = cp - name;
 	if (isbad)
 		error("%.*s: bad variable name", namelen, name);
 	len = namelen + 2;		/* 2 is space for '=' and '\0' */
@@ -257,9 +258,9 @@ setvar(char *name, char *val, int flags)
 		len += strlen(val);
 	}
 	p = nameeq = ckmalloc(len);
-	q = name;
+	cp = name;
 	while (--namelen >= 0)
-		*p++ = *q++;
+		*p++ = *cp++;
 	*p++ = '=';
 	*p = '\0';
 	if (val)
@@ -268,13 +269,13 @@ setvar(char *name, char *val, int flags)
 }
 
 STATIC int
-localevar(char *s)
+localevar(const char *s)
 {
-	static char *lnames[7] = {
+	static const char * const lnames[7] = {
 		"ALL", "COLLATE", "CTYPE", "MONETARY",
 		"NUMERIC", "TIME", NULL
 	};
-	char **ss;
+	const char * const *ss;
 
 	if (*s != 'L')
 		return 0;
@@ -376,7 +377,7 @@ listsetvar(struct strlist *list)
  */
 
 char *
-lookupvar(char *name)
+lookupvar(const char *name)
 {
 	struct var *v;
 
@@ -399,7 +400,7 @@ lookupvar(char *name)
  */
 
 char *
-bltinlookup(char *name, int doall)
+bltinlookup(const char *name, int doall)
 {
 	struct strlist *sp;
 	struct var *v;
@@ -458,7 +459,7 @@ environment(void)
  */
 
 #ifdef mkinit
-MKINIT void shprocvar();
+MKINIT void shprocvar(void);
 
 SHELLPROC {
 	shprocvar();
@@ -744,7 +745,7 @@ unsetcmd(int argc __unused, char **argv __unused)
  */
 
 int
-unsetvar(char *s)
+unsetvar(const char *s)
 {
 	struct var **vpp;
 	struct var *vp;
@@ -784,7 +785,7 @@ unsetvar(char *s)
  */
 
 STATIC struct var **
-hashvar(char *p)
+hashvar(const char *p)
 {
 	unsigned int hashval;
 
@@ -803,7 +804,7 @@ hashvar(char *p)
  */
 
 STATIC int
-varequal(char *p, char *q)
+varequal(const char *p, const char *q)
 {
 	while (*p == *q++) {
 		if (*p++ == '=')
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 61451b5164..2a8875f694 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -35,7 +35,7 @@
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
  * $FreeBSD: src/bin/sh/var.h,v 1.8.2.1 2002/07/19 04:38:52 tjr Exp $
- * $DragonFly: src/bin/sh/var.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/sh/var.h,v 1.3 2004/03/19 18:39:41 cpressey Exp $
  */
 
 /*
@@ -116,12 +116,12 @@ extern struct var vhistsize;
 #define mpathset()	((vmpath.flags & VUNSET) == 0)
 
 void initvar(void);
-void setvar(char *, char *, int);
+void setvar(const char *, const char *, int);
 void setvareq(char *, int);
 struct strlist;
 void listsetvar(struct strlist *);
-char *lookupvar(char *);
-char *bltinlookup(char *, int);
+char *lookupvar(const char *);
+char *bltinlookup(const char *, int);
 char **environment(void);
 void shprocvar(void);
 int showvarscmd(int, char **);
@@ -131,5 +131,5 @@ void mklocal(char *);
 void poplocalvars(void);
 int setvarcmd(int, char **);
 int unsetcmd(int, char **);
-int unsetvar(char *);
-int setvarsafe(char *, char *, int);
+int unsetvar(const char *);
+int setvarsafe(const char *, const char *, int);
-- 
2.41.0