Date: Mon, 13 Jun 2011 21:03:27 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r223060 - in head/bin/sh: . bltin Message-ID: <201106132103.p5DL3Rj4098571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Mon Jun 13 21:03:27 2011 New Revision: 223060 URL: http://svn.freebsd.org/changeset/base/223060 Log: sh: Fix duplicate prototypes for builtins. Have mkbuiltins write the prototypes for the *cmd functions to builtins.h instead of builtins.c and include builtins.h in more .c files instead of duplicating prototypes for *cmd functions in other headers. Modified: head/bin/sh/alias.c head/bin/sh/alias.h head/bin/sh/arith.h head/bin/sh/bltin/bltin.h head/bin/sh/cd.c head/bin/sh/cd.h head/bin/sh/eval.h head/bin/sh/exec.h head/bin/sh/expand.c head/bin/sh/expand.h head/bin/sh/histedit.c head/bin/sh/jobs.c head/bin/sh/jobs.h head/bin/sh/main.c head/bin/sh/main.h head/bin/sh/mkbuiltins head/bin/sh/myhistedit.h head/bin/sh/options.c head/bin/sh/options.h head/bin/sh/trap.c head/bin/sh/trap.h head/bin/sh/var.c head/bin/sh/var.h Modified: head/bin/sh/alias.c ============================================================================== --- head/bin/sh/alias.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/alias.c Mon Jun 13 21:03:27 2011 (r223060) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include "mystring.h" #include "alias.h" #include "options.h" /* XXX for argptr (should remove?) */ +#include "builtins.h" #define ATABSIZE 39 Modified: head/bin/sh/alias.h ============================================================================== --- head/bin/sh/alias.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/alias.h Mon Jun 13 21:03:27 2011 (r223060) @@ -43,5 +43,3 @@ struct alias { }; struct alias *lookupalias(const char *, int); -int aliascmd(int, char **); -int unaliascmd(int, char **); Modified: head/bin/sh/arith.h ============================================================================== --- head/bin/sh/arith.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/arith.h Mon Jun 13 21:03:27 2011 (r223060) @@ -36,4 +36,3 @@ arith_t arith(const char *); void arith_lex_reset(void); -int expcmd(int, char **); Modified: head/bin/sh/bltin/bltin.h ============================================================================== --- head/bin/sh/bltin/bltin.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/bltin/bltin.h Mon Jun 13 21:03:27 2011 (r223060) @@ -43,6 +43,7 @@ #include "../mystring.h" #ifdef SHELL #include "../output.h" +#include "builtins.h" #define FILE struct output #undef stdout #define stdout out1 @@ -75,7 +76,4 @@ pointer stalloc(int); void error(const char *, ...) __printf0like(1, 2); pid_t getjobpgrp(char *); -int echocmd(int, char **); -int testcmd(int, char **); - extern char *commandname; Modified: head/bin/sh/cd.c ============================================================================== --- head/bin/sh/cd.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/cd.c Mon Jun 13 21:03:27 2011 (r223060) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include "mystring.h" #include "show.h" #include "cd.h" +#include "builtins.h" static int cdlogical(char *); static int cdphysical(char *); Modified: head/bin/sh/cd.h ============================================================================== --- head/bin/sh/cd.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/cd.h Mon Jun 13 21:03:27 2011 (r223060) @@ -30,5 +30,3 @@ */ void pwd_init(int); -int cdcmd (int, char **); -int pwdcmd(int, char **); Modified: head/bin/sh/eval.h ============================================================================== --- head/bin/sh/eval.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/eval.h Mon Jun 13 21:03:27 2011 (r223060) @@ -51,19 +51,10 @@ struct backcmd { /* result of evalbackc #define EV_TESTED 02 /* exit status is checked; ignore -e flag */ #define EV_BACKCMD 04 /* command executing within back quotes */ -int evalcmd(int, char **); void evalstring(char *, int); union node; /* BLETCH for ansi C */ void evaltree(union node *, int); void evalbackcmd(union node *, struct backcmd *); -int bltincmd(int, char **); -int breakcmd(int, char **); -int returncmd(int, char **); -int falsecmd(int, char **); -int truecmd(int, char **); -int execcmd(int, char **); -int timescmd(int, char **); -int commandcmd(int, char **); /* in_function returns nonzero if we are currently evaluating a function */ #define in_function() funcnest Modified: head/bin/sh/exec.h ============================================================================== --- head/bin/sh/exec.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/exec.h Mon Jun 13 21:03:27 2011 (r223060) @@ -66,7 +66,6 @@ extern int exerrno; /* last exec error void shellexec(char **, char **, const char *, int) __dead2; char *padvance(const char **, const char *); -int hashcmd(int, char **); void find_command(const char *, struct cmdentry *, int, const char *); int find_builtin(const char *, int *); void hashcd(void); @@ -75,5 +74,4 @@ void addcmdentry(const char *, struct cm void defun(const char *, union node *); int unsetfunc(const char *); int typecmd_impl(int, char **, int, const char *); -int typecmd(int, char **); void clearcmdentry(void); Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/expand.c Mon Jun 13 21:03:27 2011 (r223060) @@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$"); #include "mystring.h" #include "arith.h" #include "show.h" +#include "builtins.h" /* * Structure specifying which parts of the string should be searched Modified: head/bin/sh/expand.h ============================================================================== --- head/bin/sh/expand.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/expand.h Mon Jun 13 21:03:27 2011 (r223060) @@ -63,4 +63,3 @@ void expari(int); int patmatch(const char *, const char *, int); void rmescapes(char *); int casematch(union node *, const char *); -int wordexpcmd(int, char **); Modified: head/bin/sh/histedit.c ============================================================================== --- head/bin/sh/histedit.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/histedit.c Mon Jun 13 21:03:27 2011 (r223060) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include "error.h" #include "eval.h" #include "memalloc.h" +#include "builtins.h" #define MAXHISTLOOPS 4 /* max recursions through fc */ #define DEFEDITOR "ed" /* default editor *should* be $EDITOR */ Modified: head/bin/sh/jobs.c ============================================================================== --- head/bin/sh/jobs.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/jobs.c Mon Jun 13 21:03:27 2011 (r223060) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include "error.h" #include "mystring.h" #include "var.h" +#include "builtins.h" static struct job *jobtab; /* array of jobs */ Modified: head/bin/sh/jobs.h ============================================================================== --- head/bin/sh/jobs.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/jobs.h Mon Jun 13 21:03:27 2011 (r223060) @@ -88,12 +88,7 @@ extern int in_dowait; /* are we in dowa extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */ void setjobctl(int); -int fgcmd(int, char **); -int bgcmd(int, char **); -int jobscmd(int, char **); void showjobs(int, int); -int waitcmd(int, char **); -int jobidcmd(int, char **); struct job *makejob(union node *, int); pid_t forkshell(struct job *, union node *, int); int waitforjob(struct job *, int *); Modified: head/bin/sh/main.c ============================================================================== --- head/bin/sh/main.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/main.c Mon Jun 13 21:03:27 2011 (r223060) @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include "mystring.h" #include "exec.h" #include "cd.h" +#include "builtins.h" int rootpid; int rootshell; Modified: head/bin/sh/main.h ============================================================================== --- head/bin/sh/main.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/main.h Mon Jun 13 21:03:27 2011 (r223060) @@ -39,5 +39,3 @@ extern struct jmploc main_handler; /* to void readcmdfile(const char *); void cmdloop(int); -int dotcmd(int, char **); -int exitcmd(int, char **); Modified: head/bin/sh/mkbuiltins ============================================================================== --- head/bin/sh/mkbuiltins Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/mkbuiltins Mon Jun 13 21:03:27 2011 (r223060) @@ -58,9 +58,7 @@ cat <<\! ! awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \ print $0}' builtins.def | sed 's/-[hj]//' > $temp -awk '{ printf "int %s(int, char **);\n", $1}' $temp -echo ' -int (*const builtinfunc[])(int, char **) = {' +echo 'int (*const builtinfunc[])(int, char **) = {' awk '/^[^#]/ { printf "\t%s,\n", $1}' $temp echo '}; @@ -94,5 +92,7 @@ struct builtincmd { }; extern int (*const builtinfunc[])(int, char **); -extern const struct builtincmd builtincmd[];' +extern const struct builtincmd builtincmd[]; +' +awk '{ printf "int %s(int, char **);\n", $1}' $temp rm -f $temp Modified: head/bin/sh/myhistedit.h ============================================================================== --- head/bin/sh/myhistedit.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/myhistedit.h Mon Jun 13 21:03:27 2011 (r223060) @@ -39,8 +39,6 @@ extern int displayhist; void histedit(void); void sethistsize(const char *); void setterm(const char *); -int histcmd(int, char **); int not_fcnumber(const char *); int str_to_event(const char *, int); -int bindcmd(int, char **); Modified: head/bin/sh/options.c ============================================================================== --- head/bin/sh/options.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/options.c Mon Jun 13 21:03:27 2011 (r223060) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include "memalloc.h" #include "error.h" #include "mystring.h" +#include "builtins.h" #ifndef NO_HISTORY #include "myhistedit.h" #endif Modified: head/bin/sh/options.h ============================================================================== --- head/bin/sh/options.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/options.h Mon Jun 13 21:03:27 2011 (r223060) @@ -108,8 +108,5 @@ void procargs(int, char **); void optschanged(void); void setparam(char **); void freeparam(struct shparam *); -int shiftcmd(int, char **); -int setcmd(int, char **); -int getoptscmd(int, char **); int nextopt(const char *); void getoptsreset(const char *); Modified: head/bin/sh/trap.c ============================================================================== --- head/bin/sh/trap.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/trap.c Mon Jun 13 21:03:27 2011 (r223060) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include "error.h" #include "trap.h" #include "mystring.h" +#include "builtins.h" #include "myhistedit.h" Modified: head/bin/sh/trap.h ============================================================================== --- head/bin/sh/trap.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/trap.h Mon Jun 13 21:03:27 2011 (r223060) @@ -37,7 +37,6 @@ extern int pendingsigs; extern int in_dotrap; extern volatile sig_atomic_t gotwinch; -int trapcmd(int, char **); void clear_traps(void); int have_traps(void); void setsignal(int); Modified: head/bin/sh/var.c ============================================================================== --- head/bin/sh/var.c Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/var.c Mon Jun 13 21:03:27 2011 (r223060) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include "error.h" #include "mystring.h" #include "parser.h" +#include "builtins.h" #ifndef NO_HISTORY #include "myhistedit.h" #endif Modified: head/bin/sh/var.h ============================================================================== --- head/bin/sh/var.h Mon Jun 13 20:36:29 2011 (r223059) +++ head/bin/sh/var.h Mon Jun 13 21:03:27 2011 (r223060) @@ -123,11 +123,7 @@ void updatecharset(void); void initcharset(void); char **environment(void); int showvarscmd(int, char **); -int exportcmd(int, char **); -int localcmd(int, char **); void mklocal(char *); void poplocalvars(void); -int setvarcmd(int, char **); -int unsetcmd(int, char **); int unsetvar(const char *); int setvarsafe(const char *, const char *, int);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106132103.p5DL3Rj4098571>