Re: Win 98 support patch

[Paul Kienzle]

Paul Kienzle wrote:

> The attached patch removes some major inconveniences when running
> under Windows 9x.  Simple commands like ls or help would freeze
> the computer for 7 sec then give a series of dire warnings about
> each loaded oct-file. 


Oops...  I presumed to much about the
predefined preprocessor symbols.  The
__WIN32__ should be __CYGWIN32__
because __WIN32__ isn't defined


Paul Kienzle <address@hidden>
      * Makefile.in: don't need special system for cygwin
      * oct-procbuf.cc: use popen rather than fork/exec for WIN32


diff -cp octave-2.1.50-orig/src/Makefile.in octave-2.1.50/src/Makefile.in
*** octave-2.1.50-orig/src/Makefile.in  Wed May 28 16:10:28 2003
--- octave-2.1.50/src/Makefile.in       Fri Jul 25 02:28:26 2003
*************** DIST_SRC := Cell.cc c-file-ptr-stream.cc
*** 129,135 ****
        oct-strstrm.cc oct-lvalue.cc pager.cc parse.y \
        pr-output.cc procstream.cc sighandlers.cc \
        siglist.c strcasecmp.c strncase.c strfns.cc symtab.cc \
!       syscalls.cc sysdep.cc system.c token.cc toplev.cc \
        unwind-prot.cc utils.cc variables.cc xdiv.cc xpow.cc \
        $(OV_SRC) \
        $(PT_SRC)
--- 129,135 ----
        oct-strstrm.cc oct-lvalue.cc pager.cc parse.y \
        pr-output.cc procstream.cc sighandlers.cc \
        siglist.c strcasecmp.c strncase.c strfns.cc symtab.cc \
!       syscalls.cc sysdep.cc token.cc toplev.cc \
        unwind-prot.cc utils.cc variables.cc xdiv.cc xpow.cc \
        $(OV_SRC) \
        $(PT_SRC)
diff -cp octave-2.1.50-orig/src/oct-procbuf.cc octave-2.1.50/src/oct-procbuf.cc
*** octave-2.1.50-orig/src/oct-procbuf.cc       Thu Jan  2 17:55:58 2003
--- octave-2.1.50/src/oct-procbuf.cc    Fri Jul 25 06:53:14 2003
*************** static octave_procbuf *octave_procbuf_li
*** 56,62 ****
  octave_procbuf *
  octave_procbuf::open (const char *command, int mode)
  {
! #if defined (HAVE_SYS_WAIT_H)
  
    int pipe_fds[2];
  
--- 56,76 ----
  octave_procbuf *
  octave_procbuf::open (const char *command, int mode)
  {
! #if defined (__CYGWIN32__)
!   if (is_open()) 
!     return 0;
! 
!   f = popen(command, (mode & std::ios::in) ? "r" : "w");
!   if (!f)
!     return 0;
! 
!   // Oops... popen doesn't return the associated pid, so fake it for now
!   proc_pid = 1;
!   open_p = true;
!   if (mode & std::ios::out) ::setvbuf (f, 0, _IOLBF, 0);
!   return this;
!   
! #elif defined (HAVE_SYS_WAIT_H)
  
    int pipe_fds[2];
  
*************** octave_procbuf::open (const char *comman
*** 144,150 ****
  octave_procbuf *
  octave_procbuf::close (void)
  {
! #if defined (HAVE_SYS_WAIT_H)
  
    if (f)
      {
--- 158,172 ----
  octave_procbuf *
  octave_procbuf::close (void)
  {
! #if defined (__CYGWIN32__)
!   if (f) {
!     wstatus = ::pclose(f);
!     f = 0;
!   }
!   open_p = false;
!   return this;
!   
! #elif defined (HAVE_SYS_WAIT_H)
  
    if (f)
      {