NetBSD Problem Report #45069

From www@NetBSD.org  Thu Jun 16 10:04:57 2011
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 4761763C85C
	for <gnats-bugs@gnats.NetBSD.org>; Thu, 16 Jun 2011 10:04:57 +0000 (UTC)
Message-Id: <20110616100455.C0A9C63B970@www.NetBSD.org>
Date: Thu, 16 Jun 2011 10:04:55 +0000 (UTC)
From: henning.petersen@t-online.de
Reply-To: henning.petersen@t-online.de
To: gnats-bugs@NetBSD.org
Subject: Use prototypes from builtins.h .
X-Send-Pr-Version: www-1.0

>Number:         45069
>Category:       bin
>Synopsis:       Use prototypes from builtins.h .
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bin-bug-people
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 16 10:05:00 +0000 2011
>Closed-Date:    Sun Jun 19 07:52:02 +0000 2011
>Last-Modified:  Sun Jun 19 07:52:02 +0000 2011
>Originator:     Henning Petersen
>Release:        NetBSD-current
>Organization:
>Environment:
>Description:
Use prototypes from builtins.h, and remove duplicated prototypes.
>How-To-Repeat:

>Fix:
diff -u -r1.13 alias.c
--- bin/sh/alias.c	29 Oct 2010 17:04:48 -0000	1.13
+++ bin/sh/alias.c	15 Jun 2011 10:30:27 -0000
@@ -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 -u -r1.6 alias.h
--- bin/sh/alias.h	7 Aug 2003 09:05:29 -0000	1.6
+++ bin/sh/alias.h	15 Jun 2011 10:30:27 -0000
@@ -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 -u -r1.19 arith.y
--- bin/sh/arith.y	13 Nov 2009 13:49:09 -0000	1.19
+++ bin/sh/arith.y	15 Jun 2011 10:30:27 -0000
@@ -44,6 +44,7 @@

 #include <stdlib.h>
 #include "expand.h"
+#include "builtins.h"
 #include "shell.h"
 #include "error.h"
 #include "output.h"
===================================================================
diff -u -r1.42 cd.c
--- bin/sh/cd.c	10 Jun 2011 02:19:10 -0000	1.42
+++ bin/sh/cd.c	15 Jun 2011 10:30:28 -0000
@@ -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 -u -r1.5 cd.h
--- bin/sh/cd.h	10 Oct 2005 21:14:42 -0000	1.5
+++ bin/sh/cd.h	15 Jun 2011 10:30:28 -0000
@@ -32,5 +32,3 @@

 void	initpwd(void);
 void	getpwd(int);
-int	cdcmd(int, char **);
-int	pwdcmd(int, char **);
===================================================================
diff -u -r1.21 exec.h
--- bin/sh/exec.h	7 Aug 2003 09:05:31 -0000	1.21
+++ bin/sh/exec.h	15 Jun 2011 10:30:29 -0000
@@ -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 -u -r1.83 expand.c
--- bin/sh/expand.c	27 Nov 2009 10:50:04 -0000	1.83
+++ bin/sh/expand.c	15 Jun 2011 10:30:29 -0000
@@ -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 -u -r1.17 expand.h
--- bin/sh/expand.h	25 Mar 2007 06:29:27 -0000	1.17
+++ bin/sh/expand.h	15 Jun 2011 10:30:29 -0000
@@ -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 -u -r1.42 histedit.c
--- bin/sh/histedit.c	7 Jan 2011 22:21:56 -0000	1.42
+++ bin/sh/histedit.c	15 Jun 2011 10:30:30 -0000
@@ -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 -u -r1.68 jobs.c
--- bin/sh/jobs.c	21 Dec 2008 17:16:11 -0000	1.68
+++ bin/sh/jobs.c	15 Jun 2011 10:30:30 -0000
@@ -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 -u -r1.19 jobs.h
--- bin/sh/jobs.h	27 Nov 2003 21:16:14 -0000	1.19
+++ bin/sh/jobs.h	15 Jun 2011 10:30:30 -0000
@@ -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 -u -r1.56 main.c
--- bin/sh/main.c	21 Feb 2010 09:54:57 -0000	1.56
+++ bin/sh/main.c	15 Jun 2011 10:30:30 -0000
@@ -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 -u -r1.10 main.h
--- bin/sh/main.h	7 Aug 2003 09:05:34 -0000	1.10
+++ bin/sh/main.h	15 Jun 2011 10:30:30 -0000
@@ -39,5 +39,3 @@

 void readcmdfile(char *);
 void cmdloop(int);
-int dotcmd(int, char **);
-int exitcmd(int, char **);
===================================================================
diff -u -r1.38 miscbltin.c
--- bin/sh/miscbltin.c	29 Mar 2009 01:02:49 -0000	1.38
+++ bin/sh/miscbltin.c	15 Jun 2011 10:30:31 -0000
@@ -61,7 +61,7 @@
 #include "output.h"
 #include "memalloc.h"
 #include "error.h"
-#include "miscbltin.h"
+#include "builtins.h"
 #include "mystring.h"

 #undef rflag
===================================================================
diff -u -r1.10 myhistedit.h
--- bin/sh/myhistedit.h	7 Aug 2003 09:05:35 -0000	1.10
+++ bin/sh/myhistedit.h	15 Jun 2011 10:30:31 -0000
@@ -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);
===================================================================
diff -u -r1.41 options.c
--- bin/sh/options.c	18 Jan 2009 00:30:54 -0000	1.41
+++ bin/sh/options.c	15 Jun 2011 10:30:31 -0000
@@ -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"
===================================================================
diff -u -r1.19 options.h
--- bin/sh/options.h	13 Dec 2005 17:44:18 -0000	1.19
+++ bin/sh/options.h	15 Jun 2011 10:30:31 -0000
@@ -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 *);
===================================================================
diff -u -r1.34 trap.c
--- bin/sh/trap.c	15 Feb 2008 17:26:06 -0000	1.34
+++ bin/sh/trap.c	15 Jun 2011 10:30:31 -0000
@@ -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"
===================================================================
diff -u -r1.18 trap.h
--- bin/sh/trap.h	11 Jul 2005 02:37:31 -0000	1.18
+++ bin/sh/trap.h	15 Jun 2011 10:30:31 -0000
@@ -36,7 +36,6 @@

 extern int pendingsigs;

-int trapcmd(int, char **);
 void clear_traps(int);
 sig_t setsignal(int, int);
 void ignoresig(int, int);
===================================================================
diff -u -r1.39 var.c
--- bin/sh/var.c	16 Oct 2008 14:36:40 -0000	1.39
+++ bin/sh/var.c	15 Jun 2011 10:30:32 -0000
@@ -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"
===================================================================
diff -u -r1.24 var.h
--- bin/sh/var.h	16 Oct 2008 14:36:40 -0000	1.24
+++ bin/sh/var.h	15 Jun 2011 10:30:32 -0000
@@ -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 *);

>Release-Note:

>Audit-Trail:
From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45069 CVS commit: src/bin/sh
Date: Sat, 18 Jun 2011 17:18:47 -0400

 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.

State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Sun, 19 Jun 2011 07:52:02 +0000
State-Changed-Why:
christos committed it, thanks.


>Unformatted:

Home	PR Database Search