Module Name: src
Committed By: christos
Date: Sat Jun 18 21:18:46 UTC 2011
Modified Files:
src/bin/sh: alias.c alias.h arith.y cd.c cd.h exec.h expand.c expand.h
histedit.c jobs.c jobs.h main.c main.h miscbltin.c myhistedit.h
options.c options.h trap.c trap.h var.c var.h
Log Message:
PR/45069: Henning Petersen: Use prototypes from builtins.h .
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/bin/sh/alias.c
cvs rdiff -u -r1.6 -r1.7 src/bin/sh/alias.h
cvs rdiff -u -r1.19 -r1.20 src/bin/sh/arith.y src/bin/sh/jobs.h \
src/bin/sh/options.h
cvs rdiff -u -r1.42 -r1.43 src/bin/sh/cd.c src/bin/sh/histedit.c
cvs rdiff -u -r1.5 -r1.6 src/bin/sh/cd.h
cvs rdiff -u -r1.21 -r1.22 src/bin/sh/exec.h
cvs rdiff -u -r1.83 -r1.84 src/bin/sh/expand.c
cvs rdiff -u -r1.17 -r1.18 src/bin/sh/expand.h
cvs rdiff -u -r1.68 -r1.69 src/bin/sh/jobs.c
cvs rdiff -u -r1.56 -r1.57 src/bin/sh/main.c
cvs rdiff -u -r1.10 -r1.11 src/bin/sh/main.h src/bin/sh/myhistedit.h
cvs rdiff -u -r1.38 -r1.39 src/bin/sh/miscbltin.c
cvs rdiff -u -r1.41 -r1.42 src/bin/sh/options.c
cvs rdiff -u -r1.34 -r1.35 src/bin/sh/trap.c
cvs rdiff -u -r1.18 -r1.19 src/bin/sh/trap.h
cvs rdiff -u -r1.39 -r1.40 src/bin/sh/var.c
cvs rdiff -u -r1.24 -r1.25 src/bin/sh/var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/alias.c
diff -u src/bin/sh/alias.c:1.13 src/bin/sh/alias.c:1.14
--- src/bin/sh/alias.c:1.13 Fri Oct 29 13:04:48 2010
+++ src/bin/sh/alias.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: alias.c,v 1.13 2010/10/29 17:04:48 stacktic Exp $ */
+/* $NetBSD: alias.c,v 1.14 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: alias.c,v 1.13 2010/10/29 17:04:48 stacktic Exp $");
+__RCSID("$NetBSD: alias.c,v 1.14 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -50,6 +50,7 @@
#include "mystring.h"
#include "alias.h"
#include "options.h" /* XXX for argptr (should remove?) */
+#include "builtins.h"
#include "var.h"
#define ATABSIZE 39
Index: src/bin/sh/alias.h
diff -u src/bin/sh/alias.h:1.6 src/bin/sh/alias.h:1.7
--- src/bin/sh/alias.h:1.6 Thu Aug 7 05:05:29 2003
+++ src/bin/sh/alias.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: alias.h,v 1.6 2003/08/07 09:05:29 agc Exp $ */
+/* $NetBSD: alias.h,v 1.7 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -45,6 +45,4 @@
struct alias *lookupalias(char *, int);
char *get_alias_text(char *);
-int aliascmd(int, char **);
-int unaliascmd(int, char **);
void rmaliases(void);
Index: src/bin/sh/arith.y
diff -u src/bin/sh/arith.y:1.19 src/bin/sh/arith.y:1.20
--- src/bin/sh/arith.y:1.19 Fri Nov 13 08:49:09 2009
+++ src/bin/sh/arith.y Sat Jun 18 17:18:46 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith.y,v 1.19 2009/11/13 13:49:09 gson Exp $ */
+/* $NetBSD: arith.y,v 1.20 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -38,12 +38,13 @@
#if 0
static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: arith.y,v 1.19 2009/11/13 13:49:09 gson Exp $");
+__RCSID("$NetBSD: arith.y,v 1.20 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
#include <stdlib.h>
#include "expand.h"
+#include "builtins.h"
#include "shell.h"
#include "error.h"
#include "output.h"
Index: src/bin/sh/jobs.h
diff -u src/bin/sh/jobs.h:1.19 src/bin/sh/jobs.h:1.20
--- src/bin/sh/jobs.h:1.19 Thu Nov 27 16:16:14 2003
+++ src/bin/sh/jobs.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jobs.h,v 1.19 2003/11/27 21:16:14 dsl Exp $ */
+/* $NetBSD: jobs.h,v 1.20 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -86,12 +86,7 @@
extern int job_warning; /* user was warned about stopped jobs */
void setjobctl(int);
-int fgcmd(int, char **);
-int bgcmd(int, char **);
-int jobscmd(int, char **);
void showjobs(struct output *, int);
-int waitcmd(int, char **);
-int jobidcmd(int, char **);
struct job *makejob(union node *, int);
int forkshell(struct job *, union node *, int);
void forkchild(struct job *, union node *, int, int);
Index: src/bin/sh/options.h
diff -u src/bin/sh/options.h:1.19 src/bin/sh/options.h:1.20
--- src/bin/sh/options.h:1.19 Tue Dec 13 12:44:18 2005
+++ src/bin/sh/options.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: options.h,v 1.19 2005/12/13 17:44:18 dsl Exp $ */
+/* $NetBSD: options.h,v 1.20 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -126,8 +126,5 @@
void optschanged(void);
void setparam(char **);
void freeparam(volatile struct shparam *);
-int shiftcmd(int, char **);
-int setcmd(int, char **);
-int getoptscmd(int, char **);
int nextopt(const char *);
void getoptsreset(const char *);
Index: src/bin/sh/cd.c
diff -u src/bin/sh/cd.c:1.42 src/bin/sh/cd.c:1.43
--- src/bin/sh/cd.c:1.42 Thu Jun 9 22:19:10 2011
+++ src/bin/sh/cd.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.42 2011/06/10 02:19:10 uebayasi Exp $ */
+/* $NetBSD: cd.c,v 1.43 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cd.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: cd.c,v 1.42 2011/06/10 02:19:10 uebayasi Exp $");
+__RCSID("$NetBSD: cd.c,v 1.43 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -57,6 +57,7 @@
#include "nodes.h" /* for jobs.h */
#include "jobs.h"
#include "options.h"
+#include "builtins.h"
#include "output.h"
#include "memalloc.h"
#include "error.h"
Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.42 src/bin/sh/histedit.c:1.43
--- src/bin/sh/histedit.c:1.42 Fri Jan 7 17:21:56 2011
+++ src/bin/sh/histedit.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.c,v 1.42 2011/01/07 22:21:56 jmmv Exp $ */
+/* $NetBSD: histedit.c,v 1.43 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: histedit.c,v 1.42 2011/01/07 22:21:56 jmmv Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.43 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -53,6 +53,7 @@
#include "parser.h"
#include "var.h"
#include "options.h"
+#include "builtins.h"
#include "main.h"
#include "output.h"
#include "mystring.h"
Index: src/bin/sh/cd.h
diff -u src/bin/sh/cd.h:1.5 src/bin/sh/cd.h:1.6
--- src/bin/sh/cd.h:1.5 Mon Oct 10 17:14:42 2005
+++ src/bin/sh/cd.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.h,v 1.5 2005/10/10 21:14:42 christos Exp $ */
+/* $NetBSD: cd.h,v 1.6 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1995
@@ -32,5 +32,3 @@
void initpwd(void);
void getpwd(int);
-int cdcmd(int, char **);
-int pwdcmd(int, char **);
Index: src/bin/sh/exec.h
diff -u src/bin/sh/exec.h:1.21 src/bin/sh/exec.h:1.22
--- src/bin/sh/exec.h:1.21 Thu Aug 7 05:05:31 2003
+++ src/bin/sh/exec.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.21 2003/08/07 09:05:31 agc Exp $ */
+/* $NetBSD: exec.h,v 1.22 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -64,7 +64,6 @@
void shellexec(char **, char **, const char *, int, int)
__attribute__((__noreturn__));
char *padvance(const char **, const char *);
-int hashcmd(int, char **);
void find_command(char *, struct cmdentry *, int, const char *);
int (*find_builtin(char *))(int, char **);
int (*find_splbltin(char *))(int, char **);
@@ -75,5 +74,4 @@
void addcmdentry(char *, struct cmdentry *);
void defun(char *, union node *);
int unsetfunc(char *);
-int typecmd(int, char **);
void hash_special_builtins(void);
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.83 src/bin/sh/expand.c:1.84
--- src/bin/sh/expand.c:1.83 Fri Nov 27 05:50:04 2009
+++ src/bin/sh/expand.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.83 2009/11/27 10:50:04 tsutsui Exp $ */
+/* $NetBSD: expand.c,v 1.84 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.83 2009/11/27 10:50:04 tsutsui Exp $");
+__RCSID("$NetBSD: expand.c,v 1.84 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -65,6 +65,7 @@
#include "parser.h"
#include "jobs.h"
#include "options.h"
+#include "builtins.h"
#include "var.h"
#include "input.h"
#include "output.h"
Index: src/bin/sh/expand.h
diff -u src/bin/sh/expand.h:1.17 src/bin/sh/expand.h:1.18
--- src/bin/sh/expand.h:1.17 Sun Mar 25 02:29:27 2007
+++ src/bin/sh/expand.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.h,v 1.17 2007/03/25 06:29:27 apb Exp $ */
+/* $NetBSD: expand.h,v 1.18 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -65,10 +65,8 @@
int patmatch(char *, char *, int);
void rmescapes(char *);
int casematch(union node *, char *);
-int wordexpcmd(int, char **);
/* From arith.y */
intmax_t arith(const char *);
-int expcmd(int , char **);
void arith_lex_reset(void);
int yylex(void);
Index: src/bin/sh/jobs.c
diff -u src/bin/sh/jobs.c:1.68 src/bin/sh/jobs.c:1.69
--- src/bin/sh/jobs.c:1.68 Sun Dec 21 12:16:11 2008
+++ src/bin/sh/jobs.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jobs.c,v 1.68 2008/12/21 17:16:11 christos Exp $ */
+/* $NetBSD: jobs.c,v 1.69 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: jobs.c,v 1.68 2008/12/21 17:16:11 christos Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.69 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -72,6 +72,7 @@
#include "nodes.h"
#include "jobs.h"
#include "options.h"
+#include "builtins.h"
#include "trap.h"
#include "syntax.h"
#include "input.h"
Index: src/bin/sh/main.c
diff -u src/bin/sh/main.c:1.56 src/bin/sh/main.c:1.57
--- src/bin/sh/main.c:1.56 Sun Feb 21 04:54:57 2010
+++ src/bin/sh/main.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.56 2010/02/21 09:54:57 christos Exp $ */
+/* $NetBSD: main.c,v 1.57 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.56 2010/02/21 09:54:57 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.57 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -60,6 +60,7 @@
#include "main.h"
#include "mail.h"
#include "options.h"
+#include "builtins.h"
#include "output.h"
#include "parser.h"
#include "nodes.h"
Index: src/bin/sh/main.h
diff -u src/bin/sh/main.h:1.10 src/bin/sh/main.h:1.11
--- src/bin/sh/main.h:1.10 Thu Aug 7 05:05:34 2003
+++ src/bin/sh/main.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.h,v 1.10 2003/08/07 09:05:34 agc Exp $ */
+/* $NetBSD: main.h,v 1.11 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,5 +39,3 @@
void readcmdfile(char *);
void cmdloop(int);
-int dotcmd(int, char **);
-int exitcmd(int, char **);
Index: src/bin/sh/myhistedit.h
diff -u src/bin/sh/myhistedit.h:1.10 src/bin/sh/myhistedit.h:1.11
--- src/bin/sh/myhistedit.h:1.10 Thu Aug 7 05:05:35 2003
+++ src/bin/sh/myhistedit.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: myhistedit.h,v 1.10 2003/08/07 09:05:35 agc Exp $ */
+/* $NetBSD: myhistedit.h,v 1.11 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -40,7 +40,6 @@
void histedit(void);
void sethistsize(const char *);
void setterm(const char *);
-int histcmd(int, char **);
int inputrc(int, char **);
int not_fcnumber(char *);
int str_to_event(const char *, int);
Index: src/bin/sh/miscbltin.c
diff -u src/bin/sh/miscbltin.c:1.38 src/bin/sh/miscbltin.c:1.39
--- src/bin/sh/miscbltin.c:1.38 Sat Mar 28 21:02:49 2009
+++ src/bin/sh/miscbltin.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: miscbltin.c,v 1.38 2009/03/29 01:02:49 mrg Exp $ */
+/* $NetBSD: miscbltin.c,v 1.39 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: miscbltin.c,v 1.38 2009/03/29 01:02:49 mrg Exp $");
+__RCSID("$NetBSD: miscbltin.c,v 1.39 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -61,7 +61,7 @@
#include "output.h"
#include "memalloc.h"
#include "error.h"
-#include "miscbltin.h"
+#include "builtins.h"
#include "mystring.h"
#undef rflag
Index: src/bin/sh/options.c
diff -u src/bin/sh/options.c:1.41 src/bin/sh/options.c:1.42
--- src/bin/sh/options.c:1.41 Sat Jan 17 19:30:54 2009
+++ src/bin/sh/options.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.41 2009/01/18 00:30:54 lukem Exp $ */
+/* $NetBSD: options.c,v 1.42 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: options.c,v 1.41 2009/01/18 00:30:54 lukem Exp $");
+__RCSID("$NetBSD: options.c,v 1.42 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -49,6 +49,7 @@
#define DEFINE_OPTIONS
#include "options.h"
#undef DEFINE_OPTIONS
+#include "builtins.h"
#include "nodes.h" /* for other header files */
#include "eval.h"
#include "jobs.h"
Index: src/bin/sh/trap.c
diff -u src/bin/sh/trap.c:1.34 src/bin/sh/trap.c:1.35
--- src/bin/sh/trap.c:1.34 Fri Feb 15 12:26:06 2008
+++ src/bin/sh/trap.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.34 2008/02/15 17:26:06 matt Exp $ */
+/* $NetBSD: trap.c,v 1.35 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95";
#else
-__RCSID("$NetBSD: trap.c,v 1.34 2008/02/15 17:26:06 matt Exp $");
+__RCSID("$NetBSD: trap.c,v 1.35 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -52,6 +52,7 @@
#include "jobs.h"
#include "show.h"
#include "options.h"
+#include "builtins.h"
#include "syntax.h"
#include "output.h"
#include "memalloc.h"
Index: src/bin/sh/trap.h
diff -u src/bin/sh/trap.h:1.18 src/bin/sh/trap.h:1.19
--- src/bin/sh/trap.h:1.18 Sun Jul 10 22:37:31 2005
+++ src/bin/sh/trap.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.18 2005/07/11 02:37:31 christos Exp $ */
+/* $NetBSD: trap.h,v 1.19 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -36,7 +36,6 @@
extern int pendingsigs;
-int trapcmd(int, char **);
void clear_traps(int);
sig_t setsignal(int, int);
void ignoresig(int, int);
Index: src/bin/sh/var.c
diff -u src/bin/sh/var.c:1.39 src/bin/sh/var.c:1.40
--- src/bin/sh/var.c:1.39 Thu Oct 16 10:36:40 2008
+++ src/bin/sh/var.c Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.39 2008/10/16 14:36:40 dholland Exp $ */
+/* $NetBSD: var.c,v 1.40 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: var.c,v 1.39 2008/10/16 14:36:40 dholland Exp $");
+__RCSID("$NetBSD: var.c,v 1.40 2011/06/18 21:18:46 christos Exp $");
#endif
#endif /* not lint */
@@ -58,6 +58,7 @@
#include "exec.h"
#include "syntax.h"
#include "options.h"
+#include "builtins.h"
#include "mail.h"
#include "var.h"
#include "memalloc.h"
Index: src/bin/sh/var.h
diff -u src/bin/sh/var.h:1.24 src/bin/sh/var.h:1.25
--- src/bin/sh/var.h:1.24 Thu Oct 16 10:36:40 2008
+++ src/bin/sh/var.h Sat Jun 18 17:18:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: var.h,v 1.24 2008/10/16 14:36:40 dholland Exp $ */
+/* $NetBSD: var.h,v 1.25 2011/06/18 21:18:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -121,13 +121,9 @@
char **environment(void);
void shprocvar(void);
int showvars(const char *, int, int);
-int exportcmd(int, char **);
-int localcmd(int, char **);
void mklocal(const char *, int);
void listmklocal(struct strlist *, int);
void poplocalvars(void);
-int setvarcmd(int, char **);
-int unsetcmd(int, char **);
int unsetvar(const char *, int);
int setvarsafe(const char *, const char *, int);
void print_quoted(const char *);
