BGQ runjob env setup fix

This corrects logic added in commit
738913fa
for BGQ systems only

src/plugins/launch/runjob/launch_runjob.c

@@ -260,6 +260,7 @@ extern int fini(void)
 
 extern int launch_p_setup_srun_opt(char **rest)
 {
+	int i;
 	int command_pos = 0;
 	uint32_t taskid = NO_VAL;
 
@@ -311,28 +312,21 @@ extern int launch_p_setup_srun_opt(char **rest)
 		}
 
 		if (opt.export_env) {
-			if (!strcasecmp(opt.export_env, "NONE")) {
-				/* represents the difference between --env-all
-				 * and --exp-env */
-				command_pos += 2;
-			} else {
-				error("--export= only accepts NONE as "
-				      "an option, ignoring '%s'.",
-				      opt.export_env);
-				xfree(opt.export_env);
+			for (i = 0; opt.export_env[i]; i++) {
+				if (opt.export_env[i] == ',')
+					command_pos++;
 			}
+			command_pos += 5;	/* baseline overhead */
 		}
-
-		opt.argc += command_pos;
 	}
 
 	/* We need to do +2 here just incase multi-prog is needed (we
-	   add an extra argv on so just make space for it).
-	*/
-	opt.argv = (char **) xmalloc((opt.argc + 2) * sizeof(char *));
+	 * add an extra argv on so just make space for it). */
+	opt.argv = (char **) xmalloc((opt.argc + command_pos + 2) *
+		   sizeof(char *));
 
 	if (!opt.test_only) {
-		int i = 0;
+		i = 0;
 		/* First arg has to be something when sending it to the
 		   runjob api.  This can be anything, we put runjob
 		   here so --launch-cmd looks nice :), but it doesn't matter.
@@ -432,13 +426,8 @@ extern int launch_p_setup_srun_opt(char **rest)
 		 * job, which in this case is exactly what it is.  So, very
 		 * sweet. */
 		opt.argv[i++] = xstrdup(":");
-
-		/* Sanity check to make sure we set it up correctly. */
-		if (i != command_pos) {
-			fatal ("command_pos is set to %d but we are going to "
-			       "put it at %d, please update src/srun/opt.c",
-			       command_pos, i);
-		}
+		command_pos = i;
+		opt.argc += command_pos;
 
 		/* Set default job name to the executable name rather than
 		 * "runjob" */