Some more patchelttes from Larry Doolittle.

diff --git a/coreutils/tr.c b/coreutils/tr.c
index ff0f331ffbb565260d96f1a2da7d8aaa37925436..07922af175fb19c2b2a33506eb18176a189942b2 100644 (file)
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -33,7 +33,7 @@
 
 static const int ASCII = 0377;
 
-/* some glabals shared across this file */
+/* some "globals" shared across this file */
 static char com_fl, del_fl, sq_fl;
 static short in_index, out_index;
 /* these last are pointers to static buffers declared in tr_main */
@@ -90,6 +90,10 @@ static void map(register unsigned char *string1, unsigned int string1_len,
        }
 }
 
+/* supported constructs:
+ *   Ranges,  e.g.,  [0-9]  ==>  0123456789
+ *   Escapes, e.g.,  \a     ==>  Control-G
+ */
 static unsigned int expand(const char *arg, register unsigned char *buffer)
 {
        unsigned char *buffer_start = buffer;
@@ -110,7 +114,7 @@ static unsigned int expand(const char *arg, register unsigned char *buffer)
                        ac = *arg++;
                        while (i <= ac)
                                *buffer++ = i++;
-                       arg++;                          /* Skip ']' */
+                       arg++;                          /* Skip the assumed ']' */
                } else
                        *buffer++ = *arg++;
        }

diff --git a/pristine_setup.sh b/pristine_setup.sh
index 62f3f3075c0238cbdd85e1268c374aa1a52df989..9e638f96e7f1afedb0b031ea4b298e2e6abaf7b2 100755 (executable)
--- a/pristine_setup.sh
+++ b/pristine_setup.sh
@@ -34,6 +34,11 @@ sed -e "s?BB_SRC_DIR =.*?BB_SRC_DIR = $DIR?" <$DIR/Makefile >Makefile || exit
 cp $DIR/Config.h Config.h || exit
 #mkdir -p pwd_grp
 
+if [ ! -r $DIR/sh.c ]; then
+    echo "Warning: no shell selected.  You must make the symlink (sh.c to either"
+    echo "lash.c or hush.c) in $DIR, not here."
+fi
+
 echo " "
 echo "You may now type 'make' to build busybox in this directory"
 echo "($PWD) using the pristine sources in $DIR"

diff --git a/tr.c b/tr.c
index ff0f331ffbb565260d96f1a2da7d8aaa37925436..07922af175fb19c2b2a33506eb18176a189942b2 100644 (file)
--- a/tr.c
+++ b/tr.c
@@ -33,7 +33,7 @@
 
 static const int ASCII = 0377;
 
-/* some glabals shared across this file */
+/* some "globals" shared across this file */
 static char com_fl, del_fl, sq_fl;
 static short in_index, out_index;
 /* these last are pointers to static buffers declared in tr_main */
@@ -90,6 +90,10 @@ static void map(register unsigned char *string1, unsigned int string1_len,
        }
 }
 
+/* supported constructs:
+ *   Ranges,  e.g.,  [0-9]  ==>  0123456789
+ *   Escapes, e.g.,  \a     ==>  Control-G
+ */
 static unsigned int expand(const char *arg, register unsigned char *buffer)
 {
        unsigned char *buffer_start = buffer;
@@ -110,7 +114,7 @@ static unsigned int expand(const char *arg, register unsigned char *buffer)
                        ac = *arg++;
                        while (i <= ac)
                                *buffer++ = i++;
-                       arg++;                          /* Skip ']' */
+                       arg++;                          /* Skip the assumed ']' */
                } else
                        *buffer++ = *arg++;
        }