Date:	Tue, 24 Sep 1996 14:48:24 +0200 (IST)
From:	Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>
To:	djgpp-workers AT delorie DOT com
Subject:	`sdiff' patch
Message-Id:	<Pine.SUN.3.91.960924144619.11882I-100000@is>
Mime-Version:	1.0

Without the following patch, you cannot interactively compare and merge 
two versions suing `sdiff'.

*** gnu/difutils.271/sdiff.c~1	Sat Sep 23 16:04:00 1995
--- gnu/difutils.271/sdiff.c	Fri Sep  6 18:33:58 1996
*************** edit (left, lenl, right, lenr, outfile)
*** 961,967 ****
--- 961,970 ----
  #if ! HAVE_FORK
  	      char *command = xmalloc (strlen (edbin) + strlen (tmpname) + 2);
  	      sprintf (command, "%s %s", edbin, tmpname);
+ 	      ignore_SIGINT = 1;
+ 	      ck_fclose (tmp);
  	      wstatus = system (command);
+ 	      tmp = ck_fopen (tmpname, "r");
  	      free (command);
  #else /* HAVE_FORK */
  	      pid_t pid;
*************** edit (left, lenl, right, lenr, outfile)
*** 994,1001 ****
  		else
  		  perror_fatal ("waitpid");
  
- 	      ignore_SIGINT = 0;
  #endif /* HAVE_FORK */
  
  	      if (wstatus != 0)
  		fatal ("subsidiary program failed");
--- 997,1004 ----
  		else
  		  perror_fatal ("waitpid");
  
  #endif /* HAVE_FORK */
+ 	      ignore_SIGINT = 0;
  
  	      if (wstatus != 0)
  		fatal ("subsidiary program failed");

- Raw text -