mv notrans out of loop and change my name

diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index ff166e5..c72e715 100644 (file)
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,5 +1,7 @@
+/*     $OpenBSD: ypcat.c,v 1.3 1996/05/05 16:19:31 deraadt Exp $ */
+
 /*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
+ * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +33,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: ypcat.c,v 1.2 1996/04/24 21:40:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypcat.c,v 1.3 1996/05/05 16:19:31 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -124,9 +126,11 @@ char **argv;
                usage();
 
        inmap = argv[optind];
-       for(i=0; (!notrans) && i<sizeof ypaliases/sizeof ypaliases[0]; i++)
-               if( strcmp(inmap, ypaliases[i].alias) == 0)
-                       inmap = ypaliases[i].name;
+       if (!notrans) {
+               for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+                       if( strcmp(inmap, ypaliases[i].alias) == 0)
+                               inmap = ypaliases[i].name;
+       }
        ypcb.foreach = printit;
        ypcb.data = NULL;
 

diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 534b7a6..4d516ab 100644 (file)
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,7 +1,8 @@
-/*     $NetBSD: ypmatch.c,v 1.5 1994/12/24 16:56:47 cgd Exp $  */
+/*     $OpenBSD: ypmatch.c,v 1.3 1996/05/05 16:19:36 deraadt Exp $ */
+/*     $NetBSD: ypmatch.c,v 1.6 1996/04/30 22:58:31 jtc Exp $  */
 
 /*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
+ * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +34,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: ypmatch.c,v 1.5 1994/12/24 16:56:47 cgd Exp $";
+static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.3 1996/05/05 16:19:36 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -113,9 +114,11 @@ char **argv;
                usage();
 
        inmap = argv[argc-1];
-       for(i=0; (!notrans) && i<sizeof ypaliases/sizeof ypaliases[0]; i++)
-               if( strcmp(inmap, ypaliases[i].alias) == 0)
-                       inmap = ypaliases[i].name;
+       if (!notrans) {
+               for(i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+                       if( strcmp(inmap, ypaliases[i].alias) == 0)
+                               inmap = ypaliases[i].name;
+       }
        for(; optind < argc-1; optind++) {
                inkey = argv[optind];