CVS commit: pkgsrc/pkgtools/lintpkgsrc/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Aug 17 18:45:16 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
lintpkgsrc: cleanup: untangle parsing of .include directives


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.115 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.116
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.115        Wed Aug 17 18:36:10 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Wed Aug 17 18:45:16 2022
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.115 2022/08/17 18:36:10 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.116 2022/08/17 18:45:16 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -451,17 +451,18 @@ sub parse_makefile_line_include($file, $
                verbose("Cannot open '$incfile' (from $file): $_ $!\n");
                return;
        }
-
-       # FIXME: .CURDIR doesn't change, but .PARSEDIR does.
-       my $NEWCURDIR = $incfile;
-       $NEWCURDIR =~ s#/[^/]*$##;
-       push @$incdirs, $NEWCURDIR
-           unless grep { $_ eq $NEWCURDIR } @$incdirs;
-       unshift @$lines, ".CURDIR=" . $vars->{'.CURDIR'};
        chomp(my @inc_lines = <FILE>);
-       unshift @$lines, @inc_lines;
-       unshift @$lines, ".CURDIR=$NEWCURDIR";
        close(FILE);
+
+       my $new_curdir = dirname $incfile;
+       push @$incdirs, $new_curdir
+           unless grep { $_ eq $new_curdir } @$incdirs;
+
+       # FIXME: .CURDIR doesn't change, but .PARSEDIR does.
+       unshift @$lines,
+           ".CURDIR=$new_curdir",
+           @inc_lines,
+           ".CURDIR=" . $vars->{'.CURDIR'};
 }
 
 sub parse_makefile_line_var($varname, $op, $value, $vars) {
@@ -670,22 +671,24 @@ sub parse_makefile_vars($file, $cwd = un
 
        for (my $loop = 1; $loop != 0;) {
                $loop = 0;
-               foreach my $key (keys %vars) {
-                       next if index($vars{$key}, '$') == -1;
+               foreach my $varname (keys %vars) {
+                       next if index($vars{$varname}, '$') == -1;
 
-                       $_ = expand_exprs($vars{$key}, \%vars);
-                       if ($_ ne $vars{$key}) {
-                               $vars{$key} = $_;
+                       $_ = expand_exprs($vars{$varname}, \%vars);
+                       if ($_ ne $vars{$varname}) {
+                               $vars{$varname} = $_;
                                $loop = 1;
 
-                       } elsif ($vars{$key} =~ m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}#) {
-                               $loop ||= expand_modifiers($file, $key, $`, $1, $2, $', \%vars);
+                       } elsif ($vars{$varname} =~ m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}#) {
+                               $loop ||= expand_modifiers($file, $varname, $`, $1, $2, $', \%vars);
                        }
                }
        }
 
-       foreach my $key (keys %vars) {
-               $vars{$key} =~ s/$magic_undefined//;
+       foreach my $varname (keys %vars) {
+               # XXX: Removing only the first magic string is strange; either
+               #  all of them or none of them should be removed.
+               $vars{$varname} =~ s/$magic_undefined//;
        }
        \%vars;
 }