===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/patch.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/patch/patch.c	2003/07/31 14:10:21	1.33
--- src/usr.bin/patch/patch.c	2003/07/31 21:07:35	1.34
***************
*** 1,4 ****
! /*	$OpenBSD: patch.c,v 1.33 2003/07/31 14:10:21 otto Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
--- 1,4 ----
! /*	$OpenBSD: patch.c,v 1.34 2003/07/31 21:07:35 millert Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
***************
*** 27,33 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: patch.c,v 1.33 2003/07/31 14:10:21 otto Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 27,33 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: patch.c,v 1.34 2003/07/31 21:07:35 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 438,444 ****
  static void
  get_some_switches(void)
  {
! 	const char *options = "b::B:cCd:D:eEfF:i:lnNo:p::r:RstuvV:x:z:";
  	static struct option longopts[] = {
  		{"backup",		no_argument,		0,	'b'},
  		{"batch",		no_argument,		0,	't'},
--- 438,444 ----
  static void
  get_some_switches(void)
  {
! 	const char *options = "b::B:cCd:D:eEfF:i:lnNo:p:r:RstuvV:x:z:";
  	static struct option longopts[] = {
  		{"backup",		no_argument,		0,	'b'},
  		{"batch",		no_argument,		0,	't'},
***************
*** 461,467 ****
  		{"remove-empty-files",	no_argument,		0,	'E'},
  		{"reverse",		no_argument,		0,	'R'},
  		{"silent",		no_argument,		0,	's'},
! 		{"strip",		optional_argument,	0,	'p'},
  		{"suffix",		required_argument,	0,	'z'},
  		{"unified",		no_argument,		0,	'u'},
  		{"version",		no_argument,		0,	'v'},
--- 461,467 ----
  		{"remove-empty-files",	no_argument,		0,	'E'},
  		{"reverse",		no_argument,		0,	'R'},
  		{"silent",		no_argument,		0,	's'},
! 		{"strip",		required_argument,	0,	'p'},
  		{"suffix",		required_argument,	0,	'z'},
  		{"unified",		no_argument,		0,	'u'},
  		{"version",		no_argument,		0,	'v'},
***************
*** 547,553 ****
  			outname = savestr(optarg);
  			break;
  		case 'p':
! 			strippath = optarg ? atoi(optarg) : 0;
  			break;
  		case 'r':
  			if (strlcpy(rejname, optarg,
--- 547,553 ----
  			outname = savestr(optarg);
  			break;
  		case 'p':
! 			strippath = atoi(optarg);
  			break;
  		case 'r':
  			if (strlcpy(rejname, optarg,
***************
*** 603,609 ****
  {
  	fprintf(stderr,
  "usage: patch [-bcCeEflnNRstuv] [-B backup-prefix] [-d directory] [-D symbol]\n"
! "             [-Fmax-fuzz] [-i patchfile] [-o out-file] [-p[strip-count]]\n"
  "             [-r rej-name] [-V {numbered,existing,simple}] [-z backup-ext]\n"
  "             [origfile [patchfile]]\n");
  	my_exit(EXIT_SUCCESS);
--- 603,609 ----
  {
  	fprintf(stderr,
  "usage: patch [-bcCeEflnNRstuv] [-B backup-prefix] [-d directory] [-D symbol]\n"
! "             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]\n"
  "             [-r rej-name] [-V {numbered,existing,simple}] [-z backup-ext]\n"
  "             [origfile [patchfile]]\n");
  	my_exit(EXIT_SUCCESS);