+ in the interest of robustness, I added

[oweals/busybox.git] / tr.c

diff --git a/tr.c b/tr.c
index 8ac09e64175f6f8d49b81132aa69ce7690bb34ea..b631b006559aafc0a0cb2b134ff5cfb81795ea44 100644 (file)
--- a/tr.c
+++ b/tr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c      8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
 
-       "$Id: tr.c,v 1.1 2000/03/05 08:07:00 erik Exp $";
+       "$Id: tr.c,v 1.3 2000/04/15 16:34:54 erik Exp $";
 #endif                                                 /* not lint */
 #endif                                                 /* #if 0 */
 
@@ -138,12 +138,12 @@ int cflag;
 
 static void tr_usage()
 {
-       (void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
-                                  "usage: tr [-csu] string1 string2",
-                                  "       tr [-cu] -d string1",
-                                  "       tr [-cu] -s string1",
-                                  "       tr [-cu] -ds string1 string2");
-       exit(1);
+       usage( "\ttr [-csu] string1 string2\n"
+                  "\ttr [-cu] -d string1\n"
+                  "\ttr [-cu] -s string1\n"
+                  "\ttr [-cu] -ds string1 string2\n\n"
+                  "Translate, squeeze, and/or delete characters from standard\n"
+                  "input, writing to standard output.\n");
 }
 
 
@@ -433,8 +433,7 @@ STR *s;
                                                                                                                "unknown class %s",
                                                                                                                s->str);
 
-       if ((cp->set = p = malloc((NCHARS + 1) * sizeof(int))) == NULL)
-               errx(1, "malloc");
+       cp->set = p = xmalloc((NCHARS + 1) * sizeof(int));
        bzero(p, (NCHARS + 1) * sizeof(int));
 
        for (cnt = 0, func = cp->func; cnt < NCHARS; ++cnt)