Squashed commit of the following:

commit d74cec9e6c77e70b33883f517b1bb6f97b2ffa5e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:33:06 2007 +0800

    updates.

commit 643b31f979a00ea5397206ca59f20bb58c62660e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:32:35 2007 +0800

    added some .gitignore rules.

commit 1510d38798976753b435f32308e79acd9fcd2722
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:05:10 2007 +0800

    removed bogus use of 127.0.0.1

commit 3c91e89b01af20a0dacfdbc1fbeca1c67c796656
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:01:43 2007 +0800

    Verify that cygwin python is used under Windows.

commit ff160725c051eedb28a42d9dd69f0d8aa297e522
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:55:03 2007 +0800

    bump timeout for the node to terminate. killing the node leaves the servers running under cygwin

commit ec3bddb58e861f906bf39aee1fa818c3e9a50000
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:48:55 2007 +0800

    added back accidently removed files.

commit f9ea2f552d7f576ebfa878669925f4184a89257b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:47:47 2007 +0800

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2427, http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2422

commit 8a309ca0036dba7ecbd577edb2d737fa41174a5a
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 10:06:53 2007 +0800

    added ruby support to the expect scripts.

commit 34597c1ee6d80d6754c9e925bd376125dd104a5f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 09:26:10 2007 +0800

    added pexpect to git repository.

commit 4bd2e1f2b52bcb9906b03ac216db686b8229b545
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 18:49:51 2007 +0800

    numerous UNIX expect script fixes.

commit 25ab4a812f45a6e908d5d2d7ab03e557d79afa9f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 16:47:08 2007 +0800

    generate configuration files for IceGrid icebox/iceboxd

commit 6bb57bf7ed21d7256963c228aaf0b20657367a47
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 15:16:55 2007 +0800

    added python & C# support to the expect scripts.

commit 08f1a59971ad3a52a4357069554dcc309b2d062b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 14:23:53 2007 +0800

    java expect scripts complete.

commit 3918f4ff3beea3005001bc55c5502c0825d8b7ea
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 13:30:31 2007 +0800

    first set of expect changes.

1 files changed, 4 insertions, 83 deletions

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 25c67564f93..35ab0cbf548 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -1702,7 +1702,7 @@ Parser::getInput(char* buf, int& result, int maxSize)
             }
         }
     }
-    else if(isatty(fileno(yyin)))
+    else
     {
 #ifdef HAVE_READLINE
 
@@ -1772,21 +1772,6 @@ Parser::getInput(char* buf, int& result, int maxSize)
 
 #endif
     }
-    else
-    {
-        if(((result = (int) fread(buf, 1, maxSize, yyin)) == 0) && ferror(yyin))
-        {
-            error("input in flex scanner failed");
-            buf[0] = EOF;
-            result = 1;
-        }
-    }
-}
-
-void
-Parser::nextLine()
-{
-    _currentLine++;
 }
 
 void
@@ -1798,7 +1783,7 @@ Parser::continueLine()
 const char*
 Parser::getPrompt()
 {
-    assert(_commands.empty() && isatty(fileno(yyin)));
+    assert(_commands.empty());
 
     if(_continue)
     {
@@ -1812,50 +1797,6 @@ Parser::getPrompt()
 }
 
 void
-Parser::scanPosition(const char* s)
-{
-    string line(s);
-    string::size_type idx;
-
-    idx = line.find("line");
-    if(idx != string::npos)
-    {
-        line.erase(0, idx + 4);
-    }
-
-    idx = line.find_first_not_of(" \t\r#");
-    if(idx != string::npos)
-    {
-        line.erase(0, idx);
-    }
-
-    _currentLine = atoi(line.c_str()) - 1;
-
-    idx = line.find_first_of(" \t\r");
-    if(idx != string::npos)
-    {
-        line.erase(0, idx);
-    }
-
-    idx = line.find_first_not_of(" \t\r\"");
-    if(idx != string::npos)
-    {
-        line.erase(0, idx);
-
-        idx = line.find_first_of(" \t\r\"");
-        if(idx != string::npos)
-        {
-            _currentFile = line.substr(0, idx);
-            line.erase(0, idx + 1);
-        }
-        else
-        {
-            _currentFile = line;
-        }
-    }
-}
-
-void
 Parser::invalidCommand(const char* s)
 {
     error(s);
@@ -1956,14 +1897,7 @@ Parser::patchFailed(const Ice::StringSeq& reasons)
 void
 Parser::error(const char* s)
 {
-    if(_commands.empty() && !isatty(fileno(yyin)))
-    {
-        cerr << _currentFile << ':' << _currentLine << ": " << s << endl;
-    }
-    else
-    {
-        cerr << "error: " << s << endl;
-    }
+    cerr << "error: " << s << endl;
     _errors++;
 }
 
@@ -1976,14 +1910,7 @@ Parser::error(const string& s)
 void
 Parser::warning(const char* s)
 {
-    if(_commands.empty() && !isatty(fileno(yyin)))
-    {
-        cerr << _currentFile << ':' << _currentLine << ": warning: " << s << endl;
-    }
-    else
-    {
-        cerr << "warning: " << s << endl;
-    }
+    cerr << "warning: " << s << endl;
 }
 
 void
@@ -2005,10 +1932,7 @@ Parser::parse(FILE* file, bool debug)
     yyin = file;
     assert(yyin);
 
-    _currentFile = "";
-    _currentLine = 0;
     _continue = false;
-    nextLine();
 
     int status = yyparse();
     if(_errors)
@@ -2033,10 +1957,7 @@ Parser::parse(const std::string& commands, bool debug)
     assert(!_commands.empty());
     yyin = 0;
 
-    _currentFile = "";
-    _currentLine = 0;
     _continue = false;
-    nextLine();
 
     int status = yyparse();
     if(_errors)