Apply fixes for buffering of headers, and a test module both by psychon

[user/henk/code/inspircd.git] / make / utilities.pm

diff --git a/make/utilities.pm b/make/utilities.pm
index fa7375da59395eed18c886c278ad788de9f23d93..34d7b8c8654cf63acd27a7265e1ae48ec434ee6c 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,5 +1,6 @@
 package make::utilities;
 use Exporter 'import';
+use POSIX;
 @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions);
 
 # Parse the output of a *_config program,
@@ -10,9 +11,9 @@ use Exporter 'import';
 
 my %already_added = ();
 
-sub make_rpath($)
+sub make_rpath($;$)
 {
-       my ($executable) = @_;
+       my ($executable, $module) = @_;
        chomp($data = `$executable`);
        my $output = "";
        while ($data =~ /-L(\S+)/)
@@ -20,7 +21,7 @@ sub make_rpath($)
                $libpath = $1;
                if (!exists $already_added{$libpath})
                {
-                       print "Adding extra library path \033[1;32m$libpath\033[0m ...\n";
+                       print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n";
                        $already_added{$libpath} = 1;
                }
                $output .= "-Wl,--rpath -Wl,$libpath -L$libpath ";
@@ -41,12 +42,12 @@ sub extend_pkg_path()
        }
 }
 
-sub pkgconfig_get_include_dirs($$$)
+sub pkgconfig_get_include_dirs($$$;$)
 {
-       my ($packagename, $headername, $defaults) = @_;
+       my ($packagename, $headername, $defaults, $module) = @_;
        extend_pkg_path();
 
-       print "Locating include directory for package \033[1;32m$packagename\033[0m ... ";
+       print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
        $ret = `pkg-config --cflags $packagename 2>/dev/null`;
        if ((!defined $ret) || ($ret eq ""))
@@ -79,12 +80,12 @@ sub pkgconfig_get_include_dirs($$$)
        return $ret;
 }
 
-sub pkgconfig_get_lib_dirs($$$)
+sub pkgconfig_get_lib_dirs($$$;$)
 {
-       my ($packagename, $libname, $defaults) = @_;
+       my ($packagename, $libname, $defaults, $module) = @_;
        extend_pkg_path();
 
-       print "Locating library directory for package \033[1;32m$packagename\033[0m ... ";
+       print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
        $ret = `pkg-config --libs $packagename 2>/dev/null`;
        if ((!defined $ret) || ($ret eq ""))
@@ -120,35 +121,81 @@ sub pkgconfig_get_lib_dirs($$$)
 
 # Translate a $CompileFlags etc line and parse out function calls
 # to functions within these modules at configure time.
-sub translate_functions($)
+sub translate_functions($$)
 {
-       my ($line) = @_;
-       while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
-       {
-               my $replace = pkgconfig_get_lib_dirs($1, $2, $3);
-               $line =~ s/pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/$replace/;
-       }
-       while ($line =~ /pkgconflibs\("(.+?)","(.+?)",""\)/)
-       {
-               my $replace = pkgconfig_get_lib_dirs($1, $2, "");
-               $line =~ s/pkgconflibs\("(.+?)","(.+?)",""\)/$replace/;
-       }
-       while ($line =~ /pkgconfincludes\("(.+?)","(.+?)",""\)/)
+       my ($line,$module) = @_;
+
+       eval
        {
-               my $replace = pkgconfig_get_include_dirs($1, $2, "");
-               $line =~ s/pkgconfincludes\("(.+?)","(.+?)",""\)/$replace/;
-       }
-       while ($line =~ /pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/)
+               $module =~ /modules*\/(.+?)$/;
+               $module = $1;
+
+               # This is only a cursory check, just designed to catch casual accidental use of backticks.
+               # There are pleanty of ways around it, but its not supposed to be for security, just checking
+               # that people are using the new configuration api as theyre supposed to and not just using
+               # backticks instead of eval(), being as eval has accountability. People wanting to get around
+               # the accountability will do so anyway.
+               if (($line =~ /`/) && ($line !~ /eval\(.+?`.+?\)/))
+               {
+                       die "Developers should no longer use backticks in configuration macros. Please use exec() and eval() macros instead. Offending line: $line (In module: $module)";
+               }
+               while ($line =~ /exec\("(.+?)"\)/)
+               {
+                       print "Executing program for module \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n";
+                       my $replace = `$1`;
+                       chomp($replace);
+                       $line =~ s/exec\("(.+?)"\)/$replace/;
+               }
+               while ($line =~ /eval\("(.+?)"\)/)
+               {
+                       print "Evaluating perl code for module \033[1;32m$module\033[0m ... ";
+                       my $tmpfile;
+                       do
+                       {
+                               $tmpfile = tmpnam();
+                       } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
+                       print "(Created and executed \033[1;32m$tmpfile\033[0m)\n";
+                       print TF $1;
+                       close TF;
+                       my $replace = `perl $tmpfile`;
+                       chomp($replace);
+                       $line =~ s/eval\("(.+?)"\)/$replace/;
+               }
+               while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
+               {
+                       my $replace = pkgconfig_get_lib_dirs($1, $2, $3, $module);
+                       $line =~ s/pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/$replace/;
+               }
+               while ($line =~ /pkgconflibs\("(.+?)","(.+?)",""\)/)
+               {
+                       my $replace = pkgconfig_get_lib_dirs($1, $2, "", $module);
+                       $line =~ s/pkgconflibs\("(.+?)","(.+?)",""\)/$replace/;
+               }
+               while ($line =~ /pkgconfincludes\("(.+?)","(.+?)",""\)/)
+               {
+                       my $replace = pkgconfig_get_include_dirs($1, $2, "", $module);
+                       $line =~ s/pkgconfincludes\("(.+?)","(.+?)",""\)/$replace/;
+               }
+               while ($line =~ /pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/)
+               {
+                       my $replace = pkgconfig_get_include_dirs($1, $2, $3, $module);
+                       $line =~ s/pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/$replace/;
+               }
+               while ($line =~ /rpath\("(.+?)"\)/)
+               {
+                       my $replace = make_rpath($1,$module);
+                       $line =~ s/rpath\("(.+?)"\)/$replace/;
+               }
+       };
+       if ($@)
        {
-               my $replace = pkgconfig_get_include_dirs($1, $2, $3);
-               $line =~ s/pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/$replace/;
+               print "\n\nConfiguration failed. The following error occured:\n\n$@\n";
+               exit;
        }
-       while ($line =~ /rpath\("(.+?)"\)/)
+       else
        {
-               my $replace = make_rpath($1);
-               $line =~ s/rpath\("(.+?)"\)/$replace/;
+               return $line;
        }
-       return $line;
 }
 
 1;