[packages/bash.git] / bash-requires.patch


Jeff Johnson writes:
> For background, Ken Estes has a hack to bash2 that will print out the
> commands that will be executed by a shell script. The hack is included
> in the distributed Red Hat 6.x bash2 package if you are interested.


Here is the latest patch file.

Notice that I changed the output from "bash()" to "executable()"
Since the dependencies work for both bash and sh and really we depend
on their being an executable not that this executable is in anyway
related to bash.

Ken


diff -u -r bash-2.03.orig/builtins/mkbuiltins.c bash-2.03/builtins/mkbuiltins.c
--- bash-2.03.orig/builtins/mkbuiltins.c	Tue Sep 15 12:57:16 1998
+++ bash-2.03/builtins/mkbuiltins.c	Fri Jul 16 10:45:54 1999
@@ -51,8 +51,13 @@
 #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
 
 /* Flag values that builtins can have. */
+/*  These flags are for the C code generator, 
+    the C which is produced (./builtin.c)
+    includes the flags definitions found 
+    in ../builtins.h */
 #define BUILTIN_FLAG_SPECIAL	0x01
 #define BUILTIN_FLAG_ASSIGNMENT 0x02
+#define BUILTIN_FLAG_REQUIRES	0x04
 
 /* If this stream descriptor is non-zero, then write
    texinfo documentation to it. */
@@ -126,9 +131,17 @@
   (char *)NULL
 };
 
+/* The builtin commands that cause requirements on other files. */
+char *requires_builtins[] =
+{
+  ".", "command", "exec", "source", "inlib",
+  (char *)NULL
+};
+
 /* Forward declarations. */
 static int is_special_builtin ();
 static int is_assignment_builtin ();
+static int is_requires_builtin ();
 
 #if !defined (HAVE_RENAME)
 static int rename ();
@@ -759,6 +772,8 @@
     new->flags |= BUILTIN_FLAG_SPECIAL;
   if (is_assignment_builtin (name))
     new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+  if (is_requires_builtin (name))
+    new->flags |= BUILTIN_FLAG_REQUIRES;
 
   array_add ((char *)new, defs->builtins);
   building_builtin = 1;
@@ -1164,10 +1179,11 @@
 		  else
 		    fprintf (structfile, "(Function *)0x0, ");
 
