[Sharpcvslib-commits] sharpcvslib/src/ICSharpCode/SharpCvsLib/Protocols ExtProtocol.cs,1.1,1.2

[Clayton H. <dr...@us...>]

Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode/SharpCvsLib/Protocols
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6108/src/ICSharpCode/SharpCvsLib/Protocols

Modified Files:
	ExtProtocol.cs 
Log Message:
Updates to get plink working as an alternative to use with the ssh protocol.  Use the CVS_RSH variable (set to plink.exe) to use.

Index: ExtProtocol.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode/SharpCvsLib/Protocols/ExtProtocol.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtProtocol.cs	6 Aug 2004 06:18:25 -0000	1.1
--- ExtProtocol.cs	10 Nov 2004 07:41:03 -0000	1.2
***************
*** 50,53 ****
--- 50,56 ----
  	/// </summary>
  	public class ExtProtocol : AbstractProtocol {
+         private const string VERSION_ONE = "-1";
+         private const string VERSION_TWO = "-2";
+ 
          private readonly ILog LOGGER =
              LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
***************
*** 81,130 ****
  
          private void HandleExtAuthentication () {
!             StringBuilder processArgs = new StringBuilder ();
!             processArgs.Append ("-l ").Append (this.Repository.CvsRoot.User);
!             processArgs.Append (" -q ");  // quiet
!             processArgs.Append (" ").Append (this.Repository.CvsRoot.Host);
!             processArgs.Append (" \"cvs server\"");
  
-             try {
  
!                 ProcessStartInfo startInfo =
!                     new ProcessStartInfo(this.Config.Shell, processArgs.ToString ());
!                 if (LOGGER.IsDebugEnabled) {
!                     StringBuilder msg = new StringBuilder ();
!                     msg.Append("Process=[").Append(this.Config.Shell).Append("]");
!                     msg.Append("Process Arguments=[").Append(processArgs).Append("]");
!                     LOGGER.Debug(msg);
!                 }
!                 startInfo.RedirectStandardError  = true;
!                 startInfo.RedirectStandardInput  = true;
!                 startInfo.RedirectStandardOutput = true;
!                 startInfo.UseShellExecute        = false;
  
                  p = new Process();
  
                  p.StartInfo = startInfo;
                  p.Exited += new EventHandler(this.ExitShellEvent);
                  p.Start();
!             } catch (Exception e) {
!                 if (LOGGER.IsDebugEnabled) {
!                     LOGGER.Debug(e);
                  }
-                 throw new ExecuteShellException(this.Config.Shell + processArgs.ToString ());
              }
              BufferedStream errstream = new BufferedStream(p.StandardError.BaseStream);
-             //inputstream  = new CvsStream(new BufferedStream(p.StandardOutput.BaseStream));
-             //outputstream = new CvsStream(new BufferedStream(p.StandardInput.BaseStream));
              StreamWriter streamWriter  = p.StandardInput;
              StreamReader streamReader = p.StandardOutput;
  
-             //streamWriter.AutoFlush = true;
-             //streamReader.ReadToEnd ();
-             //streamWriter.WriteLine(password);
- 
              SetInputStream(new CvsStream (streamReader.BaseStream));
              SetOutputStream(new CvsStream (streamWriter.BaseStream));
          }
  
          private void ExitShellEvent(object sender, EventArgs e) {
              if (LOGGER.IsDebugEnabled) {
--- 84,170 ----
  
          private void HandleExtAuthentication () {
!             ProcessStartInfo startInfo =
!                 this.GetProcessInfo(this.Config.Shell, VERSION_ONE);
  
  
!             startInfo.RedirectStandardError  = true;
!             startInfo.RedirectStandardInput  = true;
!             startInfo.RedirectStandardOutput = true;
!             startInfo.UseShellExecute        = false;
  
+             try {
                  p = new Process();
  
                  p.StartInfo = startInfo;
                  p.Exited += new EventHandler(this.ExitShellEvent);
+ 
+                 LOGGER.Info(string.Format("{0} {1}",
+                     p.StartInfo.FileName, p.StartInfo.Arguments));
+ 
                  p.Start();
!             } catch (Exception) {
!                 try {
!                     p.StartInfo = this.GetProcessInfo(this.Config.Shell, VERSION_TWO);;
!                 } catch (Exception e) {
!                     throw new ExecuteShellException(
!                         string.Format("{0} {1}",
!                         this.Config.Shell, p.StartInfo.Arguments), e);
                  }
              }
              BufferedStream errstream = new BufferedStream(p.StandardError.BaseStream);
              StreamWriter streamWriter  = p.StandardInput;
              StreamReader streamReader = p.StandardOutput;
  
              SetInputStream(new CvsStream (streamReader.BaseStream));
              SetOutputStream(new CvsStream (streamWriter.BaseStream));
          }
  
+         private ProcessStartInfo GetProcessInfo (string program, string version) {
+             string tProgram = Path.GetFileNameWithoutExtension(program);
+             switch (tProgram) {
+                 case "plink": {
+                     return this.GetPlinkProcessInfo(version);
+                 }
+                 case "ssh": {
+                     return this.GetSshProcessInfo(version);
+                 }
+                 default:
+                     throw new ArgumentException(string.Format("Unknown ssh program specified ( {0} )",
+                         this.Config.Shell));
+             }
+         }
+ 
+         private ProcessStartInfo GetPlinkProcessInfo (string version) {
+             string args = string.Format("{0} {1} {2} {3} {4}",
+                 version, "-l", this.Repository.CvsRoot.User, 
+                 this.Repository.CvsRoot.Host, "\"cvs server\"");
+ 
+             ProcessStartInfo startInfo =
+                 new ProcessStartInfo("plink.exe", args.ToString ());
+ 
+             startInfo.RedirectStandardError  = true;
+             startInfo.RedirectStandardInput  = true;
+             startInfo.RedirectStandardOutput = true;
+             startInfo.UseShellExecute        = false;
+ 
+             return startInfo;
+         }
+ 
+         private ProcessStartInfo GetSshProcessInfo (string version) {
+             string args = string.Format("{0} {1} {2} {3} {4} {5}",
+                 version.ToString(), "-l", this.Repository.CvsRoot.User, "-q", 
+                 this.Repository.CvsRoot.Host, "\"cvs server\"");
+ 
+             ProcessStartInfo startInfo =
+                 new ProcessStartInfo("ssh.exe", args);
+ 
+             startInfo.RedirectStandardError  = true;
+             startInfo.RedirectStandardInput  = true;
+             startInfo.RedirectStandardOutput = true;
+             startInfo.UseShellExecute        = false;
+ 
+             return startInfo;
+         }
+ 
          private void ExitShellEvent(object sender, EventArgs e) {
              if (LOGGER.IsDebugEnabled) {