Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!utgpu!water!watmath!clyde!cbosgd!ihnp4!ptsfa!ames!cit-vax!oberon!sdcrdcf!psivax!csun!aeusemrs
From: aeusemrs@csun.UUCP
Newsgroups: comp.os.minix
Subject: Re: Making context diffs - cdiff
Message-ID: <629@csun.UUCP>
Date: Tue, 2-Jun-87 22:05:39 EDT
Article-I.D.: csun.629
Posted: Tue Jun  2 22:05:39 1987
Date-Received: Sat, 6-Jun-87 04:56:19 EDT
References: <4663@sdcrdcf.UUCP>
Reply-To: aeusemrs@csun.UUCP (Mike Stump)
Distribution: world
Organization: California State University, Northridge
Lines: 74


Larry, I am having a little problem with your cdiff program.  We are
on a 3b5, System V R2.0, using the normal diff, everything works
fine. But I compiled your program, and it doesn't produce coherent output.
Is there a problem with the output format of our diff, or with cdiff?

$ diff /tmp/ojove.c /tmp/jove.c
370a371,372
> #ifdef SYSV
>   int proc_child();
371a374,375
>   signal(SIGCHLD, SIG_DFL);
> #else SYSV
374a379
> #endif SYSV
380a386
> #ifndef SYSV
383a390
> #endif SYSV
391a399,401
> #ifdef SYSV
>   signal(SIGCHLD, proc_child);
> #else SYSV
394a405
> #endif SYSV
401c412
< int    OKXonXoff = 0,     /* ^S and ^Q initially DON'T work */
---
> int    OKXonXoff = 1,     /* ^S and ^Q initially DON'T work */
499a511,512
>   if (OKXonXoff)
>       sg2.c_iflag &= ~IXON; /* disable tty xon/xoff processing */
$ cdiff /tmp/ojove.c /tmp/jove.c
*** /tmp/ojove.c	Tue Jun  2 18:35:52 1987
--- /tmp/jove.c	Tue Jun  2 18:35:27 1987
***************
*** 368,374 ****
--- 368,378 ----
    int pid,
            (*old_int)() = signal(SIGINT, SIG_IGN),
        (*old_quit)() = signal(SIGQUIT, SIG_IGN);
+ #ifdef SYSV
+   int proc_child();

+   signal(SIGCHLD, SIG_DFL);
+ #else SYSV
  #ifdef IPROCS
    sighold(SIGCHLD);
  #endif
***************
*** 371 ****
--- 375 ----
***************
*** 377 ****
--- 382 ----
***************
*** 380 ****
--- 386 ----
***************
*** 388 ****
--- 395 ----
***************
*** 391 ****
--- 401 ----
***************
*** 397 ****
--- 408 ----
***************
*** 496 ****
--- 507 ----
$ exit
-- 
Mike Stump, Cal State Univ, Northridge Comp Sci Department
uucp: {sdcrdcf, ihnp4, hplabs, ttidca, psivax, csustan}!csun!aeusemrs