[src/trunk]: src/bin/sh PR/45069: Henning Petersen: Use prototypes from built...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/bin/sh PR/45069: Henning Petersen: Use prototypes from built...
From: christos <christos%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:37:41 +0000
details:   https://anonhg.NetBSD.org/src/rev/1fd0eec36b75
branches:  trunk
changeset: 766212:1fd0eec36b75
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 18 21:18:46 2011 +0000

description:
PR/45069: Henning Petersen: Use prototypes from builtins.h .

diffstat:

 bin/sh/alias.c      |  5 +++--
 bin/sh/alias.h      |  4 +---
 bin/sh/arith.y      |  5 +++--
 bin/sh/cd.c         |  5 +++--
 bin/sh/cd.h         |  4 +---
 bin/sh/exec.h       |  4 +---
 bin/sh/expand.c     |  5 +++--
 bin/sh/expand.h     |  4 +---
 bin/sh/histedit.c   |  5 +++--
 bin/sh/jobs.c       |  5 +++--
 bin/sh/jobs.h       |  7 +------
 bin/sh/main.c       |  5 +++--
 bin/sh/main.h       |  4 +---
 bin/sh/miscbltin.c  |  6 +++---
 bin/sh/myhistedit.h |  3 +--
 bin/sh/options.c    |  5 +++--
 bin/sh/options.h    |  5 +----
 bin/sh/trap.c       |  5 +++--
 bin/sh/trap.h       |  3 +--
 bin/sh/var.c        |  5 +++--
 bin/sh/var.h        |  6 +-----
 21 files changed, 43 insertions(+), 57 deletions(-)

diffs (truncated from 472 to 300 lines):

diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/alias.c
--- a/bin/sh/alias.c    Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/alias.c    Sat Jun 18 21:18:46 2011 +0000
@@ -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
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/alias.h
--- a/bin/sh/alias.h    Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/alias.h    Sat Jun 18 21:18:46 2011 +0000
@@ -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);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/arith.y
--- a/bin/sh/arith.y    Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/arith.y    Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/cd.c
--- a/bin/sh/cd.c       Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/cd.c       Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/cd.h
--- a/bin/sh/cd.h       Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/cd.h       Sat Jun 18 21:18:46 2011 +0000
@@ -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 **);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/exec.h
--- a/bin/sh/exec.h     Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/exec.h     Sat Jun 18 21:18:46 2011 +0000
@@ -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);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/expand.c
--- a/bin/sh/expand.c   Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/expand.c   Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/expand.h
--- a/bin/sh/expand.h   Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/expand.h   Sat Jun 18 21:18:46 2011 +0000
@@ -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);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/histedit.c
--- a/bin/sh/histedit.c Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/histedit.c Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/jobs.c
--- a/bin/sh/jobs.c     Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/jobs.c     Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/jobs.h
--- a/bin/sh/jobs.h     Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/jobs.h     Sat Jun 18 21:18:46 2011 +0000
@@ -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);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/main.c
--- a/bin/sh/main.c     Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/main.c     Sat Jun 18 21:18:46 2011 +0000
@@ -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"
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/main.h
--- a/bin/sh/main.h     Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/main.h     Sat Jun 18 21:18:46 2011 +0000
@@ -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 **);
diff -r 945ab5be9045 -r 1fd0eec36b75 bin/sh/miscbltin.c
--- a/bin/sh/miscbltin.c        Sat Jun 18 21:18:20 2011 +0000
+++ b/bin/sh/miscbltin.c        Sat Jun 18 21:18:46 2011 +0000
@@ -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 $  */
 
 /*-
Prev by Date: [src/trunk]: src/lib/libm/arch/i387 Kill redundant ;
Next by Date: [src/trunk]: src/sys/arch Make a common genassym.cf (powerpc/genassym.cf) and...
Previous by Thread: [src/trunk]: src/lib/libm/arch/i387 Kill redundant ;
Next by Thread: [src/trunk]: src/sys/arch Make a common genassym.cf (powerpc/genassym.cf) and...
Indexes:
Home | Main Index | Thread Index | Old Index