X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bash-requires.patch;h=1bf4415fdb00c3b8c526644c6d5f1196bcf63467;hb=03cee40d0e10d5ec942614425e2e388847ff943c;hp=28163674515fd7769100a5f81e27fdc761f304c8;hpb=71ad8a7451299ea1ce4d4a1000a6829c9b7925e8;p=packages%2Fbash.git

diff --git a/bash-requires.patch b/bash-requires.patch
index 2816367..1bf4415 100644
--- a/bash-requires.patch
+++ b/bash-requires.patch
@@ -1,20 +1,14 @@
 --- 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'))
- 
- /* 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 */
+@@ -72,6 +72,7 @@
  #define BUILTIN_FLAG_SPECIAL	0x01
  #define BUILTIN_FLAG_ASSIGNMENT 0x02
-+#define BUILTIN_FLAG_REQUIRES	0x04
+ #define BUILTIN_FLAG_POSIX_BUILTIN 0x04
++#define BUILTIN_FLAG_REQUIRES 0x08
  
- /* If this stream descriptor is non-zero, then write
-    texinfo documentation to it. */
-@@ -126,9 +131,17 @@
+ #define BASE_INDENT	4
+ 
+@@ -164,10 +164,18 @@
    (char *)NULL
  };
  
@@ -28,28 +22,30 @@
  /* Forward declarations. */
  static int is_special_builtin ();
  static int is_assignment_builtin ();
+ static int is_posix_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))
+@@ -821,6 +821,8 @@
      new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+   if (is_posix_builtin (name))
+     new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
 +  if (is_requires_builtin (name))
 +    new->flags |= BUILTIN_FLAG_REQUIRES;
  
    array_add ((char *)new, defs->builtins);
    building_builtin = 1;
-@@ -1164,10 +1179,11 @@
+@@ -1240,11 +1240,12 @@
  		  else
  		    fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
  
--		  fprintf (structfile, "%s%s%s, %s_doc,\n",
-+		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
+-		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
++		  fprintf (structfile, "%s%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_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
 +		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
  		    document_name (builtin));
  
@@ -101,14 +97,14 @@
  
 --- bash-2.04-beta5/builtins.h.requires	Thu Aug  5 11:18:12 1999
 +++ bash-2.04-beta5/builtins.h	Sun Mar 19 14:14:17 2000
-@@ -40,6 +40,7 @@
- #define STATIC_BUILTIN  0x4	/* This builtin is not dynamically loaded. */
- #define SPECIAL_BUILTIN 0x8	/* This is a Posix `special' builtin. */
+@@ -41,6 +41,7 @@
+ #define SPECIAL_BUILTIN 0x08	/* This is a Posix `special' builtin. */
  #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
-+#define REQUIRES_BUILTIN 0x20	/* This builtin requires other files. */
+ #define POSIX_BUILTIN	0x20	/* This builtins is special in the Posix command search order. */
++#define REQUIRES_BUILTIN	0x40	/* This builtin requires other files. */
+ 
+ #define BASE_INDENT	4
  
- /* The thing that we build the array of builtins out of. */
- struct builtin {
 --- bash-2.04-beta5/make_cmd.c.requires	Thu Aug  5 11:21:23 1999
 +++ bash-2.04-beta5/make_cmd.c	Sun Mar 19 14:17:34 2000
 @@ -41,6 +41,9 @@