libfshelp: Simplify fshelp_start_translator_long () a bit

It only really supports ports_len > INIT_PORT_BOOTSTRAP,
ports_type == MACH_MSG_TYPE_COPY_SEND, fds_type == MACH_MSG_TYPE_COPY_SEND.
Make that explicit, and remove the branches that tried to handle the other
cases.

1 files changed, 14 insertions, 39 deletions

diff --git a/libfshelp/start-translator-long.c b/libfshelp/start-translator-long.c
index 1df5d57b..9e0ca9f6 100644
--- a/libfshelp/start-translator-long.c
+++ b/libfshelp/start-translator-long.c
@@ -206,7 +206,13 @@ fshelp_start_translator_long (fshelp_open_fn_t underlying_open_fn,
   mach_port_t bootstrap = MACH_PORT_NULL;
   mach_port_t task = MACH_PORT_NULL;
   mach_port_t prev_notify, proc, saveport, childproc;
-  int ports_moved = 0;
+
+  /* While from our function signature it appears that we support passing
+     incomplete port arrays of any type, this is what the implementation
+     actually requires.  */
+  assert_backtrace (ports_len > INIT_PORT_BOOTSTRAP);
+  assert_backtrace (ports_type == MACH_MSG_TYPE_COPY_SEND);
+  assert_backtrace (fds_type == MACH_MSG_TYPE_COPY_SEND);
 
   /* Find the translator itself.  Since argz has zero-separated elements, we
      can use it as a normal string representing the first element.  */
@@ -220,6 +226,12 @@ fshelp_start_translator_long (fshelp_open_fn_t underlying_open_fn,
   if (err)
     goto lose;
 
+  err = mach_port_insert_right (mach_task_self (),
+                                bootstrap, bootstrap,
+                                MACH_MSG_TYPE_MAKE_SEND);
+  if (err)
+    goto lose;
+
   /* Create the task for the translator.  */
   err = task_create (mach_task_self (),
 #ifdef KERN_INVALID_LEDGER
@@ -249,29 +261,6 @@ fshelp_start_translator_long (fshelp_open_fn_t underlying_open_fn,
   if (err)
     goto lose_task;
 
-  assert_backtrace (ports_len > INIT_PORT_BOOTSTRAP);
-  switch (ports_type)
-    {
-    case MACH_MSG_TYPE_MAKE_SEND:
-    case MACH_MSG_TYPE_MAKE_SEND_ONCE:
-      break;
-
-    case MACH_MSG_TYPE_MOVE_SEND:
-      if (ports[INIT_PORT_BOOTSTRAP] != MACH_PORT_NULL)
-	mach_port_deallocate (mach_task_self (), ports[INIT_PORT_BOOTSTRAP]);
-      mach_port_insert_right (mach_task_self (), bootstrap, bootstrap,
-			      MACH_MSG_TYPE_MAKE_SEND);
-      break;
-
-    case MACH_MSG_TYPE_COPY_SEND:
-      mach_port_insert_right (mach_task_self (), bootstrap, bootstrap,
-			      MACH_MSG_TYPE_MAKE_SEND);
-      break;
-
-    default:
-      abort ();
-    }
-
   saveport = ports[INIT_PORT_BOOTSTRAP];
   ports[INIT_PORT_BOOTSTRAP] = bootstrap;
 
@@ -291,10 +280,7 @@ fshelp_start_translator_long (fshelp_open_fn_t underlying_open_fn,
 		     ports, ports_type, ports_len,
 		     ints, ints_len, 0, 0, 0, 0);
 
-  ports_moved = 1;
-
-  if (ports_type == MACH_MSG_TYPE_COPY_SEND)
-    mach_port_deallocate (mach_task_self (), bootstrap);
+  mach_port_deallocate (mach_task_self (), bootstrap);
   ports[INIT_PORT_BOOTSTRAP] = saveport;
 
   if (err)
@@ -322,17 +308,6 @@ fshelp_start_translator_long (fshelp_open_fn_t underlying_open_fn,
     task_terminate (task);
 
  lose:
-  if (!ports_moved)
-    {
-      int i;
-
-      if (fds_type == MACH_MSG_TYPE_MOVE_SEND)
-	for (i = 0; i < fds_len; i++)
-	  mach_port_deallocate (mach_task_self (), fds[i]);
-      if (ports_type == MACH_MSG_TYPE_MOVE_SEND)
-	for (i = 0; i < ports_len; i++)
-	  mach_port_deallocate (mach_task_self (), ports[i]);
-    }
   if (bootstrap != MACH_PORT_NULL)
     mach_port_destroy(mach_task_self(), bootstrap);
   if (executable != MACH_PORT_NULL)