luainit.w and texfileio.w: fix output_directory problem for recorder.

git-svn-id: svn://tug.org/texlive/trunk@22374 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 13 insertions, 13 deletions

diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index f61bc0b79c3..aef829a0cb9 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -457,7 +457,18 @@ static void init_kpse(void)
     }
     if (!user_progname) {
         if (ini_version) {
-            user_progname = input_name;
+            if (input_name) {
+                char *p = input_name + strlen(input_name) - 1;
+                while (p >= input_name) {
+                    if (IS_DIR_SEP (*p)) {
+                        p++;
+                        input_name = p;
+                        break;
+                    }
+                    p--;
+                }
+                user_progname = remove_suffix (input_name);
+            }
             if (!user_progname) {
                 user_progname = cleaned_invocation_name(argv[0]);
             }
diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
index 92fbbe230bc..c26647e03d9 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
@@ -784,17 +784,6 @@ except of course for a short time just after |job_name| has become nonzero.
 @c
 unsigned char *texmf_log_name;  /* full name of the log file */
 
-static void set_recorder_filename(char *filename) {
-    if (output_directory) {
-        filename = concat3(output_directory, DIR_SEP_STRING, filename);
-        recorder_change_filename(filename);
-        free(filename);
-    } else {
-        recorder_change_filename(filename);
-    }
-}
-
-
 @ The |open_log_file| routine is used to open the transcript file and to help
 it catch up to what has previously been printed on the terminal.
 
@@ -809,7 +798,7 @@ void open_log_file(void)
     if (job_name == 0)
         job_name = getjobname(maketexstring("texput")); /* TODO */
     fn = pack_job_name(".fls");
-    set_recorder_filename(fn);
+    recorder_change_filename(fn);
     fn = pack_job_name(".log");
     while (!lua_a_open_out(&log_file, fn, 0)) {
         /* Try to get a different log file name */