===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/sdiff/sdiff.c	2005/12/27 04:18:07	1.3
--- src/usr.bin/sdiff/sdiff.c	2005/12/27 04:28:08	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: sdiff.c,v 1.3 2005/12/27 04:18:07 tedu Exp $ */
  
  /*
   * Written by Raymond Lai <ray@cyth.net>.
--- 1,4 ----
! /*	$OpenBSD: sdiff.c,v 1.4 2005/12/27 04:28:08 tedu Exp $ */
  
  /*
   * Written by Raymond Lai <ray@cyth.net>.
***************
*** 93,99 ****
  	const char *cmd, **diffargv, *diffprog;
  
  	/* Initialize variables. */
- 	Dflag = lflag = sflag = 0;
  	diffargc = 0;
  	diffprog = "diff";
  	outfile = NULL;
--- 93,98 ----
***************
*** 141,147 ****
  			diffargv[diffargc++] = "-E";
  			break;
  		case 'F':
! 			diffprog = optarg;
  			break;
  		case 'H':
  			diffargv[diffargc++] = "-H";
--- 140,146 ----
  			diffargv[diffargc++] = "-E";
  			break;
  		case 'F':
! 			diffargv[0] = diffprog = optarg;
  			break;
  		case 'H':
  			diffargv[diffargc++] = "-H";
***************
*** 183,194 ****
  			/* NOTREACHED */
  		}
  
- 		/* Don't exceed buffer after adding file1, file2, and NULL. */
- 		assert(diffargc + 3 <= argc_max);
  	}
  	argc -= optind;
  	argv += optind;
  
  	/* file1 */
  	diffargv[diffargc++] = argv[0];
  	/* file2 */
--- 182,196 ----
  			/* NOTREACHED */
  		}
  
  	}
  	argc -= optind;
  	argv += optind;
  
+ 	if (argc != 2) {
+ 		usage();
+ 		/* NOTREACHED */
+ 	}
+ 
  	/* file1 */
  	diffargv[diffargc++] = argv[0];
  	/* file2 */
***************
*** 204,214 ****
  	if (width > (SIZE_T_MAX - 3) / 2)
  		errx(2, "width is too large: %zu", width);
  	line_width = width * 2 + 3;
- 
- 	if (argc != 2) {
- 		usage();
- 		/* NOTREACHED */
- 	}
  
  	if (pipe(fd))
  		err(2, "pipe");
--- 206,211 ----