===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/join/join.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/join/join.c	2015/01/16 06:40:08	1.24
--- src/usr.bin/join/join.c	2015/07/21 04:42:59	1.25
***************
*** 1,4 ****
! /* $OpenBSD: join.c,v 1.24 2015/01/16 06:40:08 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1991, 1993, 1994
--- 1,4 ----
! /* $OpenBSD: join.c,v 1.25 2015/07/21 04:42:59 jasper Exp $	*/
  
  /*-
   * Copyright (c) 1991, 1993, 1994
***************
*** 235,241 ****
  				joinlines(F1, NULL);
  				slurp(F1);
  			}
! 			else if (cval < 0)	
  				/* File 1 takes the lead... */
  				slurp(F1);
  			if (F2->unpair
--- 235,241 ----
  				joinlines(F1, NULL);
  				slurp(F1);
  			}
! 			else if (cval < 0)
  				/* File 1 takes the lead... */
  				slurp(F1);
  			if (F2->unpair
***************
*** 275,281 ****
  
  	if (F->set == NULL) {
  		fpos = 0;
! 		cfieldc = 0;	
  	}
  	else {
  		fpos = F->set->fpos;
--- 275,281 ----
  
  	if (F->set == NULL) {
  		fpos = 0;
! 		cfieldc = 0;
  	}
  	else {
  		fpos = F->set->fpos;
***************
*** 286,292 ****
  		return;
  	else if (fpos != F->set->fpos)
  		F->set->cfieldc = cfieldc+1;
! }	
  
  void
  slurpit(INPUT *F)
--- 286,292 ----
  		return;
  	else if (fpos != F->set->fpos)
  		F->set->cfieldc = cfieldc+1;
! }
  
  void
  slurpit(INPUT *F)
***************
*** 565,571 ****
  			continue;
  		switch (ap[1]) {
  		case 'a':
! 			/* 
  			 * The original join allowed "-a", which meant the
  			 * same as -a1 plus -a2.  POSIX 1003.2, Draft 11.2
  			 * only specifies this as "-a 1" and "a -2", so we
--- 565,571 ----
  			continue;
  		switch (ap[1]) {
  		case 'a':
! 			/*
  			 * The original join allowed "-a", which meant the
  			 * same as -a1 plus -a2.  POSIX 1003.2, Draft 11.2
  			 * only specifies this as "-a 1" and "a -2", so we