[pypy-commit] pypy default: merge heads

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r60637:fbe59aa7bdd5
Date: 2013-01-28 17:00 -0500
http://bitbucket.org/pypy/pypy/changeset/fbe59aa7bdd5/

Log:	merge heads

diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -867,6 +867,8 @@
     array[len(l)] = lltype.nullptr(CCHARP.TO)
     return array
 liststr2charpp._annenforceargs_ = [[annmodel.s_Str0]]  # List of strings
+# Make a copy for the ll_os.py module
+ll_liststr2charpp = func_with_new_name(liststr2charpp, 'll_liststr2charpp')
 
 def free_charpp(ref):
     """ frees list of char**, NULL terminated
diff --git a/rpython/rtyper/module/ll_os.py b/rpython/rtyper/module/ll_os.py
--- a/rpython/rtyper/module/ll_os.py
+++ b/rpython/rtyper/module/ll_os.py
@@ -306,7 +306,7 @@
                                    rffi.INT, compilation_info = eci)
 
         def execv_llimpl(path, args):
-            l_args = rffi.liststr2charpp(args)
+            l_args = rffi.ll_liststr2charpp(args)
             os_execv(path, l_args)
             rffi.free_charpp(l_args)
             raise OSError(rposix.get_errno(), "execv failed")
@@ -332,8 +332,8 @@
                 envstr = "%s=%s" % item
                 envstrs.append(envstr)
 
-            l_args = rffi.liststr2charpp(args)
-            l_env = rffi.liststr2charpp(envstrs)
+            l_args = rffi.ll_liststr2charpp(args)
+            l_env = rffi.ll_liststr2charpp(envstrs)
             os_execve(path, l_args, l_env)
 
             # XXX untested
@@ -357,7 +357,7 @@
 
         def spawnv_llimpl(mode, path, args):
             mode = rffi.cast(rffi.INT, mode)
-            l_args = rffi.liststr2charpp(args)
+            l_args = rffi.ll_liststr2charpp(args)
             childpid = os_spawnv(mode, path, l_args)
             rffi.free_charpp(l_args)
             if childpid == -1:
@@ -380,8 +380,8 @@
                 envstrs.append("%s=%s" % item)
 
             mode = rffi.cast(rffi.INT, mode)
-            l_args = rffi.liststr2charpp(args)
-            l_env = rffi.liststr2charpp(envstrs)
+            l_args = rffi.ll_liststr2charpp(args)
+            l_env = rffi.ll_liststr2charpp(envstrs)
             childpid = os_spawnve(mode, path, l_args, l_env)
             rffi.free_charpp(l_env)
             rffi.free_charpp(l_args)