diff options
| author | Steven Knight <knight@baldmt.com> | 2006-04-15 04:13:38 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-04-15 04:13:38 +0000 |
| commit | ca71a306cae521635012f8397f259a41b0cb4205 (patch) | |
| tree | 53d112bdfe1a0608d3441a2b8b649b731b09c345 /src/os_spawnv_fix.diff | |
| parent | 5e36fe4beb10b2d7819ba54f91bfec03ec67f646 (diff) | |
| download | scons-ca71a306cae521635012f8397f259a41b0cb4205.tar.gz | |
Fix line endings on DOS files that want CRLF preserved.
Diffstat (limited to 'src/os_spawnv_fix.diff')
| -rw-r--r-- | src/os_spawnv_fix.diff | 166 |
1 files changed, 83 insertions, 83 deletions
diff --git a/src/os_spawnv_fix.diff b/src/os_spawnv_fix.diff index b8383466..926f896c 100644 --- a/src/os_spawnv_fix.diff +++ b/src/os_spawnv_fix.diff @@ -1,83 +1,83 @@ -? dist/src/Mac/IDE scripts/Hold option to open a script -? dist/src/Mac/IDE scripts/Insert file name -? dist/src/Mac/IDE scripts/Insert folder name -? dist/src/Mac/IDE scripts/Search Python Documentation -? dist/src/Mac/IDE scripts/Hack/Remove .pyc files -? dist/src/Mac/IDE scripts/Hack/Toolbox Assistant -Index: dist/src/Modules/posixmodule.c -=================================================================== -RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v -retrieving revision 2.213 -diff -c -c -r2.213 posixmodule.c -*** dist/src/Modules/posixmodule.c 2001/12/03 20:41:00 2.213 ---- dist/src/Modules/posixmodule.c 2001/12/05 00:52:58 -*************** -*** 1668,1674 **** - #ifdef HAVE_SPAWNV - static char posix_spawnv__doc__[] = - "spawnv(mode, path, args)\n\ -! Execute an executable path with arguments, replacing current process.\n\ - \n\ - mode: mode of process creation\n\ - path: path of executable file\n\ ---- 1668,1674 ---- - #ifdef HAVE_SPAWNV - static char posix_spawnv__doc__[] = - "spawnv(mode, path, args)\n\ -! Execute the program 'path' in a new process.\n\ - \n\ - mode: mode of process creation\n\ - path: path of executable file\n\ -*************** -*** 1717,1724 **** - - if (mode == _OLD_P_OVERLAY) - mode = _P_OVERLAY; - spawnval = _spawnv(mode, path, argvlist); -! - PyMem_DEL(argvlist); - - if (spawnval == -1) ---- 1717,1727 ---- - - if (mode == _OLD_P_OVERLAY) - mode = _P_OVERLAY; -+ -+ Py_BEGIN_ALLOW_THREADS - spawnval = _spawnv(mode, path, argvlist); -! Py_END_ALLOW_THREADS -! - PyMem_DEL(argvlist); - - if (spawnval == -1) -*************** -*** 1734,1740 **** - - static char posix_spawnve__doc__[] = - "spawnve(mode, path, args, env)\n\ -! Execute a path with arguments and environment, replacing current process.\n\ - \n\ - mode: mode of process creation\n\ - path: path of executable file\n\ ---- 1737,1743 ---- - - static char posix_spawnve__doc__[] = - "spawnve(mode, path, args, env)\n\ -! Execute the program 'path' in a new process.\n\ - \n\ - mode: mode of process creation\n\ - path: path of executable file\n\ -*************** -*** 1830,1836 **** ---- 1833,1843 ---- - - if (mode == _OLD_P_OVERLAY) - mode = _P_OVERLAY; -+ -+ Py_BEGIN_ALLOW_THREADS - spawnval = _spawnve(mode, path, argvlist, envlist); -+ Py_END_ALLOW_THREADS -+ - if (spawnval == -1) - (void) posix_error(); - else +? dist/src/Mac/IDE scripts/Hold option to open a script
+? dist/src/Mac/IDE scripts/Insert file name
+? dist/src/Mac/IDE scripts/Insert folder name
+? dist/src/Mac/IDE scripts/Search Python Documentation
+? dist/src/Mac/IDE scripts/Hack/Remove .pyc files
+? dist/src/Mac/IDE scripts/Hack/Toolbox Assistant
+Index: dist/src/Modules/posixmodule.c
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
+retrieving revision 2.213
+diff -c -c -r2.213 posixmodule.c
+*** dist/src/Modules/posixmodule.c 2001/12/03 20:41:00 2.213
+--- dist/src/Modules/posixmodule.c 2001/12/05 00:52:58
+***************
+*** 1668,1674 ****
+ #ifdef HAVE_SPAWNV
+ static char posix_spawnv__doc__[] =
+ "spawnv(mode, path, args)\n\
+! Execute an executable path with arguments, replacing current process.\n\
+ \n\
+ mode: mode of process creation\n\
+ path: path of executable file\n\
+--- 1668,1674 ----
+ #ifdef HAVE_SPAWNV
+ static char posix_spawnv__doc__[] =
+ "spawnv(mode, path, args)\n\
+! Execute the program 'path' in a new process.\n\
+ \n\
+ mode: mode of process creation\n\
+ path: path of executable file\n\
+***************
+*** 1717,1724 ****
+
+ if (mode == _OLD_P_OVERLAY)
+ mode = _P_OVERLAY;
+ spawnval = _spawnv(mode, path, argvlist);
+!
+ PyMem_DEL(argvlist);
+
+ if (spawnval == -1)
+--- 1717,1727 ----
+
+ if (mode == _OLD_P_OVERLAY)
+ mode = _P_OVERLAY;
++
++ Py_BEGIN_ALLOW_THREADS
+ spawnval = _spawnv(mode, path, argvlist);
+! Py_END_ALLOW_THREADS
+!
+ PyMem_DEL(argvlist);
+
+ if (spawnval == -1)
+***************
+*** 1734,1740 ****
+
+ static char posix_spawnve__doc__[] =
+ "spawnve(mode, path, args, env)\n\
+! Execute a path with arguments and environment, replacing current process.\n\
+ \n\
+ mode: mode of process creation\n\
+ path: path of executable file\n\
+--- 1737,1743 ----
+
+ static char posix_spawnve__doc__[] =
+ "spawnve(mode, path, args, env)\n\
+! Execute the program 'path' in a new process.\n\
+ \n\
+ mode: mode of process creation\n\
+ path: path of executable file\n\
+***************
+*** 1830,1836 ****
+--- 1833,1843 ----
+
+ if (mode == _OLD_P_OVERLAY)
+ mode = _P_OVERLAY;
++
++ Py_BEGIN_ALLOW_THREADS
+ spawnval = _spawnve(mode, path, argvlist, envlist);
++ Py_END_ALLOW_THREADS
++
+ if (spawnval == -1)
+ (void) posix_error();
+ else
|