[latex3-commits] [git/LaTeX3-latex3-latex3] master: \pdffilesize should not be used with an empty argument (baee3919b)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/baee3919b3a4cda5541eea6dbca86b0d9d6fb29f

>---------------------------------------------------------------

commit baee3919b3a4cda5541eea6dbca86b0d9d6fb29f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Sep 3 13:55:42 2019 +0100

    \pdffilesize should not be used with an empty argument


>---------------------------------------------------------------

baee3919b3a4cda5541eea6dbca86b0d9d6fb29f
 l3kernel/l3file.dtx | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 2e1aaac91..b3dac6349 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2505,20 +2505,23 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_full_name:nn #1#2
   {
-    \int_compare:nNnTF { 0 \@@_file_size:n {#1} } = 0
+    \tl_if_blank:nF {#1}
       {
-        \seq_map_tokens:Nn \l_file_search_path_seq
-          { \@@_full_name_aux:nn {#2} }
-%<*package>
-        \cs_if_exist:NT \input at path
+        \int_compare:nNnTF { 0 \@@_file_size:n {#1} } = 0
           {
-            \tl_map_tokens:Nn \input at path
+            \seq_map_tokens:Nn \l_file_search_path_seq
               { \@@_full_name_aux:nn {#2} }
-          }
+%<*package>
+            \cs_if_exist:NT \input at path
+              {
+                \tl_map_tokens:Nn \input at path
+                  { \@@_full_name_aux:nn {#2} }
+              }
 %</package>
-        \@@_file_name_end:
+            \@@_file_name_end:
+          }
+          { \@@_file_ext_check:n {#1} }
       }
-      { \@@_file_ext_check:n {#1} }
   }
 %    \end{macrocode}
 %   Two pars to the auxiliary here so we can avoid doing quoting