cdiff module < idtk/src/xlisp >
Master Directory  = /doc/MCS/idtk/src/xlisp
Working Directory = /doc/connolly/idtk/src/xlisp
	[almy21]          Revision 1.2        unixstuff.c
*** /tmp/,RCSt1028174	Wed Aug 19 18:45:55 1992
--- unixstuff.c	Wed Jul 29 16:12:24 1992
***************
*** 2,8 ****
  ********************************************************************************
  *
  * File:         unixstuff.c
! * RCS:          $Header: /doc/MCS/idtk/src/xlisp/unixstuff.c,v 1.2 92/07/20 19:22:12 connolly Exp $
  * Description:  UNIX-Specific interfaces for XLISP
  * Author:       David Michael Betz; Niels Mayer
  * Created:      
--- 2,8 ----
  ********************************************************************************
  *
  * File:         unixstuff.c
! * RCS:          $Header: /doc/MCS/idtk/src/xlisp/unixstuff.c,v 1.3 92/07/29 14:31:51 connolly Exp $
  * Description:  UNIX-Specific interfaces for XLISP
  * Author:       David Michael Betz; Niels Mayer
  * Created:      
***************
*** 39,45 ****
  *
  ********************************************************************************
  */
! static char rcs_identity[] = "@(#)$Header: /doc/MCS/idtk/src/xlisp/unixstuff.c,v 1.2 92/07/20 19:22:12 connolly Exp $";
  
  
  #include "xlisp.h"
--- 39,45 ----
  *
  ********************************************************************************
  */
! static char rcs_identity[] = "@(#)$Header: /doc/MCS/idtk/src/xlisp/unixstuff.c,v 1.3 92/07/29 14:31:51 connolly Exp $";
  
  
  #include "xlisp.h"
***************
*** 482,488 ****
  
  char	*banner;
  {
! 	printf("%s\n", banner );
  	lindex	= 0;
  	lcount	= 0;
  #ifdef KCW_INPUT
--- 482,488 ----
  
  char	*banner;
  {
! 	fprintf(stderr, "%s\n", banner );
  	lindex	= 0;
  	lcount	= 0;
  #ifdef KCW_INPUT
***************
*** 642,648 ****
  
  
  /* -- ossymbols - enter os-specific symbols */
! ossymbols()
  {
  }
  
--- 642,648 ----
  
  
  /* -- ossymbols - enter os-specific symbols */
! void ossymbols()
  {
  }
  
***************
*** 693,701 ****
  char read_keybd()
  {
     int nrd;
!    char buf[1];
  
!    nrd = read(0, buf, sizeof(buf)); /* NPM note: 0 == stdin fd */
     buf[nrd] = 0;
  
     if (buf[0] == 127) {		/* perform the BACKSPACE */
--- 693,701 ----
  char read_keybd()
  {
     int nrd;
!    char buf[2]; /* DWC add a char for null terminator */
  
!    nrd = read(0, buf, sizeof(buf)-1); /* NPM note: 0 == stdin fd */
     buf[nrd] = 0;
  
     if (buf[0] == 127) {		/* perform the BACKSPACE */
***************
*** 856,862 ****
    rdtm = (rtm > 0) ? rtm : -rtm;
    sprintf(buf, "CPU %.2f sec., Real %.2f sec.\n", dtm / ticks_per_second(),
                                              rdtm / ticks_per_second());
!   stdputstr(buf);
    return(result);
  }
  
--- 856,862 ----
    rdtm = (rtm > 0) ? rtm : -rtm;
    sprintf(buf, "CPU %.2f sec., Real %.2f sec.\n", dtm / ticks_per_second(),
                                              rdtm / ticks_per_second());
!   errputstr(buf); /* DWC: no noise on stdout */
    return(result);
  }
  
	[almy21]          Revision 1.2        xldmem.c
*** /tmp/,RCSt1028179	Wed Aug 19 18:45:56 1992
--- xldmem.c	Wed Jul 29 16:12:24 1992
***************
*** 438,444 ****
  	/* print the start of the gc message */
  	if (s_gcflag && getvalue(s_gcflag)) {
  		sprintf(buf,"[ gc: total %ld, ",nnodes);
! 		stdputstr(buf);
  	}
  
  	/* mark the obarray, the argument list and the current environment */
--- 438,444 ----
  	/* print the start of the gc message */
  	if (s_gcflag && getvalue(s_gcflag)) {
  		sprintf(buf,"[ gc: total %ld, ",nnodes);
! 		errputstr(buf); /* DWC: no noise on stdout */
  	}
  
  	/* mark the obarray, the argument list and the current environment */
***************
*** 482,488 ****
  	/* print the end of the gc message */
  	if (s_gcflag && getvalue(s_gcflag)) {
  		sprintf(buf,"%ld free ]\n",nfree);
! 		stdputstr(buf);
  	}
  }
  
--- 482,488 ----
  	/* print the end of the gc message */
  	if (s_gcflag && getvalue(s_gcflag)) {
  		sprintf(buf,"%ld free ]\n",nfree);
! 		errputstr(buf); /* DWC: no noise on stdout */
  	}
  }
  
***************
*** 877,883 ****
  		return (NIL);
  
  	/* return directly to the top level */
! 	stdputstr("[ returning to the top level ]\n");
  	longjmp(top_level,1);
  	return (NIL);	/* never executed, but avoids warning message */
  }
--- 877,883 ----
  		return (NIL);
  
  	/* return directly to the top level */
! 	errputstr("[ returning to the top level ]\n") ;/* DWC: no noise on stdout */
  	longjmp(top_level,1);
  	return (NIL);	/* never executed, but avoids warning message */
  }
	[almy21]          Revision 1.2        xlio.c