-		  fprintf (structfile, "%s%s%s, %s_doc,\n",
+		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
 		    "BUILTIN_ENABLED | STATIC_BUILTIN",
 		    (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
 		    (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
+		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
 		    builtin->docname ? builtin->docname : builtin->name);
 
 		  fprintf
@@ -1401,6 +1417,13 @@
      char *name;
 {
   return (_find_in_table (name, assignment_builtins));
+}
+
+static int
+is_requires_builtin (name)
+     char *name;
+{
+  return (_find_in_table (name, requires_builtins));
 }
 
 #if !defined (HAVE_RENAME)
diff -u -r bash-2.03.orig/builtins.h bash-2.03/builtins.h
--- bash-2.03.orig/builtins.h	Fri Jul 18 16:46:36 1997
+++ bash-2.03/builtins.h	Thu Jul 15 16:59:03 1999
@@ -40,6 +40,7 @@
 #define STATIC_BUILTIN  0x4	/* This builtin is not dynamically loaded. */
 #define SPECIAL_BUILTIN 0x8	/* This is a Posix `special' builtin. */
 #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
+#define REQUIRES_BUILTIN 0x20	/* This builtin requires other files. */
 
 /* The thing that we build the array of builtins out of. */
 struct builtin {
diff -u -r bash-2.03.orig/doc/bash.1 bash-2.03/doc/bash.1
--- bash-2.03.orig/doc/bash.1	Wed Jan 20 16:48:04 1999
+++ bash-2.03/doc/bash.1	Fri Jul 16 11:20:00 1999
@@ -195,6 +195,12 @@
 .B "RESTRICTED SHELL"
 below).
 .TP
+.B \-\-rpm-requires
+Produce the list of files that are required for the 
+shell script to run.  This implies '-n' and is subject
+to the same limitations as compile time error checking checking;
+Backticks, [] tests,  and evals are not parsed so some 
+dependencies may be missed.
 .B \-\-verbose
 Equivalent to  \fB\-v\fP.
 .TP
diff -u -r bash-2.03.orig/doc/bashref.texi bash-2.03/doc/bashref.texi
--- bash-2.03.orig/doc/bashref.texi	Wed Jan 20 16:47:01 1999
+++ bash-2.03/doc/bashref.texi	Fri Jul 16 11:21:30 1999
@@ -3178,6 +3178,13 @@
 @item --restricted
 Make the shell a restricted shell (@pxref{The Restricted Shell}).
 
+@item --rpm-requires
+Produce the list of files that are required for the 
+shell script to run.  This implies '-n' and is subject
+to the same limitations as compile time error checking checking;
+Backticks, [] tests,  and evals are not parsed so some 
+dependencies may be missed.
+
 @item --verbose
 Equivalent to @samp{-v}.
 
diff -u -r bash-2.03.orig/make_cmd.c bash-2.03/make_cmd.c
--- bash-2.03.orig/make_cmd.c	Tue Jan 12 12:45:36 1999
+++ bash-2.03/make_cmd.c	Thu Dec  2 16:08:19 1999
@@ -41,6 +41,9 @@
 #include "subst.h"
 #include "input.h"
 #include "externs.h"
+#include "builtins.h"
+
+#include "builtins/common.h"
 
 #if defined (JOB_CONTROL)
 #include "jobs.h"
@@ -48,6 +51,10 @@
 
 extern int line_number, current_command_line_count;
 extern int disallow_filename_globbing;
+extern int rpm_requires;
+
+char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
+                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 WORD_DESC *
 make_bare_word (string)
@@ -588,6 +595,36 @@
   return (make_command (cm_function_def, (SIMPLE_COM *)temp));
 }
 
+void
+output_requirement (file)
+char *file;
+{
+  if ( (file[0] != '/') || strchr(file, '$')) {
+    /* if we are not given a full path name we require the basename
+       otherwise we require the full path.  This does not work in the
+       Win/Dos world but I don't know what to do there.*/
+    char *basename;
+    basename = strrchr(file, '/');
+    if (basename) {    
+      basename++;
+      file=basename;
+    }
+  }  
+
+    /* 
+       if the executable is called via variable substitution we can
+       not dermine what it is at compile time.  
+
+       if the executable consists only of characters not in the
+       alphabet we do not consider it a dependency just an artifact of
+       shell parsing (ex "exec < ${infile}").
+    */
+
+  if ( !strchr(file, '$') && strpbrk(file, alphabet_set) ) {
+    printf ("executable(%s)\n", file);
+  }
+}
+
 /* Reverse the word list and redirection list in the simple command
    has just been parsed.  It seems simpler to do this here the one
    time then by any other method that I can think of. */
@@ -604,6 +641,35 @@
       command->value.Simple->redirects =
 	REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
     }
+
+  if (rpm_requires && command->value.Simple->words)
+    {
+      char *cmd0;
+      char *cmd1;
+      struct builtin *b;
+
+      cmd0 = command->value.Simple->words->word->word;
+      b = builtin_address_internal (cmd0, 0);
+      cmd1 = 0;
+      if (command->value.Simple->words->next) {
+	cmd1 = command->value.Simple->words->next->word->word;
+      }
+      if (b) {
+	if ( (b->flags & REQUIRES_BUILTIN) && cmd1){
+	  output_requirement(cmd1);
+	}
+      } else {
+	if (!assignment(cmd0)) {
+	  output_requirement(cmd0);
+	} else {
+
+	  /* This will not work, the subshell that this runs in does
+             not get the "requires" commandline argument. */
+
+	  execute_command(command);
+	}
+      }
+    } /*rpm_requires*/
 
   return (command);
 }
diff -u -r bash-2.03.orig/shell.c bash-2.03/shell.c
--- bash-2.03.orig/shell.c	Thu Feb 18 11:42:27 1999
+++ bash-2.03/shell.c	Fri Jul 16 11:30:57 1999
@@ -170,6 +170,9 @@
 /* The name of the .(shell)rc file. */
 static char *bashrc_file = "~/.bashrc";
 
+/* Non-zero if we are finding the scripts requirements. */
+int rpm_requires;
+
 /* Non-zero means to act more like the Bourne shell on startup. */
 static int act_like_sh;
 
