Subject: Re: EGCS 1.1 UPDATE rev. 6 / brace patches for /usr/libexec
To: None <tech-toolchain@netbsd.org>
From: Erik Bertelsen <erik@mediator.uni-c.dk>
List: tech-toolchain
Date: 08/24/1998 22:22:06
Here are my patches to fix brace warnings in /usr/src/libexec on
my mac68k system -- two files are affected: rlogind.c and rmail.c.

regards,
Erik Bertelsen

Index: rlogind/rlogind.c
===================================================================
RCS file: /home/cvs-base/src/libexec/rlogind/rlogind.c,v
retrieving revision 1.1.1.5
diff -c -r1.1.1.5 rlogind.c
*** rlogind.c	1998/08/11 13:36:09	1.1.1.5
--- rlogind.c	1998/08/24 15:08:37
***************
*** 383,394 ****
  			omask = &obits;
  		} else
  			FD_SET(f, &ibits);
! 		if (pcc >= 0)
  			if (pcc) {
  				FD_SET(f, &obits);
  				omask = &obits;
  			} else
  				FD_SET(p, &ibits);
  		FD_SET(p, &ebits);
  		if ((n = select(nfd, &ibits, omask, &ebits, 0)) < 0) {
  			if (errno == EINTR)
--- 383,395 ----
  			omask = &obits;
  		} else
  			FD_SET(f, &ibits);
! 		if (pcc >= 0) {
  			if (pcc) {
  				FD_SET(f, &obits);
  				omask = &obits;
  			} else
  				FD_SET(p, &ibits);
+ 		}
  		FD_SET(p, &ebits);
  		if ((n = select(nfd, &ibits, omask, &ebits, 0)) < 0) {
  			if (errno == EINTR)
Index: rmail/rmail.c
===================================================================
RCS file: /home/cvs-base/src/libexec/rmail/rmail.c,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 rmail.c
*** rmail.c	1997/10/20 21:38:23	1.1.1.3
--- rmail.c	1998/08/24 15:11:22
***************
*** 164,170 ****
  			}
  
  		/* Else use the string up to the last bang. */
! 		if (p == NULL)
  			if (*addrp == '!')
  				err(EX_DATAERR,
  				    "bang starts address: %s", addrp);
--- 164,170 ----
  			}
  
  		/* Else use the string up to the last bang. */
! 		if (p == NULL) {
  			if (*addrp == '!')
  				err(EX_DATAERR,
  				    "bang starts address: %s", addrp);
***************
*** 178,183 ****
--- 178,184 ----
  				if (debug)
  					(void)fprintf(stderr, "bang: %s\n", p);
  			}
+ 		}
  
  		/* 'p' now points to any system string from this line. */
  		if (p != NULL) {