===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/strip/Attic/strip.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/strip/Attic/strip.c	2010/05/24 23:42:39	1.28
--- src/usr.bin/strip/Attic/strip.c	2010/06/01 21:44:39	1.29
***************
*** 1,4 ****
! /*	$OpenBSD: strip.c,v 1.28 2010/05/24 23:42:39 jmc Exp $	*/
  
  /*
   * Copyright (c) 1988 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: strip.c,v 1.29 2010/06/01 21:44:39 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1988 Regents of the University of California.
***************
*** 83,96 ****
  	off_t newsize;
  
  	sfcn = s_sym;
! 	while ((ch = getopt(argc, argv, "dxo:")) != -1)
  		switch(ch) {
  		case 'x':
  			xflag = 1;
  			/*FALLTHROUGH*/
  		case 'd':
  			sfcn = s_stab;
  			break;
  		case 'o':
  			ofile = optarg;
  			break;
--- 83,102 ----
  	off_t newsize;
  
  	sfcn = s_sym;
! 	while ((ch = getopt(argc, argv, "dgsxo:")) != -1)
  		switch(ch) {
  		case 'x':
  			xflag = 1;
  			/*FALLTHROUGH*/
+ 		case 'g':
  		case 'd':
  			sfcn = s_stab;
  			break;
+ 		case 's':
+ 			/* reset back to the defaults */
+ 			xflag = 0;
+ 			sfcn = s_sym;
+ 			break;
  		case 'o':
  			ofile = optarg;
  			break;
***************
*** 427,433 ****
  {
  	extern char *__progname;
  
! 	fprintf(stderr, "usage: %s [-dx] [-o outfile] file ...\n", __progname);
  	exit(1);
  }
  
--- 433,440 ----
  {
  	extern char *__progname;
  
! 	fprintf(stderr, "usage: %s [-dgsx] [-o outfile] file ...\n",
! 	    __progname);
  	exit(1);
  }