From 98cc0a97832e1bd6a896ebdaeb9162d109fac4b9 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Wed, 15 Aug 2012 01:12:14 +0200
Subject: ext.popen_forked: separated Popen_forked to a library

---
 ranger/ext/popen_forked.py | 26 ++++++++++++++++++++++++++
 ranger/ext/rifle.py        | 35 +++++++++++++++++++++--------------
 2 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 ranger/ext/popen_forked.py

diff --git a/ranger/ext/popen_forked.py b/ranger/ext/popen_forked.py
new file mode 100644
index 00000000..0dd52252
--- /dev/null
+++ b/ranger/ext/popen_forked.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2012  Roman Zimbelmann <romanz@lavabit.com>
+# This software is distributed under the terms of the GNU GPL version 3.
+
+import os
+import subprocess
+
+def Popen_forked(*args, **kwargs):
+	"""
+	Forks process and runs Popen with the given args and kwargs.
+
+	If os.fork() is not supported, runs Popen without forking and returns the
+	process object returned by Popen.
+	Otherwise, returns None.
+	"""
+	try:
+		pid = os.fork()
+	except:
+		# fall back to not forking if os.fork() is not supported
+		return subprocess.Popen(*args, **kwargs)
+	else:
+		if pid == 0:
+			os.setsid()
+			kwargs['stdin'] = open(os.devnull, 'r')
+			kwargs['stdout'] = kwargs['stderr'] = open(os.devnull, 'w')
+			subprocess.Popen(*args, **kwargs)
+			os._exit(0)
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index d5c40a0e..9b5fe2c9 100755
--- a/ranger/ext/rifle.py
+++ b/ranger/ext/rifle.py
@@ -65,6 +65,25 @@ except ImportError:
 		return _cached_executables
 
 
+try:
+	from ranger.ext.popen_forked import Popen_forked
+except ImportError:
+	def Popen_forked(*args, **kwargs):
+		"""Forks process and runs Popen with the given args and kwargs."""
+		try:
+			pid = os.fork()
+		except:
+			# fall back to not forking if os.fork() is not supported
+			return Popen(*args, **kwargs)
+		else:
+			if pid == 0:
+				os.setsid()
+				kwargs['stdin'] = open(os.devnull, 'r')
+				kwargs['stdout'] = kwargs['stderr'] = open(os.devnull, 'w')
+				Popen(*args, **kwargs)
+				os._exit(0)
+
+
 def _is_terminal():
 	# Check if stdin (file descriptor 0), stdout (fd 1) and
 	# stderr (fd 2) are connected to a terminal
@@ -313,20 +332,8 @@ class Rifle(object):
 						os.environ['TERMCMD'] = term
 					cmd = [os.environ['TERMCMD'], '-e'] + cmd
 				if 'f' in flags or 't' in flags:
-					devnull_r = open(os.devnull, 'r')
-					devnull_w = open(os.devnull, 'w')
-					try:
-						pid = os.fork()
-					except:
-						# fall back to not detaching if fork() is not supported
-						p = Popen(cmd, env=self.hook_environment(os.environ))
-						p.wait()
-					else:
-						if pid == 0:
-							os.setsid()
-							p = Popen(cmd, env=self.hook_environment(os.environ),
-								stdin=devnull_r, stdout=devnull_w, stderr=devnull_w)
-							os._exit(0)
+					from ranger.ext.run_forked import Popen_forked
+					Popen_forked(cmd, env=self.hook_environment(os.environ))
 				else:
 					p = Popen(cmd, env=self.hook_environment(os.environ))
 					p.wait()
-- 
cgit 1.4.1-2-gfad0