===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffdir.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/diff/diffdir.c	2015/09/25 16:16:26	1.44
--- src/usr.bin/diff/diffdir.c	2015/10/05 20:15:00	1.45
***************
*** 1,4 ****
! /*	$OpenBSD: diffdir.c,v 1.44 2015/09/25 16:16:26 tedu Exp $	*/
  
  /*
   * Copyright (c) 2003, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: diffdir.c,v 1.45 2015/10/05 20:15:00 millert Exp $	*/
  
  /*
   * Copyright (c) 2003, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 132,139 ****
  			if (Nflag)
  				diffit(dent1, path1, dirlen1, path2, dirlen2,
  				    flags);
- 			else if (lflag)
- 				dent1->d_status |= D_ONLY;
  			else
  				print_only(path1, dirlen1, dent1->d_name);
  			dp1++;
--- 132,137 ----
***************
*** 142,167 ****
  			if (Nflag || Pflag)
  				diffit(dent2, path1, dirlen1, path2, dirlen2,
  				    flags);
- 			else if (lflag)
- 				dent2->d_status |= D_ONLY;
  			else
  				print_only(path2, dirlen2, dent2->d_name);
  			dp2++;
  		}
  	}
- 	if (lflag) {
- 		path1[dirlen1] = '\0';
- 		path2[dirlen2] = '\0';
- 		for (dp1 = dirp1; (dent1 = *dp1) != NULL; dp1++) {
- 			print_status(dent1->d_status, path1, path2,
- 			    dent1->d_name);
- 		}
- 		for (dp2 = dirp2; (dent2 = *dp2) != NULL; dp2++) {
- 			if (dent2->d_status == D_ONLY)
- 				print_status(dent2->d_status, path2, NULL,
- 				    dent2->d_name);
- 		}
- 	}
  
  closem:
  	if (dirp1 != NULL) {
--- 140,150 ----
***************
*** 210,217 ****
  	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
  		if (rflag)
  			diffdir(path1, path2, flags);
- 		else if (lflag)
- 			dp->d_status |= D_COMMON;
  		else
  			printf("Common subdirectories: %s and %s\n",
  			    path1, path2);
--- 193,198 ----
***************
*** 223,230 ****
  		dp->d_status = D_SKIPPED2;
  	else
  		dp->d_status = diffreg(path1, path2, flags);
! 	if (!lflag)
! 		print_status(dp->d_status, path1, path2, "");
  }
  
  /*
--- 204,210 ----
  		dp->d_status = D_SKIPPED2;
  	else
  		dp->d_status = diffreg(path1, path2, flags);
! 	print_status(dp->d_status, path1, path2, "");
  }
  
  /*