about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-23T13·15-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-10T11·35+0200
commit7911e4c27a0020a61ace13cfdc44de4af02f315e (patch)
treedb7d61bae393b67ed0a57e29aa2cd8ac99d655a1 /src
parent04170d06bf7d17f882c01d3ab98885e0f3e46d2f (diff)
Remove maybeVfork
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build.cc4
-rw-r--r--src/libstore/local-store.cc2
-rw-r--r--src/libutil/util.cc9
-rw-r--r--src/libutil/util.hh3
4 files changed, 4 insertions, 14 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index f38cd299403c..70a3effb237a 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -602,7 +602,7 @@ HookInstance::HookInstance()
     builderOut.create();
 
     /* Fork the hook. */
-    pid = maybeVfork();
+    pid = fork();
     switch (pid) {
 
     case -1:
@@ -2781,7 +2781,7 @@ void SubstitutionGoal::tryToRun()
     const char * * argArr = strings2CharPtrs(args);
 
     /* Fork the substitute program. */
-    pid = maybeVfork();
+    pid = fork();
 
     switch (pid) {
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 5d210ae0171b..08ab269b3aad 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1083,7 +1083,7 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &
 
     setSubstituterEnv();
 
-    run.pid = maybeVfork();
+    run.pid = fork();
 
     switch (run.pid) {
 
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 8fc78b1463de..5f6203bc2805 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -868,7 +868,7 @@ string runProgram(Path program, bool searchPath, const Strings & args)
 
     /* Fork. */
     Pid pid;
-    pid = maybeVfork();
+    pid = fork();
 
     switch (pid) {
 
@@ -928,13 +928,6 @@ void closeOnExec(int fd)
 }
 
 
-#if HAVE_VFORK
-pid_t (*maybeVfork)() = vfork;
-#else
-pid_t (*maybeVfork)() = fork;
-#endif
-
-
 //////////////////////////////////////////////////////////////////////
 
 
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 1e9ffcf51b57..07c027a1f919 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -266,9 +266,6 @@ void closeMostFDs(const set<int> & exceptions);
 /* Set the close-on-exec flag for the given file descriptor. */
 void closeOnExec(int fd);
 
-/* Call vfork() if available, otherwise fork(). */
-extern pid_t (*maybeVfork)();
-
 
 /* User interruption. */