===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/units/units.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/units/units.c	2011/10/07 20:07:25	1.17
--- src/usr.bin/units/units.c	2013/01/04 19:31:28	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: units.c,v 1.17 2011/10/07 20:07:25 jmc Exp $	*/
  /*	$NetBSD: units.c,v 1.6 1996/04/06 06:01:03 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: units.c,v 1.18 2013/01/04 19:31:28 jmc Exp $	*/
  /*	$NetBSD: units.c,v 1.6 1996/04/06 06:01:03 thorpej Exp $	*/
  
  /*
***************
*** 612,618 ****
  usage(void)
  {
  	fprintf(stderr,
! 	    "usage: units [-qv] [-f filename] [from-unit to-unit]\n");
  	exit(3);
  }
  
--- 612,618 ----
  usage(void)
  {
  	fprintf(stderr,
! 	    "usage: units [-qv] [-f filename] [[count] from-unit to-unit]\n");
  	exit(3);
  }
  
***************
*** 651,664 ****
  		}
  	}
  
! 	if (optind != argc - 2 && optind != argc)
  		usage();
  
  	readunits(userfile);
  
! 	if (optind == argc - 2) {
! 		strlcpy(havestr, argv[optind], sizeof(havestr));
! 		strlcpy(wantstr, argv[optind + 1], sizeof(wantstr));
  		initializeunit(&have);
  		addunit(&have, havestr, 0);
  		completereduce(&have);
--- 651,676 ----
  		}
  	}
  
! 	argc -= optind;
! 	argv += optind;
! 
! 	if (argc != 3 && argc != 2 && argc != 0)
  		usage();
  
  	readunits(userfile);
  
! 	if (argc == 3) {
! 		strlcpy(havestr, argv[0], sizeof(havestr));
! 		strlcat(havestr, " ", sizeof(havestr));
! 		strlcat(havestr, argv[1], sizeof(havestr));
! 		argc--;
! 		argv++;
! 		argv[0] = havestr;
! 	}
! 
! 	if (argc == 2) {
! 		strlcpy(havestr, argv[0], sizeof(havestr));
! 		strlcpy(wantstr, argv[1], sizeof(wantstr));
  		initializeunit(&have);
  		addunit(&have, havestr, 0);
  		completereduce(&have);