Changeset 3803

Timestamp:

09/16/03 00:44:00 (19 years ago)

Author:

piso

Message:

Bulletproofing: avoid problems if shellCommand is null.

File:

• trunk/j/src/org/armedbear/j/Shell.java (modified) (12 diffs)

trunk/j/src/org/armedbear/j/Shell.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2003 Peter Graves
- * $Id: Shell.java,v 1.27 2003-06-29 00:19:34 piso Exp $
+ * $Id: Shell.java,v 1.28 2003-09-16 00:44:00 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -55 +55 @@
         this();
         this.shellCommand = shellCommand;
-        if (shellCommand.indexOf("tcsh") >= 0)
+        if (shellCommand != null && shellCommand.indexOf("tcsh") >= 0)
             promptIsStderr = false;
     }
@@ -82 +82 @@
         String s =
             Editor.preferences().getStringProperty(Property.SHELL_FILE_NAME);
-        if (s != null)
+        if (s != null && s.length() > 0)
             return s;
         return Platform.isPlatformWindows() ? "cmd.exe" : "bash -i";
@@ -94 +94 @@
     private static Shell createShell(String shellCommand)
     {
+        if (shellCommand == null) {
+            Debug.bug();
+            return null;
+        }
         Shell shell = new Shell(shellCommand);
         shell.startProcess();
@@ -109 +113 @@
     protected void startProcess()
     {
+        if (shellCommand == null) {
+            Debug.bug();
+            return;
+        }
         if (Platform.isPlatformWindows())
             if (shellCommand.toLowerCase().indexOf("cmd.exe") < 0)
                 cygnify = true;
-
         // Only set initialDir the first time we run, so that if we restart
         // this shell, it will start up in the same directory each time.
@@ -120 +127 @@
                 initialDir = Directories.getUserHomeDirectory();
         }
-
         // Shell command may contain a space (e.g. "bash -i").
         StringTokenizer st = new StringTokenizer(shellCommand);
-
         String[] cmdArray;
         int i = 0;
@@ -133 +138 @@
         while (st.hasMoreTokens())
             cmdArray[i++] = st.nextToken();
-
         Process p = null;
         try {
@@ -144 +148 @@
             return;
         }
-
         currentDir = initialDir;
         startWatcherThread();
-
         // See if the process exits right away (meaning jpty couldn't launch
         // the shell command).
@@ -160 +162 @@
         if (getProcess() == null)
             return; // Process exited.
-
         setPromptRE(Editor.preferences().getStringProperty(
             Property.SHELL_PROMPT_PATTERN));
-
         try {
             stdin  = new OutputStreamWriter(p.getOutputStream());
@@ -437 +437 @@
     public String toString()
     {
-        return shellCommand;
-    }
-
-    public String getTitle()
-    {
-        String dir = currentDir.toString();
-
-        // Upper case drive letter.
-        if (Platform.isPlatformWindows() && dir.length() >= 2 && dir.charAt(1) == ':')
-            dir = Character.toUpperCase(dir.charAt(0)) + dir.substring(1);
-
-        return shellCommand + "   " + dir;
+        return shellCommand != null ? shellCommand : "";
     }
 
@@ -588 +577 @@
     public static void shell(String shellCommand)
     {
+        if (shellCommand == null) {
+            Debug.bug();
+            return;
+        }
         if (!Editor.checkExperimental())
             return;
@@ -605 +598 @@
             Buffer b = it.nextBuffer();
             if (b instanceof Shell) {
-                if (((Shell)b).shellCommand.equals(shellCommand)) {
+                if (shellCommand.equals(((Shell)b).shellCommand)) {
                     buf = b;
                     break;