[Cmake-commits] [cmake-commits] hoffman committed Process.h.in 1.26 1.26.50.1 ProcessUNIX.c 1.71 1.71.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv9816/Source/kwsys

Modified Files:
      Tag: CMake-2-6
	Process.h.in ProcessUNIX.c 
Log Message:
ENH: merge in main tree for RC 6


Index: Process.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Process.h.in,v
retrieving revision 1.26
retrieving revision 1.26.50.1
diff -C 2 -d -r1.26 -r1.26.50.1
*** Process.h.in	3 Oct 2006 13:10:03 -0000	1.26
--- Process.h.in	2 Apr 2008 13:16:12 -0000	1.26.50.1
***************
*** 107,111 ****
  /**
   * Set the command line to be executed.  Argument is an array of
!  * pointers to the command and each argument.  Ths array must end with
   * a NULL pointer.  Any previous command lines are removed.  Returns
   * 1 for success and 0 otherwise.
--- 107,111 ----
  /**
   * Set the command line to be executed.  Argument is an array of
!  * pointers to the command and each argument.  The array must end with
   * a NULL pointer.  Any previous command lines are removed.  Returns
   * 1 for success and 0 otherwise.
***************
*** 116,120 ****
  /**
   * Add a command line to be executed.  Argument is an array of
!  * pointers to the command and each argument.  Ths array must end with
   * a NULL pointer.  If this is not the first command added, its
   * standard input will be connected to the standard output of the
--- 116,120 ----
  /**
   * Add a command line to be executed.  Argument is an array of
!  * pointers to the command and each argument.  The array must end with
   * a NULL pointer.  If this is not the first command added, its
   * standard input will be connected to the standard output of the

Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -C 2 -d -r1.71 -r1.71.2.1
*** ProcessUNIX.c	10 Jan 2008 23:32:38 -0000	1.71
--- ProcessUNIX.c	2 Apr 2008 13:16:14 -0000	1.71.2.1
***************
*** 2409,2413 ****
          if(ppid == process_id)
            {
!           /* Recursively kill this child aned its children.  */
            kwsysProcessKill(pid);
            }
--- 2409,2413 ----
          if(ppid == process_id)
            {
!           /* Recursively kill this child and its children.  */
            kwsysProcessKill(pid);
            }