===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/cmd3.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/mail/cmd3.c	1997/07/30 07:19:30	1.9
--- src/usr.bin/mail/cmd3.c	1997/11/14 00:23:44	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: cmd3.c,v 1.9 1997/07/30 07:19:30 millert Exp $	*/
  /*	$NetBSD: cmd3.c,v 1.8 1997/07/09 05:29:49 mikel Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: cmd3.c,v 1.10 1997/11/14 00:23:44 millert Exp $	*/
  /*	$NetBSD: cmd3.c,v 1.8 1997/07/09 05:29:49 mikel Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)cmd3.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: cmd3.c,v 1.9 1997/07/30 07:19:30 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)cmd3.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: cmd3.c,v 1.10 1997/11/14 00:23:44 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 107,115 ****
  {
  	char bangbuf[BUFSIZ];
  	static char lastbang[BUFSIZ];
! 	register char *cp, *cp2;
! 	register int n;
! 	int changed = 0;
  
  	cp = str;
  	cp2 = bangbuf;
--- 107,114 ----
  {
  	char bangbuf[BUFSIZ];
  	static char lastbang[BUFSIZ];
! 	char *cp, *cp2;
! 	int n, changed = 0;
  
  	cp = str;
  	cp2 = bangbuf;
***************
*** 160,167 ****
  help(v)
  	void *v;
  {
! 	register c;
! 	register FILE *f;
  
  	if ((f = Fopen(_PATH_HELP, "r")) == NULL) {
  		warn(_PATH_HELP);
--- 159,166 ----
  help(v)
  	void *v;
  {
! 	int c;
! 	FILE *f;
  
  	if ((f = Fopen(_PATH_HELP, "r")) == NULL) {
  		warn(_PATH_HELP);
***************
*** 276,282 ****
   */
  char *
  reedit(subj)
! 	register char *subj;
  {
  	char *newsubj;
  
--- 275,281 ----
   */
  char *
  reedit(subj)
! 	char *subj;
  {
  	char *newsubj;
  
***************
*** 301,308 ****
  	void *v;
  {
  	int *msgvec = v;
! 	register struct message *mp;
! 	register int *ip, mesg;
  
  	if (edit) {
  		puts("Cannot \"preserve\" in edit mode");
--- 300,307 ----
  	void *v;
  {
  	int *msgvec = v;
! 	int *ip, mesg;
! 	struct message *mp;
  
  	if (edit) {
  		puts("Cannot \"preserve\" in edit mode");
***************
*** 326,332 ****
  	void *v;
  {
  	int	*msgvec = v;
! 	register int *ip;
  
  	for (ip = msgvec; *ip != NULL; ip++) {
  		dot = &message[*ip-1];
--- 325,331 ----
  	void *v;
  {
  	int	*msgvec = v;
! 	int *ip;
  
  	for (ip = msgvec; *ip != NULL; ip++) {
  		dot = &message[*ip-1];
***************
*** 344,351 ****
  	void *v;
  {
  	int *msgvec = v;
! 	register struct message *mp;
! 	register int *ip, mesg;
  
  	for (ip = msgvec; *ip != NULL; ip++) {
  		mesg = *ip;
--- 343,350 ----
  	void *v;
  {
  	int *msgvec = v;
! 	struct message *mp;
! 	int *ip, mesg;
  
  	for (ip = msgvec; *ip != NULL; ip++) {
  		mesg = *ip;
***************
*** 378,385 ****
  	void *v;
  {
  	char **arglist = v;
! 	register struct var *vp;
! 	register char *cp, *cp2;
  	char varbuf[BUFSIZ], **ap, **p;
  	int errs, h, s;
  
--- 377,384 ----
  	void *v;
  {
  	char **arglist = v;
! 	struct var *vp;
! 	char *cp, *cp2;
  	char varbuf[BUFSIZ], **ap, **p;
  	int errs, h, s;
  
***************
*** 426,432 ****
  	void *v;
  {
  	char **arglist = v;
! 	register struct var *vp, *vp2;
  	int errs, h;
  	char **ap;
  
--- 425,431 ----
  	void *v;
  {
  	char **arglist = v;
! 	struct var *vp, *vp2;
  	int errs, h;
  	char **ap;
  
***************
*** 465,475 ****
  	void *v;
  {
  	char **argv = v;
! 	register struct grouphead *gh;
! 	register struct group *gp;
! 	register int h;
! 	int s;
  	char **ap, *gname, **p;
  
  	if (*argv == NULL) {
  		for (h = 0, s = 1; h < HSHSIZE; h++)
--- 464,473 ----
  	void *v;
  {
  	char **argv = v;
! 	struct grouphead *gh;
! 	struct group *gp;
  	char **ap, *gname, **p;
+ 	int h, s;
  
  	if (*argv == NULL) {
  		for (h = 0, s = 1; h < HSHSIZE; h++)
***************
*** 522,528 ****
  sort(list)
  	char **list;
  {
! 	register char **ap;
  
  	for (ap = list; *ap != NULL; ap++)
  		;
--- 520,526 ----
  sort(list)
  	char **list;
  {
! 	char **ap;
  
  	for (ap = list; *ap != NULL; ap++)
  		;
***************
*** 582,589 ****
  	void *v;
  {
  	char **argv = v;
! 	register char **ap;
! 	register char *cp;
  
  	for (ap = argv; *ap != NULL; ap++) {
  		cp = *ap;
--- 580,586 ----
  	void *v;
  {
  	char **argv = v;
! 	char **ap, *cp;
  
  	for (ap = argv; *ap != NULL; ap++) {
  		cp = *ap;
***************
*** 619,626 ****
  {
  	struct header head;
  	struct message *mp;
! 	register int *ap;
! 	register char *cp;
  
  	head.h_to = NIL;
  	for (ap = msgvec; *ap != 0; ap++) {
--- 616,623 ----
  {
  	struct header head;
  	struct message *mp;
! 	int *ap;
! 	char *cp;
  
  	head.h_to = NIL;
  	for (ap = msgvec; *ap != 0; ap++) {
***************
*** 653,659 ****
  	void *v;
  {
  	char **argv = v;
! 	register char *cp;
  
  	if (cond != CANY) {
  		puts("Illegal nested \"if\"");
--- 650,656 ----
  	void *v;
  {
  	char **argv = v;
! 	char *cp;
  
  	if (cond != CANY) {
  		puts("Illegal nested \"if\"");
***************
*** 731,738 ****
  	void *v;
  {
  	char **namelist = v;
! 	register int c;
! 	register char **ap, **ap2, *cp;
  
  	c = argcount(namelist) + 1;
  	if (c == 1) {
--- 728,735 ----
  	void *v;
  {
  	char **namelist = v;
! 	char **ap, **ap2, *cp;
! 	int c;
  
  	c = argcount(namelist) + 1;
  	if (c == 1) {