@@ -215,6 +218,7 @@
   { "norc", Int, &no_rc, (char **)0x0 },
   { "posix", Int, &posixly_correct, (char **)0x0 },
   { "rcfile", Charp, (int *)0x0, &bashrc_file },
+  { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
 #if defined (RESTRICTED_SHELL)
   { "restricted", Int, &restricted, (char **)0x0 },
 #endif
@@ -398,6 +402,12 @@
 
   if (dump_translatable_strings)
     read_but_dont_execute = 1;
+
+  if (rpm_requires)
+    {
+      read_but_dont_execute = 1;
+      initialize_shell_builtins ();
+    }
 
   if (running_setuid && privileged_mode == 0)
     disable_priv_mode ();

-- 
To unsubscribe: mail -s unsubscribe rpm-list-request@redhat.com < /dev/null
Commit	Line	Data
19f26d9b	1
2087a63e	2	Jeff Johnson writes:
	3	> For background, Ken Estes has a hack to bash2 that will print out the
	4	> commands that will be executed by a shell script. The hack is included
	5	> in the distributed Red Hat 6.x bash2 package if you are interested.
	6
	7
	8	Here is the latest patch file.
	9
	10	Notice that I changed the output from "bash()" to "executable()"
	11	Since the dependencies work for both bash and sh and really we depend
	12	on their being an executable not that this executable is in anyway
	13	related to bash.
19f26d9b	14
	15	Ken
	16
	17
	18
2087a63e	19	diff -u -r bash-2.03.orig/builtins/mkbuiltins.c bash-2.03/builtins/mkbuiltins.c
19f26d9b	20	--- bash-2.03.orig/builtins/mkbuiltins.c Tue Sep 15 12:57:16 1998
2087a63e	21	+++ bash-2.03/builtins/mkbuiltins.c Fri Jul 16 10:45:54 1999
19f26d9b	22	@@ -51,8 +51,13 @@
	23	#define whitespace(c) (((c) == ' ') \|\| ((c) == '\t'))
	24
	25	/* Flag values that builtins can have. */
	26	+/* These flags are for the C code generator,
	27	+ the C which is produced (./builtin.c)
	28	+ includes the flags definitions found
	29	+ in ../builtins.h */
	30	#define BUILTIN_FLAG_SPECIAL 0x01
	31	#define BUILTIN_FLAG_ASSIGNMENT 0x02
	32	+#define BUILTIN_FLAG_REQUIRES 0x04
	33
	34	/* If this stream descriptor is non-zero, then write
	35	texinfo documentation to it. */
	36	@@ -126,9 +131,17 @@
	37	(char *)NULL
	38	};
	39
	40	+/* The builtin commands that cause requirements on other files. */
	41	+char *requires_builtins[] =
	42	+{
	43	+ ".", "command", "exec", "source", "inlib",
	44	+ (char *)NULL
	45	+};
	46	+
	47	/* Forward declarations. */
	48	static int is_special_builtin ();
	49	static int is_assignment_builtin ();
	50	+static int is_requires_builtin ();
	51
	52	#if !defined (HAVE_RENAME)
	53	static int rename ();
	54	@@ -759,6 +772,8 @@
	55	new->flags \|= BUILTIN_FLAG_SPECIAL;
	56	if (is_assignment_builtin (name))
	57	new->flags \|= BUILTIN_FLAG_ASSIGNMENT;
	58	+ if (is_requires_builtin (name))
	59	+ new->flags \|= BUILTIN_FLAG_REQUIRES;
	60
	61	array_add ((char *)new, defs->builtins);
	62	building_builtin = 1;
	63	@@ -1164,10 +1179,11 @@
	64	else
	65	fprintf (structfile, "(Function *)0x0, ");
	66
	67	- fprintf (structfile, "%s%s%s, %s_doc,\n",
	68	+ fprintf (structfile, "%s%s%s%s, %s_doc,\n",
	69	"BUILTIN_ENABLED \| STATIC_BUILTIN",
	70	(builtin->flags & BUILTIN_FLAG_SPECIAL) ? " \| SPECIAL_BUILTIN" : "",
	71	(builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " \| ASSIGNMENT_BUILTIN" : "",
	72	+ (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " \| REQUIRES_BUILTIN" : "",
	73	builtin->docname ? builtin->docname : builtin->name);
	74
	75	fprintf
	76	@@ -1401,6 +1417,13 @@
	77	char *name;
	78	{
	79	return (_find_in_table (name, assignment_builtins));
	80	+}
	81	+
	82	+static int
	83	+is_requires_builtin (name)
	84	+ char *name;
	85	+{
86	+ return (_find_in_table (name, requires_builtins));
87	}
88
89	#if !defined (HAVE_RENAME)
2087a63e	90	diff -u -r bash-2.03.orig/builtins.h bash-2.03/builtins.h
19f26d9b	91	--- bash-2.03.orig/builtins.h Fri Jul 18 16:46:36 1997
2087a63e	92	+++ bash-2.03/builtins.h Thu Jul 15 16:59:03 1999
19f26d9b	93	@@ -40,6 +40,7 @@
	94	#define STATIC_BUILTIN 0x4 /* This builtin is not dynamically loaded. */
	95	#define SPECIAL_BUILTIN 0x8 /* This is a Posix `special' builtin. */
	96	#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
	97	+#define REQUIRES_BUILTIN 0x20 /* This builtin requires other files. */
	98
	99	/* The thing that we build the array of builtins out of. */
	100	struct builtin {
2087a63e	101	diff -u -r bash-2.03.orig/doc/bash.1 bash-2.03/doc/bash.1
19f26d9b	102	--- bash-2.03.orig/doc/bash.1 Wed Jan 20 16:48:04 1999
2087a63e	103	+++ bash-2.03/doc/bash.1 Fri Jul 16 11:20:00 1999
19f26d9b	104	@@ -195,6 +195,12 @@
	105	.B "RESTRICTED SHELL"
	106	below).
	107	.TP
	108	+.B \-\-rpm-requires
	109	+Produce the list of files that are required for the
	110	+shell script to run. This implies '-n' and is subject
	111	+to the same limitations as compile time error checking checking;
	112	+Backticks, [] tests, and evals are not parsed so some
	113	+dependencies may be missed.
	114	.B \-\-verbose
	115	Equivalent to \fB\-v\fP.
	116	.TP
2087a63e	117	diff -u -r bash-2.03.orig/doc/bashref.texi bash-2.03/doc/bashref.texi
19f26d9b	118	--- bash-2.03.orig/doc/bashref.texi Wed Jan 20 16:47:01 1999
2087a63e	119	+++ bash-2.03/doc/bashref.texi Fri Jul 16 11:21:30 1999
19f26d9b	120	@@ -3178,6 +3178,13 @@
	121	@item --restricted
	122	Make the shell a restricted shell (@pxref{The Restricted Shell}).
	123
	124	+@item --rpm-requires
	125	+Produce the list of files that are required for the
	126	+shell script to run. This implies '-n' and is subject
	127	+to the same limitations as compile time error checking checking;
	128	+Backticks, [] tests, and evals are not parsed so some
	129	+dependencies may be missed.
	130	+
	131	@item --verbose
	132	Equivalent to @samp{-v}.
	133
2087a63e	134	diff -u -r bash-2.03.orig/make_cmd.c bash-2.03/make_cmd.c
19f26d9b	135	--- bash-2.03.orig/make_cmd.c Tue Jan 12 12:45:36 1999
2087a63e	136	+++ bash-2.03/make_cmd.c Thu Dec 2 16:08:19 1999
2087a63e	137	@@ -41,6 +41,9 @@
19f26d9b	138	#include "subst.h"
	139	#include "input.h"
	140	#include "externs.h"
	141	+#include "builtins.h"
2087a63e	142	+
2087a63e	143	+#include "builtins/common.h"
19f26d9b	144
	145	#if defined (JOB_CONTROL)
	146	#include "jobs.h"
2087a63e	147	@@ -48,6 +51,10 @@
19f26d9b	148
	149	extern int line_number, current_command_line_count;
	150	extern int disallow_filename_globbing;
	151	+extern int rpm_requires;
2087a63e	152	+
	153	+char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
	154	+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
19f26d9b	155
	156	WORD_DESC *
	157	make_bare_word (string)
2087a63e	158	@@ -588,6 +595,36 @@
19f26d9b	159	return (make_command (cm_function_def, (SIMPLE_COM *)temp));
	160	}
	161
	162	+void
	163	+output_requirement (file)
	164	+char *file;
	165	+{
2087a63e	166	+ if ( (file[0] != '/') \|\| strchr(file, '$')) {
19f26d9b	167	+ /* if we are not given a full path name we require the basename
	168	+ otherwise we require the full path. This does not work in the
	169	+ Win/Dos world but I don't know what to do there.*/
	170	+ char *basename;
	171	+ basename = strrchr(file, '/');
	172	+ if (basename) {
	173	+ basename++;
	174	+ file=basename;
	175	+ }
	176	+ }
2087a63e	177	+
	178	+ /*
	179	+ if the executable is called via variable substitution we can
	180	+ not dermine what it is at compile time.
	181	+
	182	+ if the executable consists only of characters not in the
	183	+ alphabet we do not consider it a dependency just an artifact of
	184	+ shell parsing (ex "exec < ${infile}").
	185	+ */
	186	+
	187	+ if ( !strchr(file, '$') && strpbrk(file, alphabet_set) ) {
	188	+ printf ("executable(%s)\n", file);
	189	+ }
19f26d9b	190	+}
	191	+
	192	/* Reverse the word list and redirection list in the simple command
	193	has just been parsed. It seems simpler to do this here the one
	194	time then by any other method that I can think of. */
2087a63e	195	@@ -604,6 +641,35 @@
19f26d9b	196	command->value.Simple->redirects =
	197	REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
	198	}
	199	+
2087a63e	200	+ if (rpm_requires && command->value.Simple->words)
19f26d9b	201	+ {
	202	+ char *cmd0;
	203	+ char *cmd1;
	204	+ struct builtin *b;
	205	+
	206	+ cmd0 = command->value.Simple->words->word->word;
	207	+ b = builtin_address_internal (cmd0, 0);
2087a63e	208	+ cmd1 = 0;
	209	+ if (command->value.Simple->words->next) {
	210	+ cmd1 = command->value.Simple->words->next->word->word;
	211	+ }
19f26d9b	212	+ if (b) {
2087a63e	213	+ if ( (b->flags & REQUIRES_BUILTIN) && cmd1){
19f26d9b	214	+ output_requirement(cmd1);
	215	+ }
	216	+ } else {
2087a63e	217	+ if (!assignment(cmd0)) {
19f26d9b	218	+ output_requirement(cmd0);
2087a63e	219	+ } else {
	220	+
	221	+ /* This will not work, the subshell that this runs in does
	222	+ not get the "requires" commandline argument. */
	223	+
	224	+ execute_command(command);
	225	+ }
19f26d9b	226	+ }
	227	+ } /rpm_requires/
	228
	229	return (command);
	230	}
