itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor pid cwd finding to trap exceptions

This commit is contained in:
Chris Jones 2010-07-27 13:03:55 +01:00
parent 436f0c9786
commit 2f0138d298
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
terminatorlib/cwd.py
View File

@ -15,7 +15,7 @@
import platform import platform
import os import os
import pwd import pwd
from util import dbg from util import dbg, err
def get_default_cwd(): def get_default_cwd():
"""Determine a reasonable default cwd""" """Determine a reasonable default cwd"""
@ -33,7 +33,7 @@ def get_pid_cwd():
if system == 'Linux': if system == 'Linux':
dbg('Using Linux get_pid_cwd') dbg('Using Linux get_pid_cwd')
func = lambda pid: os.path.realpath('/proc/%s/cwd' % pid) func = linux_get_pid_cwd
elif system == 'FreeBSD': elif system == 'FreeBSD':
try: try:
import freebsd import freebsd
@ -43,10 +43,29 @@ def get_pid_cwd():
dbg('FreeBSD version too old for get_pid_cwd') dbg('FreeBSD version too old for get_pid_cwd')
elif system == 'SunOS': elif system == 'SunOS':
dbg('Using SunOS get_pid_cwd') dbg('Using SunOS get_pid_cwd')
func = lambda pid: os.path.realpath('/proc/%s/path/cwd' % pid) func = sunos_get_pid_cwd
else: else:
dbg('Unable to determine a get_pid_cwd for OS: %s' % system) dbg('Unable to determine a get_pid_cwd for OS: %s' % system)
return(func) return(func)
def proc_get_pid_cwd(pid, path):
"""Extract the cwd of a PID from proc, given the PID and the /proc path to
insert it into, e.g. /proc/%s/cwd"""
try:
cwd = os.path.realpath(path % pid)
except Exception, ex:
err('Unable to get cwd for PID %s: %s' % (pid, ex))
cwd = '/'
return(cwd)
def linux_get_pid_cwd(pid):
"""Determine the cwd for a given PID on Linux kernels"""
return(proc_get_pid_cwd(pid, '/proc/%s/cwd'))
def sunos_get_pid_cwd(pid):
"""Determine the cwd for a given PID on SunOS kernels"""
return(proc_get_pid_cwd(pid, '/proc/%s/path/cwd'))
# vim: set expandtab ts=4 sw=4: # vim: set expandtab ts=4 sw=4: