---- bash-2.04-beta5/builtins/mkbuiltins.c.requires Thu Aug 5 12:42:54 1999
-+++ bash-2.04-beta5/builtins/mkbuiltins.c Sun Mar 19 14:14:17 2000
+--- bash-2.05b/builtins/mkbuiltins.c.requires Thu Aug 5 12:42:54 1999
++++ bash-2.05b/builtins/mkbuiltins.c Sun Mar 19 14:14:17 2000
@@ -51,8 +51,13 @@
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
building_builtin = 1;
@@ -1164,10 +1179,11 @@
else
- fprintf (structfile, "(Function *)0x0, ");
+ fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
- fprintf (structfile, "%s%s%s, %s_doc,\n",
+ fprintf (structfile, "%s%s%s%s, %s_doc,\n",
(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);
+ document_name (builtin));
fprintf
@@ -1401,6 +1417,13 @@
#if defined (JOB_CONTROL)
#include "jobs.h"
-@@ -49,7 +52,10 @@
+@@ -49,6 +52,9 @@
+
extern int line_number, current_command_line_count;
- extern int disallow_filename_globbing;
extern int last_command_exit_value;
+extern int rpm_requires;
-
+char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- WORD_DESC *
- make_bare_word (string)
+ static COMMAND *make_for_or_select __P((enum command_type, WORD_DESC *, WORD_LIST *, COMMAND *));
+ #if defined (ARITH_FOR_COMMAND)
@@ -696,6 +702,36 @@
return (make_command (cm_subshell, (SIMPLE_COM *)temp));
}
+ output_requirement(cmd1);
+ }
+ } else {
-+ if (!assignment(cmd0)) {
++ if (!assignment(cmd0, 0)) {
+ output_requirement(cmd0);
+ } else {
+