2087a63e	231	diff -u -r bash-2.03.orig/shell.c bash-2.03/shell.c
19f26d9b	232	--- bash-2.03.orig/shell.c Thu Feb 18 11:42:27 1999
2087a63e	233	+++ bash-2.03/shell.c Fri Jul 16 11:30:57 1999
19f26d9b	234	@@ -170,6 +170,9 @@
	235	/* The name of the .(shell)rc file. */
	236	static char *bashrc_file = "~/.bashrc";
	237
	238	+/* Non-zero if we are finding the scripts requirements. */
	239	+int rpm_requires;
	240	+
	241	/* Non-zero means to act more like the Bourne shell on startup. */
	242	static int act_like_sh;
	243
	244	@@ -215,6 +218,7 @@
	245	{ "norc", Int, &no_rc, (char **)0x0 },
	246	{ "posix", Int, &posixly_correct, (char **)0x0 },
	247	{ "rcfile", Charp, (int *)0x0, &bashrc_file },
	248	+ { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
	249	#if defined (RESTRICTED_SHELL)
	250	{ "restricted", Int, &restricted, (char **)0x0 },
	251	#endif
	252	@@ -398,6 +402,12 @@
	253
	254	if (dump_translatable_strings)
	255	read_but_dont_execute = 1;
	256	+
	257	+ if (rpm_requires)
	258	+ {
	259	+ read_but_dont_execute = 1;
	260	+ initialize_shell_builtins ();
	261	+ }
	262
	263	if (running_setuid && privileged_mode == 0)
	264	disable_priv_mode ();
	265
2087a63e	266	--
2087a63e	267	To unsubscribe: mail -s unsubscribe rpm-list-request@redhat.com < /dev/null
19f26d9b	268