-diff -up bash-4.1/builtins.h.requires bash-4.1/builtins.h
---- bash-4.1/builtins.h.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1/builtins.h 2010-08-02 17:42:41.000000000 +0200
-@@ -41,6 +41,8 @@
+diff --git a/builtins.h b/builtins.h
+index dac95fd..5b7e811 100644
+--- a/builtins.h
++++ b/builtins.h
+@@ -45,6 +45,7 @@
#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
#define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */
#define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */
-+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */
-+
++#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */
#define BASE_INDENT 4
-diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
---- bash-4.1/builtins/mkbuiltins.c.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1/builtins/mkbuiltins.c 2010-08-02 17:42:41.000000000 +0200
-@@ -69,10 +69,16 @@ extern char *strcpy ();
+diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
+index 4f51201..91c25db 100644
+--- a/builtins/mkbuiltins.c
++++ b/builtins/mkbuiltins.c
+@@ -69,10 +69,15 @@ extern char *strcpy ();
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
/* Flag values that builtins can have. */
-+/* These flags are for the C code generator,
++/* These flags are for the C code generator,
+ the C which is produced (./builtin.c)
-+ includes the flags definitions found
++ includes the flags definitions found
+ in ../builtins.h */
#define BUILTIN_FLAG_SPECIAL 0x01
#define BUILTIN_FLAG_ASSIGNMENT 0x02
#define BUILTIN_FLAG_LOCALVAR 0x04
#define BUILTIN_FLAG_POSIX_BUILTIN 0x08
-+#define BUILTIN_FLAG_REQUIRES 0x10
-+
++#define BUILTIN_FLAG_REQUIRES 0x10
#define BASE_INDENT 4
-@@ -163,10 +169,18 @@ char *posix_builtins[] =
+@@ -173,11 +178,19 @@ char *posix_builtins[] =
(char *)NULL
};
+static int is_requires_builtin ();
#if !defined (HAVE_RENAME)
-@@ -812,6 +826,9 @@ builtin_handler (self, defs, arg)
- new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+ static int rename ();
+@@ -831,6 +844,8 @@ builtin_handler (self, defs, arg)
+ new->flags |= BUILTIN_FLAG_LOCALVAR;
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;
-@@ -1267,12 +1267,13 @@ write_builtins (defs, structfile, extern
+@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile)
else
fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
document_name (builtin));
/* Don't translate short document summaries that are identical
-@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
+@@ -1645,6 +1661,13 @@ is_posix_builtin (name)
return (_find_in_table (name, posix_builtins));
}
#if !defined (HAVE_RENAME)
static int
rename (from, to)
-diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1
---- bash-4.1/doc/bash.1.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/doc/bash.1 2010-08-02 18:09:27.000000000 +0200
-@@ -231,6 +231,14 @@ The shell becomes restricted (see
+diff --git a/doc/bash.1 b/doc/bash.1
+index d91f1fd..111a66d 100644
+--- a/doc/bash.1
++++ b/doc/bash.1
+@@ -239,6 +239,14 @@ The shell becomes restricted (see
.B "RESTRICTED SHELL"
below).
.TP
+.B \-\-rpm-requires
-+Produce the list of files that are required for the
++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;
+Command substitutions, Conditional expressions and
+builtin are not parsed so some dependencies may be missed.
+.TP
.B \-\-verbose
- Equivalent to \fB\-v\fP.
+ Equivalent to \fB\-v\fP.
.TP
-diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi
---- bash-4.1/doc/bashref.texi.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/doc/bashref.texi 2010-08-02 18:11:58.000000000 +0200
-@@ -5343,6 +5343,13 @@ standard. @xref{Bash POSIX Mode}, for a
+diff --git a/doc/bashref.texi b/doc/bashref.texi
+index d33cd57..6fc4d18 100644
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
+@@ -6453,6 +6453,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash
@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
++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;
+Command substitutions, Conditional expressions and @command{eval}
@item --verbose
Equivalent to @option{-v}. Print shell input lines as they're read.
-diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
---- bash-4.1/eval.c.requires 2009-01-04 20:32:26.000000000 +0100
-+++ bash-4.1/eval.c 2010-08-02 17:42:41.000000000 +0200
-@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
- extern int current_command_number, current_command_line_count, line_number;
- extern int expand_aliases;
-+extern int rpm_requires;
- extern char *ps0_prompt;
-
- #if defined (HAVE_POSIX_SIGNALS)
- extern sigset_t top_level_mask;
-@@ -136,7 +137,7 @@ reader_loop ()
+diff --git a/eval.c b/eval.c
+index f02d6e4..76c1e8d 100644
+--- a/eval.c
++++ b/eval.c
+@@ -142,7 +142,8 @@ reader_loop ()
if (read_command () == 0)
{
- if (interactive_shell == 0 && read_but_dont_execute)
++
+ if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires))
{
last_command_exit_value = EXECUTION_SUCCESS;
dispose_command (global_command);
-diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
---- bash-4.1/execute_cmd.c.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/execute_cmd.c 2010-08-02 17:42:41.000000000 +0200
-@@ -503,6 +503,8 @@ async_redirect_stdin ()
+diff --git a/execute_cmd.c b/execute_cmd.c
+index 8b3c83a..4eae19c 100644
+--- a/execute_cmd.c
++++ b/execute_cmd.c
+@@ -538,6 +538,8 @@ async_redirect_stdin ()
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
/* Execute the command passed in COMMAND, perhaps doing it asynchronously.
COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
ASYNCHROUNOUS, if non-zero, says to do this command in the background.
-@@ -534,7 +536,13 @@ execute_command_internal (command, async
+@@ -569,7 +571,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
if (breaking || continuing)
return (last_command_exit_value);
return (EXECUTION_SUCCESS);
QUIT;
-@@ -5066,7 +5074,7 @@ execute_intern_function (name, function)
-
- if (check_identifier (name, posixly_correct) == 0)
+@@ -2813,7 +2821,7 @@ execute_for_command (for_command)
+ save_line_number = line_number;
+ if (check_identifier (for_command->name, 1) == 0)
{
- if (posixly_correct && interactive_shell == 0)
+ if (posixly_correct && interactive_shell == 0 && rpm_requires == 0)
{
last_command_exit_value = EX_BADUSAGE;
jump_to_top_level (ERREXIT);
-diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h
---- bash-4.1/execute_cmd.h.requires 2009-01-16 22:20:15.000000000 +0100
-+++ bash-4.1/execute_cmd.h 2010-08-02 17:42:41.000000000 +0200
-@@ -22,6 +22,8 @@
+diff --git a/execute_cmd.h b/execute_cmd.h
+index dc2f15e..506fff4 100644
+--- a/execute_cmd.h
++++ b/execute_cmd.h
+@@ -22,6 +22,9 @@
#define _EXECUTE_CMD_H_
#include "stdc.h"
+#include "variables.h"
+#include "command.h"
-
- extern struct fd_bitmap *new_fd_bitmap __P((int));
- extern void dispose_fd_bitmap __P((struct fd_bitmap *));
-diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
---- bash-4.1/make_cmd.c.requires 2009-09-11 23:26:12.000000000 +0200
-+++ bash-4.1/make_cmd.c 2010-08-02 17:42:41.000000000 +0200
-@@ -42,11 +42,15 @@
- #include "flags.h"
- #include "make_cmd.h"
- #include "dispose_cmd.h"
-+#include "execute_cmd.h"
- #include "variables.h"
- #include "subst.h"
- #include "input.h"
- #include "ocache.h"
- #include "externs.h"
-+#include "builtins.h"
+
-+#include "builtins/common.h"
- #if defined (JOB_CONTROL)
- #include "jobs.h"
-@@ -56,6 +60,10 @@
- extern int line_number, current_command_line_count, parser_state;
- extern int last_command_exit_value;
- extern int shell_initialized;
-+extern int rpm_requires;
-+
-+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
- /* Object caching */
- sh_obj_cache_t wdcache = {0, 0, 0};
-@@ -820,6 +828,27 @@ make_coproc_command (name, command)
+ #if defined (ARRAY_VARS)
+ struct func_array_state
+diff --git a/make_cmd.c b/make_cmd.c
+index ecbbfd6..3d8bfa4 100644
+--- a/make_cmd.c
++++ b/make_cmd.c
+@@ -828,6 +828,27 @@ make_coproc_command (name, command)
return (make_command (cm_coproc, (SIMPLE_COM *)temp));
}
+ if (strchr(filename, '$') || (filename[0] != '/' && strchr(filename, '/')))
+ return;
+
-+ /*
++ /*
+ if the executable is called via variable substitution we can
-+ not dermine what it is at compile time.
++ 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
/* 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. */
-@@ -837,6 +866,27 @@ clean_simple_command (command)
+@@ -845,6 +866,28 @@ clean_simple_command (command)
REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
}
+ output_requirement (find_function(cmd0) ? "function" : "executable", cmd0);
+ }
+ } /*rpm_requires*/
++
+
parser_state &= ~PST_REDIRLIST;
return (command);
}
-diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
---- bash-4.1/shell.c.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/shell.c 2010-08-02 17:42:41.000000000 +0200
+diff --git a/shell.c b/shell.c
+index a2b2a55..c5d99b3 100644
+--- a/shell.c
++++ b/shell.c
@@ -193,6 +193,9 @@ int have_devfd = 0;
/* The name of the .(shell)rc file. */
- static char *bashrc_file = "~/.bashrc";
+ static char *bashrc_file = DEFAULT_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;
-@@ -251,6 +254,7 @@ static const struct {
+@@ -259,6 +262,7 @@ static const struct {
{ "protected", Int, &protected_mode, (char **)0x0 },
#endif
{ "rcfile", Charp, (int *)0x0, &bashrc_file },
#if defined (RESTRICTED_SHELL)
{ "restricted", Int, &restricted, (char **)0x0 },
#endif
-@@ -485,6 +489,12 @@ main (argc, argv, env)
+@@ -496,6 +500,12 @@ main (argc, argv, env)
if (dump_translatable_strings)
read_but_dont_execute = 1;
if (running_setuid && privileged_mode == 0)
disable_priv_mode ();
+diff --git a/shell.h b/shell.h
+index 8072605..6c4149d 100644
+--- a/shell.h
++++ b/shell.h
+@@ -34,12 +34,15 @@
+ #include "maxpath.h"
+ #include "unwind_prot.h"
+ #include "dispose_cmd.h"
++#include "execute_cmd.h"
+ #include "make_cmd.h"
+ #include "ocache.h"
+ #include "subst.h"
+ #include "sig.h"
+ #include "pathnames.h"
+ #include "externs.h"
++#include "builtins.h"
++#include "builtins/common.h"
+
+ extern int EOF_Reached;
+
+@@ -99,6 +102,9 @@ extern int interactive, interactive_shell;
+ extern int startup_state;
+ extern int reading_shell_script;
+ extern int shell_initialized;
++extern int rpm_requires;
++static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ extern int bash_argv_initialized;
+ extern int subshell_environment;
+ extern int current_command_number;
+--
+2.17.2
+
projects / packages / bash.git / blobdiff