Changeset 3276 for vendor/bash/3.1-p17

Timestamp:

May 1, 2007, 7:22:36 PM (18 years ago)

Author:

bird

Message:

Backed out bash-3.1-gentoo.patch, bash-3.1-fix-dash-login-shell.patch and bash-3.1-bash-logger.patch (gentoo patches).

Location:

vendor/bash/3.1-p17

Files:

• Makefile.in (modified) (2 diffs, 1 prop)
• bashhist.c (modified) (1 diff)
• doc/builtins.1 (modified) (1 diff, 1 prop)
• lib/readline/complete.c (modified) (1 diff)
• lib/readline/histexpand.c (modified) (1 diff)
• lib/readline/histfile.c (modified) (1 diff)
• lib/readline/history.c (modified) (2 diffs)
• lib/readline/history.h (modified) (1 diff)
• parse.y (modified) (2 diffs, 1 prop)
• shell.c (modified) (1 diff)

vendor/bash/3.1-p17/Makefile.in

@@ -659 +659 @@
 config.h:       stamp-h 
 
-stamp-h:        version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
+stamp-h:        config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
         CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
 
@@ -667 +667 @@
 # comment out for distribution
 $(srcdir)/configure:    $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-        cd $(srcdir)
+        cd $(srcdir) && autoconf
 
 # for chet

vendor/bash/3.1-p17/bashhist.c

@@ -706 +706 @@
   hist_last_line_added = 1;
   hist_last_line_pushed = 0;
-  add_history (line, 1);
+  add_history (line);
   history_lines_this_session++;
 }

vendor/bash/3.1-p17/doc/builtins.1

@@ -9 +9 @@
 shift, shopt, source, suspend, test, times, trap, type, typeset,
 ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
+.SH BASH BUILTIN COMMANDS
+.nr zZ 1
+.so bash.1
 .SH SEE ALSO
 bash(1), sh(1)

vendor/bash/3.1-p17/lib/readline/complete.c

@@ -1545 +1545 @@
     {
       filename = tilde_expand (text);
-      s = stat (filename, &finfo);
+      s = (nontrivial_match && rl_completion_mark_symlink_dirs == 0)
+                ? LSTAT (filename, &finfo)
+                : stat (filename, &finfo);
       if (s == 0 && S_ISDIR (finfo.st_mode))
         {

vendor/bash/3.1-p17/lib/readline/histexpand.c

@@ -1223 +1223 @@
   if (only_printing)
     {
-      add_history (result, 1);
+#if 0
+      add_history (result);
+#endif
       return (2);
     }

vendor/bash/3.1-p17/lib/readline/histfile.c

@@ -263 +263 @@
             if (HIST_TIMESTAMP_START(line_start) == 0)
               {
-                add_history (line_start,0);
+                add_history (line_start);
                 if (last_ts)
                   {

vendor/bash/3.1-p17/lib/readline/history.c

@@ -31 +31 @@
 
 #include <stdio.h>
-
-#include <syslog.h>
 
 #if defined (HAVE_STDLIB_H)
@@ -249 +247 @@
    is  set to NULL. */
 void
-add_history (string, logme)
+add_history (string)
      const char *string;
-     int logme; /* 0 means no sending history to syslog */
 {
   HIST_ENTRY *temp;
-  if (logme) {
-    if (strlen(string)<600) {
-      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s",
-        getpid(), getuid(), string);
-    }
-    else {
-      char trunc[600];
-      strncpy(trunc,string,sizeof(trunc));
-      trunc[sizeof(trunc)-1]='\0';
-      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
-          getpid(), getuid(), trunc);
-    }
-  }
 
   if (history_stifled && (history_length == history_max_entries))

vendor/bash/3.1-p17/lib/readline/history.h

@@ -81 +81 @@
 /* Place STRING at the end of the history list.
    The associated data field (if any) is set to NULL. */
-extern void add_history PARAMS((const char *, int ));
+extern void add_history PARAMS((const char *));
 
 /* Change the timestamp associated with the most recent history entry to

vendor/bash/3.1-p17/parse.y

@@ -390 +390 @@
         ;
 
-word_list:
-                        { $$ = (WORD_LIST *)NULL; }
-        |       WORD
+word_list:      WORD
                         { $$ = make_word_list ($1, (WORD_LIST *)NULL); }
         |       word_list WORD
@@ -1189 +1187 @@
 #if defined (READLINE)
 char *current_readline_prompt = (char *)NULL;
-unsigned char *current_readline_line = (unsigned char *)NULL;
+char *current_readline_line = (char *)NULL;
 int current_readline_line_index = 0;
 

vendor/bash/3.1-p17/shell.c

@@ -1534 +1534 @@
   shell_name = argv0 ? base_pathname (argv0) : PROGRAM;
 
-  if (argv0 && *argv0 == '-')
-    {
-      if (*shell_name == '-')
-        shell_name++;
+  if (*shell_name == '-')
+    {
+      shell_name++;
       login_shell++;
     }