texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/init/latex2html.pm (l2h_to_html): Do not cal


From: Gavin D. Smith
Subject: branch master updated: * tp/init/latex2html.pm (l2h_to_html): Do not call encoded_input_file_name with an undefined or empty argument.
Date: Sat, 05 Mar 2022 18:38:54 -0500

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 9b7abf84a5 * tp/init/latex2html.pm (l2h_to_html): Do not call 
encoded_input_file_name with an undefined or empty argument.
9b7abf84a5 is described below

commit 9b7abf84a5d50f329b3f1b75077109bca3cca54e
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Mar 5 23:38:22 2022 +0000

    * tp/init/latex2html.pm (l2h_to_html): Do not call
    encoded_input_file_name with an undefined or empty argument.
---
 ChangeLog             |  5 +++++
 tp/init/latex2html.pm | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a92e3be173..0497e81864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-05  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/init/latex2html.pm (l2h_to_html): Do not call
+       encoded_input_file_name with an undefined or empty argument.
+
 2022-03-05  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Fix man page bold, italic, underline for Debian man
diff --git a/tp/init/latex2html.pm b/tp/init/latex2html.pm
index 76d577a210..8324da8931 100644
--- a/tp/init/latex2html.pm
+++ b/tp/init/latex2html.pm
@@ -370,11 +370,12 @@ sub l2h_to_html($)
   my $init_file = $self->get_conf('L2H_FILE');
   # FIXME not clear whether encoded_input_file_name or encoded_output_file_name
   # should be used here
-  my ($encoded_init_file, $init_path_encoding)
-    = $self->encoded_input_file_name($init_file);
-  $call .= " -init_file " . $init_file
-    if (defined($init_file) and $init_file ne ''
-        and -f $encoded_init_file and -r $encoded_init_file);
+  if (defined($init_file) and $init_file ne '') {
+    my ($encoded_init_file, $init_path_encoding)
+      = $self->encoded_input_file_name($init_file);
+    $call .= " -init_file " . $init_file
+      if -f $encoded_init_file and -r $encoded_init_file;
+  }
   # set output dir
   $call .=  (($docu_rdir ne '') ? " -dir $docu_rdir" : " -no_subdir");
   # use l2h_tmp, if specified



reply via email to

[Prev in Thread] Current Thread [Next in Thread]