comparison src/process.c @ 267:966663fcf606 r20-5b32

Import from CVS: tag r20-5b32
author cvs
date Mon, 13 Aug 2007 10:26:29 +0200
parents 727739f917cb
children c5d627a313b1
comparison
equal deleted inserted replaced
266:18d185df8c54 267:966663fcf606
1748 if (! EQ (XPROCESS (proc)->status_symbol, Qrun)) 1748 if (! EQ (XPROCESS (proc)->status_symbol, Qrun))
1749 error ("Process %s not running", XSTRING_DATA (XPROCESS (proc)->name)); 1749 error ("Process %s not running", XSTRING_DATA (XPROCESS (proc)->name));
1750 1750
1751 if (!MAYBE_INT_PROCMETH (process_send_eof, (proc))) 1751 if (!MAYBE_INT_PROCMETH (process_send_eof, (proc)))
1752 { 1752 {
1753 event_stream_delete_stream_pair (Qnil, XPROCESS (proc)->pipe_outstream); 1753 if (!NILP (DATA_OUTSTREAM (XPROCESS (proc))))
1754 XPROCESS (proc)->pipe_outstream = Qnil; 1754 {
1755 Lstream_close (XLSTREAM (DATA_OUTSTREAM (XPROCESS (proc))));
1756 event_stream_delete_stream_pair (Qnil, XPROCESS (proc)->pipe_outstream);
1757 XPROCESS (proc)->pipe_outstream = Qnil;
1755 #ifdef FILE_CODING 1758 #ifdef FILE_CODING
1756 XPROCESS (proc)->coding_outstream = Qnil; 1759 XPROCESS (proc)->coding_outstream = Qnil;
1757 #endif 1760 #endif
1761 }
1758 } 1762 }
1759 1763
1760 return process; 1764 return process;
1761 } 1765 }
1762 1766
1778 the process is selected for input. */ 1782 the process is selected for input. */
1779 /* #### The comment does not look correct. event_stream_unselect_process 1783 /* #### The comment does not look correct. event_stream_unselect_process
1780 is guarded by process->selected, so this is not a problem. - kkm*/ 1784 is guarded by process->selected, so this is not a problem. - kkm*/
1781 /* Must call this before setting the streams to nil */ 1785 /* Must call this before setting the streams to nil */
1782 event_stream_unselect_process (p); 1786 event_stream_unselect_process (p);
1787
1788 if (!NILP (DATA_OUTSTREAM (p)))
1789 Lstream_close (XLSTREAM (DATA_OUTSTREAM (p)));
1790 if (!NILP (DATA_INSTREAM (p)))
1791 Lstream_close (XLSTREAM (DATA_INSTREAM (p)));
1783 1792
1784 /* Provide minimal implementation for deactivate_process 1793 /* Provide minimal implementation for deactivate_process
1785 if there's no process-specific one */ 1794 if there's no process-specific one */
1786 if (HAS_PROCMETH_P (deactivate_process)) 1795 if (HAS_PROCMETH_P (deactivate_process))
1787 usid = PROCMETH (deactivate_process, (p)); 1796 usid = PROCMETH (deactivate_process, (p));