===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ypmatch/ypmatch.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/ypmatch/ypmatch.c	2002/06/02 06:42:28	1.7
--- src/usr.bin/ypmatch/ypmatch.c	2002/07/19 03:22:39	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: ypmatch.c,v 1.7 2002/06/02 06:42:28 deraadt Exp $ */
  /*	$NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ypmatch.c,v 1.8 2002/07/19 03:22:39 deraadt Exp $ */
  /*	$NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $	*/
  
  /*
***************
*** 34,40 ****
   */
  
  #ifndef LINT
! static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.7 2002/06/02 06:42:28 deraadt Exp $";
  #endif
  
  #include <sys/param.h>
--- 34,40 ----
   */
  
  #ifndef LINT
! static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.8 2002/07/19 03:22:39 deraadt Exp $";
  #endif
  
  #include <sys/param.h>
***************
*** 64,70 ****
  };
  
  void
! usage()
  {
  	fprintf(stderr, "Usage:\n");
  	fprintf(stderr, "\typmatch [-d domain] [-t] [-k] key [key ...] mname\n");
--- 64,70 ----
  };
  
  void
! usage(void)
  {
  	fprintf(stderr, "Usage:\n");
  	fprintf(stderr, "\typmatch [-d domain] [-t] [-k] key [key ...] mname\n");
***************
*** 78,97 ****
  }
  
  int
! main(argc, argv)
! char **argv;
  {
! 	char *domainname;
! 	char *inkey, *inmap, *outbuf;
  	extern char *optarg;
  	extern int optind;
! 	int outbuflen, key, notrans;
  	int c, r, i;
- 	int rval;
  
  	domainname = NULL;
  	notrans = key = 0;
! 	while( (c=getopt(argc, argv, "xd:kt")) != -1)
  		switch (c) {
  		case 'x':
  			for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
--- 78,94 ----
  }
  
  int
! main(int argc, char *argv[])
  {
! 	char *domainname, *inkey, *inmap, *outbuf;
  	extern char *optarg;
  	extern int optind;
! 	int outbuflen, key, notrans, rval;
  	int c, r, i;
  
  	domainname = NULL;
  	notrans = key = 0;
! 	while ((c=getopt(argc, argv, "xd:kt")) != -1)
  		switch (c) {
  		case 'x':
  			for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
***************
*** 112,118 ****
  			usage();
  		}
  
! 	if( (argc-optind) < 2 )
  		usage();
  
  	if (!domainname) {
--- 109,115 ----
  			usage();
  		}
  
! 	if ((argc-optind) < 2 )
  		usage();
  
  	if (!domainname) {
***************
*** 122,128 ****
  	inmap = argv[argc-1];
  	if (!notrans) {
  		for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
! 			if( strcmp(inmap, ypaliases[i].alias) == 0)
  				inmap = ypaliases[i].name;
  	}
  
--- 119,125 ----
  	inmap = argv[argc-1];
  	if (!notrans) {
  		for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
! 			if (strcmp(inmap, ypaliases[i].alias) == 0)
  				inmap = ypaliases[i].name;
  	}
  
***************
*** 134,140 ****
  			strlen(inkey), &outbuf, &outbuflen);
  		switch (r) {
  		case 0:
! 			if(key)
  				printf("%s: ", inkey);
  			printf("%*.*s\n", outbuflen, outbuflen, outbuf);
  			break;
--- 131,137 ----
  			strlen(inkey), &outbuf, &outbuflen);
  		switch (r) {
  		case 0:
! 			if (key)
  				printf("%s: ", inkey);
  			printf("%*.*s\n", outbuflen, outbuflen, outbuf);
  			break;
***************
*** 143,149 ****
  			exit(1);
  		default:
  			fprintf(stderr, "Can't match key %s in map %s. Reason: %s\n",
! 				inkey, inmap, yperr_string(r));
  			rval = 1;
  			break;
  		}
--- 140,146 ----
  			exit(1);
  		default:
  			fprintf(stderr, "Can't match key %s in map %s. Reason: %s\n",
! 			    inkey, inmap, yperr_string(r));
  			rval = 1;
  			break;
  		}