[Cmake-commits] [cmake-commits] hoffman committed ProcessUNIX.c 1.87.4.1 1.87.4.2 SystemTools.cxx 1.252.2.1 1.252.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	ProcessUNIX.c SystemTools.cxx 
Log Message:
RC 4 merge


Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.87.4.1
retrieving revision 1.87.4.2
diff -C 2 -d -r1.87.4.1 -r1.87.4.2
*** ProcessUNIX.c	1 Oct 2009 21:21:18 -0000	1.87.4.1
--- ProcessUNIX.c	28 Oct 2009 16:15:42 -0000	1.87.4.2
***************
*** 1922,1926 ****
    /* The first time this is called, we need to calculate the time at
       which the child will timeout.  */
!   if(cp->Timeout && cp->TimeoutTime.tv_sec < 0)
      {
      kwsysProcessTime length = kwsysProcessTimeFromDouble(cp->Timeout);
--- 1922,1926 ----
    /* The first time this is called, we need to calculate the time at
       which the child will timeout.  */
!   if(cp->Timeout > 0 && cp->TimeoutTime.tv_sec < 0)
      {
      kwsysProcessTime length = kwsysProcessTimeFromDouble(cp->Timeout);
***************
*** 2711,2715 ****
        read(cp->PipeReadEnds[KWSYSPE_PIPE_SIGNAL], &buf, 1);
      status=write(cp->SignalPipe, &buf, 1);
!     
      }
    }
--- 2711,2715 ----
        read(cp->PipeReadEnds[KWSYSPE_PIPE_SIGNAL], &buf, 1);
      status=write(cp->SignalPipe, &buf, 1);
!     (void)status;
      }
    }

Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.252.2.1
retrieving revision 1.252.2.2
diff -C 2 -d -r1.252.2.1 -r1.252.2.2
*** SystemTools.cxx	1 Oct 2009 21:21:19 -0000	1.252.2.1
--- SystemTools.cxx	28 Oct 2009 16:15:42 -0000	1.252.2.2
***************
*** 3960,3964 ****
  
    long leftToRead = sizeLimit;
!   
    // If no characters are read from the stream, the end of file has
    // been reached.  Clear the fail bit just before reading.
--- 3960,3977 ----
  
    long leftToRead = sizeLimit;
! 
!   // Early short circuit return if stream is no good. Just return
!   // false and the empty line. (Probably means caller tried to
!   // create a file stream with a non-existent file name...)
!   //
!   if(!is)
!     {
!     if(has_newline)
!       {
!       *has_newline = false;
!       }
!     return false;
!     }
! 
    // If no characters are read from the stream, the end of file has
    // been reached.  Clear the fail bit just before reading.