Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
99773acf
Commit
99773acf
authored
Aug 14, 2010
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix indentation in Modules/getpath.c
parent
eba57b6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
59 additions
and
59 deletions
+59
-59
Modules/getpath.c
Modules/getpath.c
+59
-59
No files found.
Modules/getpath.c
View file @
99773acf
...
@@ -493,21 +493,21 @@ calculate_path(void)
...
@@ -493,21 +493,21 @@ calculate_path(void)
#endif
#endif
if
(
_path
)
{
if
(
_path
)
{
size_t
r
=
mbstowcs
(
wpath
,
_path
,
MAXPATHLEN
+
1
);
size_t
r
=
mbstowcs
(
wpath
,
_path
,
MAXPATHLEN
+
1
);
path
=
wpath
;
path
=
wpath
;
if
(
r
==
(
size_t
)
-
1
||
r
>
MAXPATHLEN
)
{
if
(
r
==
(
size_t
)
-
1
||
r
>
MAXPATHLEN
)
{
/* Could not convert PATH, or it's too long. */
/* Could not convert PATH, or it's too long. */
path
=
NULL
;
path
=
NULL
;
}
}
}
}
/* If there is no slash in the argv0 path, then we have to
/* If there is no slash in the argv0 path, then we have to
* assume python is on the user's $PATH, since there's no
* assume python is on the user's $PATH, since there's no
* other way to find a directory to start the search from. If
* other way to find a directory to start the search from. If
* $PATH isn't exported, you lose.
* $PATH isn't exported, you lose.
*/
*/
if
(
wcschr
(
prog
,
SEP
))
if
(
wcschr
(
prog
,
SEP
))
wcsncpy
(
progpath
,
prog
,
MAXPATHLEN
);
wcsncpy
(
progpath
,
prog
,
MAXPATHLEN
);
#ifdef __APPLE__
#ifdef __APPLE__
/* On Mac OS X, if a script uses an interpreter of the form
/* On Mac OS X, if a script uses an interpreter of the form
* "#!/opt/python2.3/bin/python", the kernel only passes "python"
* "#!/opt/python2.3/bin/python", the kernel only passes "python"
...
@@ -519,52 +519,52 @@ calculate_path(void)
...
@@ -519,52 +519,52 @@ calculate_path(void)
* will fail if a relative path was used. but in that case,
* will fail if a relative path was used. but in that case,
* absolutize() should help us out below
* absolutize() should help us out below
*/
*/
else
if
(
0
==
_NSGetExecutablePath
(
execpath
,
&
nsexeclength
)
&&
execpath
[
0
]
==
SEP
)
{
else
if
(
0
==
_NSGetExecutablePath
(
execpath
,
&
nsexeclength
)
&&
execpath
[
0
]
==
SEP
)
{
size_t
r
=
mbstowcs
(
progpath
,
execpath
,
MAXPATHLEN
+
1
);
size_t
r
=
mbstowcs
(
progpath
,
execpath
,
MAXPATHLEN
+
1
);
if
(
r
==
(
size_t
)
-
1
||
r
>
MAXPATHLEN
)
{
if
(
r
==
(
size_t
)
-
1
||
r
>
MAXPATHLEN
)
{
/* Could not convert execpath, or it's too long. */
/* Could not convert execpath, or it's too long. */
progpath
[
0
]
=
'\0'
;
progpath
[
0
]
=
'\0'
;
}
}
}
}
#endif
/* __APPLE__ */
#endif
/* __APPLE__ */
else
if
(
path
)
{
else
if
(
path
)
{
while
(
1
)
{
while
(
1
)
{
wchar_t
*
delim
=
wcschr
(
path
,
DELIM
);
wchar_t
*
delim
=
wcschr
(
path
,
DELIM
);
if
(
delim
)
{
if
(
delim
)
{
size_t
len
=
delim
-
path
;
size_t
len
=
delim
-
path
;
if
(
len
>
MAXPATHLEN
)
if
(
len
>
MAXPATHLEN
)
len
=
MAXPATHLEN
;
len
=
MAXPATHLEN
;
wcsncpy
(
progpath
,
path
,
len
);
wcsncpy
(
progpath
,
path
,
len
);
*
(
progpath
+
len
)
=
'\0'
;
*
(
progpath
+
len
)
=
'\0'
;
}
}
else
else
wcsncpy
(
progpath
,
path
,
MAXPATHLEN
);
wcsncpy
(
progpath
,
path
,
MAXPATHLEN
);
joinpath
(
progpath
,
prog
);
joinpath
(
progpath
,
prog
);
if
(
isxfile
(
progpath
))
if
(
isxfile
(
progpath
))
break
;
break
;
if
(
!
delim
)
{
if
(
!
delim
)
{
progpath
[
0
]
=
L'\0'
;
progpath
[
0
]
=
L'\0'
;
break
;
break
;
}
}
path
=
delim
+
1
;
path
=
delim
+
1
;
}
}
}
else
}
progpath
[
0
]
=
'\0'
;
else
if
(
progpath
[
0
]
!=
SEP
&&
progpath
[
0
]
!=
'\0'
)
progpath
[
0
]
=
'\0'
;
absolutize
(
progpath
);
if
(
progpath
[
0
]
!=
SEP
&&
progpath
[
0
]
!=
'\0'
)
wcsncpy
(
argv0_path
,
progpath
,
MAXPATHLEN
);
absolutize
(
progpath
);
argv0_path
[
MAXPATHLEN
]
=
'\0'
;
wcsncpy
(
argv0_path
,
progpath
,
MAXPATHLEN
);
argv0_path
[
MAXPATHLEN
]
=
'\0'
;
#ifdef WITH_NEXT_FRAMEWORK
#ifdef WITH_NEXT_FRAMEWORK
/* On Mac OS X we have a special case if we're running from a framework.
/* On Mac OS X we have a special case if we're running from a framework.
** This is because the python home should be set relative to the library,
** This is because the python home should be set relative to the library,
** which is in the framework, not relative to the executable, which may
** which is in the framework, not relative to the executable, which may
** be outside of the framework. Except when we're in the build directory...
** be outside of the framework. Except when we're in the build directory...
*/
*/
pythonModule
=
NSModuleForSymbol
(
NSLookupAndBindSymbol
(
"_Py_Initialize"
));
pythonModule
=
NSModuleForSymbol
(
NSLookupAndBindSymbol
(
"_Py_Initialize"
));
/* Use dylib functions to find out where the framework was loaded from */
/* Use dylib functions to find out where the framework was loaded from */
buf
=
(
wchar_t
*
)
NSLibraryNameForModule
(
pythonModule
);
buf
=
(
wchar_t
*
)
NSLibraryNameForModule
(
pythonModule
);
...
@@ -582,13 +582,13 @@ calculate_path(void)
...
@@ -582,13 +582,13 @@ calculate_path(void)
joinpath
(
argv0_path
,
lib_python
);
joinpath
(
argv0_path
,
lib_python
);
joinpath
(
argv0_path
,
LANDMARK
);
joinpath
(
argv0_path
,
LANDMARK
);
if
(
!
ismodule
(
argv0_path
))
{
if
(
!
ismodule
(
argv0_path
))
{
/* We are in the build directory so use the name of the
/* We are in the build directory so use the name of the
executable - we know that the absolute path is passed */
executable - we know that the absolute path is passed */
wcsncpy
(
argv0_path
,
progpath
,
MAXPATHLEN
);
wcsncpy
(
argv0_path
,
progpath
,
MAXPATHLEN
);
}
}
else
{
else
{
/* Use the location of the library as the progpath */
/* Use the location of the library as the progpath */
wcsncpy
(
argv0_path
,
buf
,
MAXPATHLEN
);
wcsncpy
(
argv0_path
,
buf
,
MAXPATHLEN
);
}
}
}
}
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment