Merge branch 'master' of github.com:attractivechaos/klib

diff --cc ketopt.h
index 8ae1811791b8a17f2449742d7b025b19cd38e819,43b5f4af85c6d5aca93071f772a0954b320c4a67..73dd2dc83d98bd1beab2a14654791bcec636bbd0
--- 1/ketopt.h
--- 2/ketopt.h
+++ b/ketopt.h
@@@ -93,10 -89,10 +93,10 @@@ static int ketopt(ketopt_t *s, int argc
                        }
                }
        } else { /* a short option */
-               char *p;
+               const char *p;
                if (s->pos == 0) s->pos = 1;
                opt = s->opt = argv[s->i][s->pos++];
 -              p = strchr(ostr, opt);
 +              p = strchr((char*)ostr, opt);
                if (p == 0) {
                        opt = '?'; /* unknown option */
                } else if (p[1] == ':') {