Changeset 3276 for vendor/bash/3.1-p17/lib

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/lib/readline

Files:

• complete.c (modified) (1 diff)
• histexpand.c (modified) (1 diff)
• histfile.c (modified) (1 diff)
• history.c (modified) (2 diffs)
• history.h (modified) (1 diff)

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