*** /tmp/,RCSt1028184	Wed Aug 19 18:45:56 1992
--- xlio.c	Wed Jul 29 16:12:25 1992
***************
*** 146,152 ****
  	/* otherwise, check for terminal output or file output */
  	else {
  		fp = getfile(fptr);
! 		if (fp == stdout || fp == stderr)
  			ostputc(ch);
  		else {
  #ifdef BETTERIO
--- 146,152 ----
  	/* otherwise, check for terminal output or file output */
  	else {
  		fp = getfile(fptr);
! 		if (fp == stdout) /* DWC: dont' mix stderr and stdout */
  			ostputc(ch);
  		else {
  #ifdef BETTERIO
	[almy21]          Revision 1.2        xlisp.c
*** /tmp/,RCSt1028189	Wed Aug 19 18:45:57 1992
--- xlisp.c	Wed Jul 29 16:12:25 1992
***************
*** 106,112 ****
  	if (transcript && (tfp = osaopen(transcript,"w")) == NULL) {
  		/* TAA Mod -- quote name so "-t foo" will indicate no file name */
  		sprintf(buf,"error: can't open transcript file: \"%s\"",transcript);
! 		stdputstr(buf);
  	}
  
  	/* load "init.lsp" */
--- 106,112 ----
  	if (transcript && (tfp = osaopen(transcript,"w")) == NULL) {
  		/* TAA Mod -- quote name so "-t foo" will indicate no file name */
  		sprintf(buf,"error: can't open transcript file: \"%s\"",transcript);
! 		errputstr(buf);
  	}
  
  	/* load "init.lsp" */
***************
*** 139,145 ****
  		}
  
  		/* print a prompt */
! 		stdputstr("> ");
  
  		/* read an expression */
  		if (!xlread(getvalue(s_stdin),&expr))
--- 139,145 ----
  		}
  
  		/* print a prompt */
! 		errputstr("> ");
  
  		/* read an expression */
  		if (!xlread(getvalue(s_stdin),&expr))
	[almy21]          Revision 1.2        xljump.c
*** /tmp/,RCSt1028194	Wed Aug 19 18:45:57 1992
--- xljump.c	Wed Jul 29 16:12:25 1992
***************
*** 109,115 ****
  /* xltoplevel - go back to the top level */
  VOID xltoplevel()
  {
! 	stdputstr("[ back to top level ]\n");
  	findandjump(CF_TOPLEVEL,"no top level");
  }
  
--- 109,115 ----
  /* xltoplevel - go back to the top level */
  VOID xltoplevel()
  {
! 	errputstr("[ back to top level ]\n"); /* DWC */
  	findandjump(CF_TOPLEVEL,"no top level");
  }
  
***************
*** 122,128 ****
  /* xlcleanup - clean-up after an error */
  VOID xlcleanup()
  {
! 	stdputstr("[ back to previous break level ]\n");
  	findandjump(CF_CLEANUP,"not in a break loop");
  }
  
--- 122,128 ----
  /* xlcleanup - clean-up after an error */
  VOID xlcleanup()
  {
! 	errputstr("[ back to previous break level ]\n"); /* DWC */
  	findandjump(CF_CLEANUP,"not in a break loop");
  }
  
	[almy21]          Revision 1.2        xlread.c
*** /tmp/,RCSt1028199	Wed Aug 19 18:45:58 1992
--- xlread.c	Wed Jul 29 16:12:25 1992
***************
*** 98,104 ****
  
  	/* print the information line */
  	if (vflag)
! 		{ sprintf(buf,"; loading \"%s\"\n",fname); stdputstr(buf); }
  
  	/* read, evaluate and possibly print each expression in the file */
  	xlbegin(&cntxt,CF_ERROR,true);
--- 98,104 ----
  
  	/* print the information line */
  	if (vflag)
! 		{ sprintf(buf,"; loading \"%s\"\n",fname); errputstr(buf); }
  
  	/* read, evaluate and possibly print each expression in the file */
  	xlbegin(&cntxt,CF_ERROR,true);
	[almy21]          Revision 1.1        xlseq.c
*** /tmp/,RCSt1028204	Wed Aug 19 18:45:59 1992
--- xlseq.c	Wed Jul 29 16:12:25 1992
***************
*** 815,821 ****
  	switch (ntype(seq)) {
  		case CONS:
  			for (; consp(seq); seq = cdr(seq)) {
! 				long s=start, l=end-start;
  				/* check to see if this element should be deleted */
  				/* force copy if count, as specified by end, is exhausted */
  				if (s-- > 0 || l-- <= 0 || 
--- 815,821 ----
  	switch (ntype(seq)) {
  		case CONS:
  			for (; consp(seq); seq = cdr(seq)) {
! 				unsigned long s=start, l=end-start;
  				/* check to see if this element should be deleted */
  				/* force copy if count, as specified by end, is exhausted */
  				if (s-- > 0 || l-- <= 0 ||