Commits

Brian Kearns committed fbe59aa Merge

merge heads

Comments (0)

Files changed (2)

rpython/rtyper/lltypesystem/rffi.py

     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

rpython/rtyper/module/ll_os.py

                                    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")
                 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
 
         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:
                 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)