X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/1dff83f1891c628ec7dab32bc4958f91fc6e9464..627ff527e9062eb2ad4c94b6f674bae087217f6e:/lib.c

diff --git a/lib.c b/lib.c
index 251d932..4eadf70 100644
--- a/lib.c
+++ b/lib.c
@@ -51,7 +51,7 @@ void set_progname(const char *prog)
   const char *p;
 
   p = strrchr(prog, '/');
-  progname = p ? p + 1 : progname;
+  progname = p ? p + 1 : prog;
 }
 
 /* Report an error or warning in Unix style, given a captured argument
@@ -377,7 +377,7 @@ void argv_prependl(struct argv *av, ...)
 /* Return nonzero if the AN-byte string A is strictly precedes the BN-byte
  * string B in a lexicographic ordering.
  *
- * All comparisons of keys is handled by this function.
+ * All comparison of keys is handled by this function.
  */
 static int str_lt(const char *a, size_t an, const char *b, size_t bn)
 {
@@ -515,7 +515,7 @@ void treap_insert(struct treap *t, const struct treap_path *p,
      *		  /   \			      /   \
      *		X       Y		    Y	    Z
      *
-     * On the other hand, if we ere planning to hook N as the right subtree
+     * On the other hand, if we were planning to hook N as the right subtree
      * of U, then we do the opposite rotation:
      *
      *		    |				|
@@ -735,7 +735,7 @@ static void check_subtree(struct treap_node *n, unsigned maxwt,
   if (khi) assert(STRCMP(n->k, <, khi));
 
   /* Check the left subtree.  Node weights must be bounded above by our own
-   * weight.  And everykey in the left subtree must be smaller than our
+   * weight.  And every key in the left subtree must be smaller than our
    * current key.  We propagate the lower bound.
    */
   if (n->left) check_subtree(n->left, n->wt, klo, n->k);
@@ -1379,7 +1379,11 @@ static const char *subst(const char *p, const char *l,
   size_t n;
 
   /* It would be best if we could process literal text at high speed.  To
-   * this end,
+   * this end, we have a table, indexed by the low-order bits of F, to tell
+   * us which special characters we need to stop at.  This way, we can use
+   * `strcspn' to skip over literal text and stop at the next character which
+   * needs special handling.  Entries in this table with a null pointer
+   * correspond to impossible flag settings.
    */
   static const char *const delimtab[] = {