From 1b72f9a64919a7aa775038eaf63d8c4c96109ee3 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Tue, 30 Mar 2004 23:22:14 +0000
Subject: [PATCH] Add Windows 2003 support to getProcEnvCommand() + minor
 refactoring. PR:  28067 Submitted by:	Irene Rusman

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276263 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/Execute.java    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 09d8fb760..da2dd31f0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -208,18 +208,15 @@ public class Execute {
     private static String[] getProcEnvCommand() {
         if (Os.isFamily("os/2")) {
             // OS/2 - use same mechanism as Windows 2000
-            String[] cmd = {"cmd", "/c", "set" };
-            return cmd;
+            return new String[] {"cmd", "/c", "set" };
         } else if (Os.isFamily("windows")) {
             // Determine if we're running under XP/2000/NT or 98/95
-            if (!Os.isFamily("win9x")) {
-                // Windows XP/2000/NT
-                String[] cmd = {"cmd", "/c", "set" };
-                return cmd;
-            } else {
+            if (Os.isFamily("win9x")) {
                 // Windows 98/95
-                String[] cmd = {"command.com", "/c", "set" };
-                return cmd;
+                return new String[] {"command.com", "/c", "set" };
+            } else {
+                // Windows XP/2000/NT/2003
+                return new String[] {"cmd", "/c", "set" };
             }
         } else if (Os.isFamily("z/os") || Os.isFamily("unix")) {
             // On most systems one could use: /bin/sh -c env
@@ -237,16 +234,13 @@ public class Execute {
             return cmd;
         } else if (Os.isFamily("netware") || Os.isFamily("os/400")) {
             // rely on PATH
-            String[] cmd = {"env"};
-            return cmd;
+            return new String[] {"env"};
         } else if (Os.isFamily("openvms")) {
-            String[] cmd = {"show", "logical"};
-            return cmd;
+            return new String[] {"show", "logical"};
         } else {
             // MAC OS 9 and previous
             //TODO: I have no idea how to get it, someone must fix it
-            String[] cmd = null;
-            return cmd;
+            return null;
         }
     }