Ticket #1620: privateenv-changes

Index: privateenv.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/libcsupport/src/privateenv.c,v
retrieving revision 1.14
diff -u -r1.14 privateenv.c
--- privateenv.c        26 Jul 2010 22:03:17 -0000      1.14
+++ privateenv.c        29 Jul 2010 21:18:00 -0000
@@ -115,34 +115,53 @@
  *     while changing any of those (chdir(), chroot()).
  */
 
-#ifndef HAVE_USERENV_REFCNT
 rtems_status_code rtems_libio_share_private_env(rtems_id task_id)
 {
   rtems_status_code  sc;
   rtems_user_env_t * shared_user_env;
   rtems_id           current_task_id;
 
+  /* 
+   * get current task id 
+   */
   current_task_id = rtems_task_self();
 
-  if (rtems_current_user_env->task_id==current_task_id) {
-   /* kill the current user env & task_var*/
-   rtems_user_env_t  *tmp = rtems_current_user_env;
-   sc = rtems_task_variable_delete(RTEMS_SELF,(void*)&rtems_current_user_env);
-   if (sc != RTEMS_SUCCESSFUL) return sc;
-   free_user_env(tmp);
-  } else {
-    sc = rtems_task_variable_get(
-      task_id,(void*)&rtems_current_user_env, (void*)&shared_user_env );
+  /*
+   * If this was an attempt to share the task with self,
+   * if somebody wanted to do it... Lets tell them, its shared
+   */
+
+  if( task_id == current_task_id )
+    return RTEMS_SUCCESSFUL;
+  /* 
+   * Try to get the requested user environment 
+   */
+  sc = rtems_task_variable_get(
+        task_id,
+        (void*)&rtems_current_user_env, 
+        (void*)&shared_user_env );
+
+  /* 
+   * If it was not successful, return the error code 
+   */
     if (sc != RTEMS_SUCCESSFUL)
-      goto bailout;
-  }
+      return sc;
 
-  /* AT THIS POINT, rtems_current_user_env is DANGLING */
+    /* 
+     * If we are here, we have the required environment to be
+     * shared with the current task
+    */
+
+    /*
+     * If we have a current environment in place, we need to 
+     * free it, since we will be sharing the variable with the
+     * shared_user_env
+     */
 
-  sc = rtems_task_variable_add(
-    RTEMS_SELF,(void*)&rtems_current_user_env,free_user_env);
-  if (sc != RTEMS_SUCCESSFUL)
-    goto bailout;
+  if (rtems_current_user_env->task_id==current_task_id) {
+    rtems_user_env_t  *tmp = rtems_current_user_env;
+    free_user_env( tmp );
+  }
 
   /* the current_user_env is the same pointer that remote env */
   rtems_current_user_env = shared_user_env;
@@ -153,10 +172,4 @@
 #endif
 
   return RTEMS_SUCCESSFUL;
-
-bailout:
-  /* fallback to the global env */
-  rtems_current_user_env = &rtems_global_user_env;
-  return sc;
 }
-#endif