BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / makekey / makekey.c

diff --git a/usr/src/libexec/makekey/makekey.c b/usr/src/libexec/makekey/makekey.c
index 445fe96..1a2e149 100644 (file)
--- a/usr/src/libexec/makekey/makekey.c
+++ b/usr/src/libexec/makekey/makekey.c
@@ -1,35 +1,85 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1990 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)makekey.c  5.1 (Berkeley) 6/6/85";
-#endif not lint
-
-/*
- * You send it 10 bytes.
- * It sends you 13 bytes.
- * The transformation is expensive to perform
- * (a significant part of a second).
- */
+static char sccsid[] = "@(#)makekey.c  5.3 (Berkeley) 2/25/91";
+#endif /* not lint */
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 
 

-char   *crypt();
+static void error(), get();

 
 main()
 {
 
 main()
 {

-       char key[8];
-       char salt[2];
+       int len;
+       char *r, key[9], salt[3];

        
        

-       read(0, key, 8);
-       read(0, salt, 2);
-       write(1, crypt(key, salt), 13);
-       return(0);
+       get(key, sizeof(key) - 1);
+       get(salt, sizeof(salt) - 1);
+       len = strlen(r = crypt(key, salt));
+       if (write(STDOUT_FILENO, r, len) != len)
+               error();
+       exit(0);
+}
+
+static void
+get(bp, len)
+       char *bp;
+       register int len;
+{
+       register int nr;
+
+       bp[len] = '\0';
+       if ((nr = read(STDIN_FILENO, bp, len)) == len)
+               return;
+       if (nr >= 0)
+               errno = EFTYPE;
+       error();
+}
+
+static void
+error()
+{
+       (void)fprintf(stderr, "makekey: %s\n", strerror(errno));
+       exit(1);

 }
 }