Slightly cleaner.

2 files changed, 27 insertions, 9 deletions

diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index ec8d06c26b3..d0a82d5fb23 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: encrypt.1,v 1.2 1996/08/08 02:10:20 downsj Exp $
+.\"	$OpenBSD: encrypt.1,v 1.3 1996/08/08 04:37:01 downsj Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
 .\"
@@ -58,6 +58,10 @@ is specified,
 reads one string per line from standard input, encrypting each one with
 the same
 .Ar salt .
+Specifing the 
+.Ar string
+on the command line should be discouraged; using the
+standard input is more secure.
 .Sh SEE ALSO
 .Xr crypt 3 ,
 .Xr adduser 8
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c
index ac593c38ae4..9fa98117bae 100644
--- a/usr.bin/encrypt/encrypt.c
+++ b/usr.bin/encrypt/encrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: encrypt.c,v 1.1 1996/08/08 02:07:22 downsj Exp $	*/
+/*	$OpenBSD: encrypt.c,v 1.2 1996/08/08 04:37:02 downsj Exp $	*/
 
 /*
  * Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -45,6 +45,22 @@ void usage()
     errx(1, "usage: %s [-m] [-s salt] [string]", __progname);
 }
 
+char *trim(line)
+    char *line;
+{
+    char *ptr;
+
+    for (ptr = &line[strlen(line)-1]; ptr > line; ptr--) {
+        if (!isspace(*ptr))
+	    break;
+    }
+    ptr[1] = '\0';
+
+    for (ptr = line; *ptr && isspace(*ptr); ptr++);
+
+    return(ptr);
+}
+
 int main(argc, argv)
     int argc;
     char *argv[];
@@ -73,18 +89,16 @@ int main(argc, argv)
 	usage();
 
     if ((argc - optind) < 1) {
-    	char line[BUFSIZ];
+    	char line[BUFSIZ], *string;
 
     	/* Encrypt stdin to stdout. */
 	while (!feof(stdin) && (fgets(line, sizeof(line), stdin) != NULL)) {
-	    if ((line[0] == '\0') || (line[0] == '\n'))
+	    /* Kill the whitesapce. */
+	    string = trim(line);
+	    if (*string == '\0')
 	    	continue;
 
-	    /* Kill the newline. */
-	    if (line[strlen(line)] == '\n')
-	    	line[strlen(line)] = '\0';
-
-	    fputs(crypt(line, (do_md5 ? "$1$" : salt)), stdout);
+	    fputs(crypt(string, (do_md5 ? "$1$" : salt)), stdout);
 	    fputc('\n', stdout);
 	}
     } else {