Merge pull request #296 from evalEmpire/rewrite_cmd_wrapper

Rewrite cmd wrapper

.gitignore

@@ -14,7 +14,8 @@ nytprof*
 MYMETA.*
 *.o
 bin/perl5i
-bin/perl5i.c
+bin/perl5i.h
 bin/perl5i.bat
 .prove
 *.swp
+*.dSYM/

Build.PL

@@ -102,7 +102,7 @@ my $builder = MyBuild->new(
     },
 
     PL_files => {
-        'bin/perl5i.c.PL'       => 'bin/perl5i.c',
+        'bin/perl5i.h.PL'       => 'bin/perl5i.h',
         'bin/perl5i.bat.PL'     => 'bin/perl5i.bat',
     },
 

MANIFEST

@@ -1,7 +1,8 @@
 .perlcriticrc
 .perltidyrc
 bin/perl5i.bat.PL
-bin/perl5i.c.PL
+bin/perl5i.c
+bin/perl5i.h.PL
 bin/perl5i.plx
 Build.PL
 Changes

MANIFEST.SKIP

@@ -63,7 +63,7 @@
 
 # Don't ship perl5i
 ^bin/perl5i$
-^bin/perl5i.c$
+^bin/perl5i.h$
 ^bin/perl5i.bat$
 
 # Ignore C object files

bin/perl5i.c

@@ -0,0 +1,44 @@
+/*
+ * Meant to mimic the shell command
+ *     exec perl -Mperl5i::latest "$@"
+ *
+ * This is a C program so it works in a #! line with minimal overhead.
+ */
+
+#define DEBUG 0
+
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include "perl5i.h"
+
+char *safe_cat(char *a, char*b) {
+    char *new = malloc(sizeof(char) * (strlen(a) + strlen(b) + 1));
+
+    strcpy(new, a);
+    strcat(new, b);
+
+    return new;
+}
+
+int main (int argc, char* argv[]) {
+    int i;
+
+    char **exec_args  = malloc(sizeof(char*) * (argc + 2));
+    int num_exec_args = argc + 1;
+
+    /* Insert -Mperl5i::cmd=... into a copy of argv */
+    exec_args[0] = argv[0];
+    exec_args[1] = safe_cat("-Mperl5i::cmd=", argv[0]);
+    for( i = 1; i < argc; i++ ) {
+        exec_args[i+1] = argv[i];
+    }
+
+    exec_args[num_exec_args] = NULL;
+
+    execv(Perl_Path, exec_args );
+
+    fprintf(stderr, "Executing %s failed: %s\n", Perl_Path, strerror(errno));
+}

bin/perl5i.h.PL

@@ -0,0 +1,23 @@
+# Write out a header config file for the perl5i C wrapper.
+
+use strict;
+use warnings;
+use File::Spec;
+
+my $file = shift;
+
+# Its going inside double quotes.
+my $perl_path = $^X;
+$perl_path =~ s{ ([\\"]) }{\\$1}gx;
+
+my $tempdir = File::Spec->tmpdir || "/tmp";
+
+open my $fh, ">", $file or die $!;
+printf $fh <<"END";
+/* THIS FILE IS GENERATED BY $0
+ * Any changes here will be wiped out.  Edit it there instead.
+ */
+
+const char Perl_Path[] = "$perl_path";
+const char Temp_Template[]  = "$tempdir/perl5i.XXXXXXXX";
+END

t/command_line_wrapper.t

@@ -28,6 +28,10 @@ like `$perl5icmd -h`, qr/disable all warnings/, 'perl5i -h works as expected';
 
 like capture { system @perl5icmd, "-e", '$^X->say' }, qr/perl5i/, '$^X is perl5i';
 
+is capture { system @perl5icmd, "-e", 'say @ARGV', 'foo', 'bar' }, "foobar\n", "-e with args";
+
+is capture { system @perl5icmd, "-e", 'func foo() { say 42 } foo()' }, "42\n", "-e with Devel::Declare";
+
 is capture { system @perl5icmd, '-wle', q[print 'Hello'] }, "Hello\n", "compound -e";
 
 is capture { system @perl5icmd, "-Minteger", "-e", q[say 'Hello'] }, "Hello\n",