Ticket #56381: macports_append_history.patch

src/pextlib1.0/readline.c

@@ -267 +267 @@
                 add line
                 read filename
                 write filename
+                append filename
                 stifle max
                 unstifle
 */
@@ -309 +310 @@
                 }
                 s = Tcl_GetString(objv[2]);
                 write_history(s);
+        }  else if (0 == strcmp("append", action)) {
+                if (objc != 3) {
+                        Tcl_WrongNumArgs(interp, 1, objv, "append filename");
+                        return TCL_ERROR;
+                }
+                s = Tcl_GetString(objv[2]);
+
+                /* FYI: `append_history' _could_ write more than 1 item at a time here,
+                 * but that is not necessary for our present usage in src/port/port.tcl.
+                 * It would also require some different handling of the arg count in
+                 * this function. */
+
+                append_history(1, s);
         } else if (0 == strcmp("stifle", action)) {
                 if (objc != 3) {
                         Tcl_WrongNumArgs(interp, 1, objv, "stifle maxlines");

src/port/port.tcl

@@ -4844 +4844 @@
         set line [string trim $line]
 
         if { $use_readline && $line ne "" } {
+            # Create macports user directory if it does not exist yet
+            if {![file isdirectory $macports::macports_user_dir]} {
+                file mkdir $macports::macports_user_dir
+            }
+
+            # Add history item to memory...
             rl_history add $line
+            # ... and then append that item to the history file
+            rl_history append $history_file
+            puts "history is supposed to be written here"
         }
     }
 
@@ -4864 +4873 @@
     if {$use_readline && [file isdirectory $macports::macports_user_dir]} {
         rl_history read $history_file
         rl_history stifle 100
+        puts "history is supposed to be read here"
     }
 
     # Be noisy, if appropriate
@@ -4873 +4883 @@
         puts "Entering shell mode... (\"help\" for help, \"quit\" to quit)"
     }
 
+    if {$use_readline} {
+        puts "this ought to be printed"
+    }
+
     # Main command loop
     set exit_status 0
     while { $exit_status == 0 || $isstdin || [macports::ui_isset ports_processall] } {
@@ -4901 +4915 @@
         }
     }
 
-    # Create macports user directory if it does not exist yet
-    if {$use_readline && ![file isdirectory $macports::macports_user_dir]} {
-        file mkdir $macports::macports_user_dir
-    }
-    # Save readine history
-    if {$use_readline && [file isdirectory $macports::macports_user_dir]} {
-        rl_history write $history_file
-    }
-
     # Say goodbye
     if { $noisy } {
         puts "Goodbye"