Changeset 3233 for trunk

Timestamp:

Apr 30, 2007, 1:04:30 AM (18 years ago)

Author:

bird

Message:

Applied bash-3.1-bash-logger.patch (gentoo)

Location:

trunk/essentials/app-shells/bash

Files:

• bashhist.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)

trunk/essentials/app-shells/bash/bashhist.c

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

trunk/essentials/app-shells/bash/lib/readline/histexpand.c

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

trunk/essentials/app-shells/bash/lib/readline/histfile.c

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

trunk/essentials/app-shells/bash/lib/readline/history.c

@@ -31 +31 @@
 
 #include <stdio.h>
+
+#include <syslog.h>
 
 #if defined (HAVE_STDLIB_H)
@@ -247 +249 @@
    is  set to NULL. */
 void
-add_history (string)
+add_history (string, logme)
      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))

trunk/essentials/app-shells/bash/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 *));
+extern void add_history PARAMS((const char *, int ));
 
 /* Change the timestamp associated with the most recent history entry to