texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: texi2any: Don't switch to subdir mode if '-' name


From: Arsen Arsenović
Subject: branch master updated: texi2any: Don't switch to subdir mode if '-' names a dir
Date: Wed, 08 Mar 2023 06:59:53 -0500

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

arsen pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 9274789ce9 texi2any: Don't switch to subdir mode if '-' names a dir
9274789ce9 is described below

commit 9274789ce990a309f664b695786d236720cad2f2
Author: Arsen Arsenović <arsen@aarsen.me>
AuthorDate: Wed Mar 8 10:48:41 2023 +0100

    texi2any: Don't switch to subdir mode if '-' names a dir
    
    * tp/texi2any.pl (output|out|o=s): If the filename argument is
    specifically '-', do not consider the possibility of it being the
    name of a subdirectory.  This prevents programs that generate info
    in a pipeline from being confused in weird working directories.
---
 ChangeLog      | 8 ++++++++
 tp/texi2any.pl | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eabea6d3cc..f1504da4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-08  Arsen Arsenović  <arsen@aarsen.me>
+
+       texi2any: Don't switch to subdir mode if '-' names a dir
+       * tp/texi2any.pl (output|out|o=s): If the filename argument is
+       specifically '-', do not consider the possibility of it being the
+       name of a subdirectory.  This prevents programs that generate info
+       in a pipeline from being confused in weird working directories.
+
 2023-03-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (set_menus_node_directions): use in-tree
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 8d7af9554d..aad7ba4c3f 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1009,7 +1009,7 @@ There is NO WARRANTY, to the extent permitted by 
law.\n"), "2022");
                      $format = 'plaintext' if (!$_[1] and $format eq 'info'); 
},
  'output|out|o=s' => sub {
     my $var = 'OUTFILE';
-    if ($_[1] =~ m:/$: or -d $_[1]) {
+    if ($_[1] ne '-' and ($_[1] =~ m:/$: or -d $_[1])) {
       set_from_cmdline($var, undef);
       $var = 'SUBDIR';
     }



reply via email to

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