diff --git a/src/Makefile b/src/Makefile
index d9624de..8f5f035 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -308,9 +308,6 @@ seek_set.o: compile seek.h seek_set.c
 select.h: choose compile select.h1 select.h2 trysysel.c
 	./choose c trysysel select.h1 select.h2 > select.h
 
-sgetopt.o: buffer.h compile sgetopt.c sgetopt.h subgetopt.h
-	./compile sgetopt.c
-
 sig.o: compile sig.c sig.h
 	./compile sig.c
 
@@ -368,9 +365,6 @@ strerr_die.o: buffer.h compile strerr.h strerr_die.c
 strerr_sys.o: compile error.h strerr.h strerr_sys.c
 	./compile strerr_sys.c
 
-subgetopt.o: compile subgetopt.c subgetopt.h
-	./compile subgetopt.c
-
 sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
 hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h systype \
 uint64.h reboot_system.h uw_tmp.h socket.lib
@@ -444,20 +438,20 @@ buffer_get.o buffer_put.o buffer_read.o buffer_write.o coe.o env.o \
 error.o error_str.o fd_copy.o fd_move.o fifo.o lock_ex.o lock_exnb.o \
 makelib ndelay_off.o ndelay_on.o open_append.o open_read.o \
 open_trunc.o open_write.o openreadclose.o pathexec_env.o \
-pathexec_run.o prot.o readclose.o seek_set.o sgetopt.o sig.o \
+pathexec_run.o prot.o readclose.o seek_set.o sig.o \
 sig_block.o sig_catch.o sig_pause.o stralloc_cat.o stralloc_catb.o \
 stralloc_cats.o stralloc_eady.o stralloc_opyb.o stralloc_opys.o \
-stralloc_pend.o strerr_die.o strerr_sys.o subgetopt.o wait_nohang.o \
+stralloc_pend.o strerr_die.o strerr_sys.o wait_nohang.o \
 wait_pid.o
 	./makelib unix.a alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o \
 	buffer_2.o buffer_get.o buffer_put.o buffer_read.o buffer_write.o \
 	coe.o env.o error.o error_str.o fd_copy.o fd_move.o fifo.o lock_ex.o \
 	lock_exnb.o ndelay_off.o ndelay_on.o open_append.o open_read.o \
 	open_trunc.o open_write.o openreadclose.o pathexec_env.o \
-	pathexec_run.o prot.o readclose.o seek_set.o sgetopt.o sig.o \
+	pathexec_run.o prot.o readclose.o seek_set.o sig.o \
 	sig_block.o sig_catch.o sig_pause.o stralloc_cat.o stralloc_catb.o \
 	stralloc_cats.o stralloc_eady.o stralloc_opyb.o stralloc_opys.o \
-	stralloc_pend.o strerr_die.o strerr_sys.o subgetopt.o wait_nohang.o \
+	stralloc_pend.o strerr_die.o strerr_sys.o wait_nohang.o \
 	wait_pid.o
 
 wait_nohang.o: compile haswaitp.h wait_nohang.c
diff --git a/src/TARGETS b/src/TARGETS
index 46981ce..f3a7ab5 100644
--- a/src/TARGETS
+++ b/src/TARGETS
@@ -90,7 +90,6 @@ readclose.o
 scan_ulong.o
 seek_set.o
 select.h
-sgetopt.o
 sig.o
 sig_block.o
 sig_catch.o
@@ -108,7 +107,6 @@ stralloc_opys.o
 stralloc_pend.o
 strerr_die.o
 strerr_sys.o
-subgetopt.o
 sysdeps
 systype
 tai_now.o
diff --git a/src/chpst.c b/src/chpst.c
index 1cca5f4..dfe5d0f 100644
--- a/src/chpst.c
+++ b/src/chpst.c
@@ -3,7 +3,6 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
-#include "sgetopt.h"
 #include "error.h"
 #include "strerr.h"
 #include "str.h"
@@ -40,7 +39,7 @@ void usage() { strerr_die4x(100, "usage: ", progname, USAGE_MAIN, "\n"); }
 
 char *set_user =0;
 char *env_user =0;
-const char *argv0 =0;
+char *argv0 =0;
 const char *env_dir =0;
 unsigned int verbose =0;
 unsigned int pgrp =0;
@@ -258,14 +257,14 @@ void slimit() {
 }
 
 /* argv[0] */
-void setuidgid(int, const char *const *);
-void envuidgid(int, const char *const *);
+void setuidgid(int, char **);
+void envuidgid(int, char **);
 void envdir(int, const char *const *);
 void pgrphack(int, const char *const *);
 void setlock(int, const char *const *);
 void softlimit(int, const char *const *);
 
-int main(int argc, const char **argv) {
+int main(int argc, char **argv) {
   int opt;
   int i;
   unsigned long ul;
@@ -287,10 +286,10 @@ int main(int argc, const char **argv) {
   if (str_equal(progname, "softlimit")) softlimit(argc, argv);
 
   while ((opt =getopt(argc, argv, "u:U:b:e:m:d:o:p:f:c:r:t:/:n:l:L:vP012V"))
-         != opteof)
+         != -1)
     switch(opt) {
-    case 'u': set_user =(char*)optarg; break;
-    case 'U': env_user =(char*)optarg; break;
+    case 'u': set_user =optarg; break;
+    case 'U': env_user =optarg; break;
     case 'b': argv0 =(char*)optarg; break;
     case 'e': env_dir =optarg; break;
     case 'm':
@@ -367,12 +366,12 @@ int main(int argc, const char **argv) {
 void setuidgid_usage() {
   strerr_die4x(100, "usage: ", progname, USAGE_SETUIDGID, "\n");
 }
-void setuidgid(int argc, const char *const *argv) {
-  const char *account;
+void setuidgid(int argc, char **argv) {
+  char *account;
 
   if (! (account =*++argv)) setuidgid_usage();
   if (! *++argv) setuidgid_usage();
-  suidgid((char*)account, 0);
+  suidgid(account, 0);
   pathexec(argv);
   fatal2("unable to run", *argv);
 }
@@ -380,12 +379,12 @@ void setuidgid(int argc, const char *const *argv) {
 void envuidgid_usage() {
   strerr_die4x(100, "usage: ", progname, USAGE_ENVUIDGID, "\n");
 }
-void envuidgid(int argc, const char *const *argv) {
-  const char *account;
+void envuidgid(int argc, char **argv) {
+  char *account;
 
   if (! (account =*++argv)) envuidgid_usage();
   if (! *++argv) envuidgid_usage();
-  euidgid((char*)account, 0);
+  euidgid(account, 0);
   pathexec(argv);
   fatal2("unable to run", *argv);
 }
@@ -422,7 +421,7 @@ void setlock(int argc, const char *const *argv) {
   unsigned int x =0;
   const char *fn;
 
-  while ((opt =getopt(argc, argv, "nNxX")) != opteof)
+  while ((opt =getopt(argc, argv, "nNxX")) != -1)
     switch(opt) {
       case 'n': delay =1; break;
       case 'N': delay =0; break;
@@ -453,7 +452,7 @@ void getlarg(long *l) {
 void softlimit(int argc, const char *const *argv) {
   int opt;
   
-  while ((opt =getopt(argc,argv,"a:c:d:f:l:m:o:p:r:s:t:")) != opteof)
+  while ((opt =getopt(argc,argv,"a:c:d:f:l:m:o:p:r:s:t:")) != -1)
     switch(opt) {
     case '?': softlimit_usage();
     case 'a': getlarg(&limita); break;
diff --git a/src/runsv.c b/src/runsv.c
index ecf4677..886f662 100644
--- a/src/runsv.c
+++ b/src/runsv.c
@@ -62,22 +62,22 @@ char *dir;
 
 void usage () { strerr_die4x(1, "usage: ", progname, USAGE, "\n"); }
 
-void fatal(char *m) {
+void fatal(const char *m) {
   strerr_die5sys(111, "runsv ", dir, ": fatal: ", m, ": ");
 }
-void fatal2(char *m1, char *m2) {
+void fatal2(const char *m1, const char *m2) {
   strerr_die6sys(111, "runsv ", dir, ": fatal: ", m1, m2, ": ");
 }
-void fatalx(char *m1, char *m2) {
+void fatalx(const char *m1, const char *m2) {
   strerr_die5x(111, "runsv ", dir, ": fatal: ", m1, m2);
 }
-void warn(char *m) {
+void warn(const char *m) {
   strerr_warn5("runsv ", dir, ": warning: ", m, ": ", &strerr_sys);
 }
-void warn2(char *m1, char *m2) {
+void warn2(const char *m1, const char *m2) {
   strerr_warn6("runsv ", dir, ": warning: ", m1, m2, ": ", &strerr_sys);
 }
-void warnx(char *m1, char *m2, char *m3) {
+void warnx(const char *m1, const char *m2, const char *m3) {
   strerr_warn6("runsv ", dir, ": warning: ", m1, m2, m3, 0);
 }
 
@@ -96,12 +96,12 @@ void update_status(struct svdir *s) {
   char bspace[64];
   buffer b;
   char spid[FMT_ULONG];
-  char *fstatus ="supervise/status";
-  char *fstatusnew ="supervise/status.new";
-  char *fstat ="supervise/stat";
-  char *fstatnew ="supervise/stat.new";
-  char *fpid ="supervise/pid";
-  char *fpidnew ="supervise/pid.new";
+  const char *fstatus ="supervise/status";
+  const char *fstatusnew ="supervise/status.new";
+  const char *fstat ="supervise/stat";
+  const char *fstatnew ="supervise/stat.new";
+  const char *fpid ="supervise/pid";
+  const char *fpidnew ="supervise/pid.new";
 
   if (s->islog) {
     fstatus ="log/supervise/status";
@@ -261,7 +261,7 @@ void stopservice(struct svdir *s) {
 
 void startservice(struct svdir *s) {
   int p;
-  char *run[4];
+  const char *run[4];
   char code[FMT_ULONG];
   char stat[FMT_ULONG];
 
diff --git a/src/runsvchdir.c b/src/runsvchdir.c
index 9bf17f7..38cfd25 100644
--- a/src/runsvchdir.c
+++ b/src/runsvchdir.c
@@ -16,13 +16,13 @@ char *new;
 
 void usage () { strerr_die4x(1, "usage: ", progname, USAGE, "\n"); }
 
-void fatal(char *m1, char *m2) {
+void fatal(const char *m1, const char *m2) {
   strerr_die5sys(111, progname, ": fatal: ", m1, m2, ": ");
 }
-void fatalx(char *m1, char *m2) {
+void fatalx(const char *m1, const char *m2) {
   strerr_die4x(111, progname, ": fatal: ", m1, m2);
 }
-void warn(char *m1, char *m2) {
+void warn(const char *m1, const char *m2) {
   strerr_warn5(progname, ": fatal: ", m1, m2, ": ", &strerr_sys);
 }
 
diff --git a/src/runsvdir.c b/src/runsvdir.c
index ecebd0a..e5a838c 100644
--- a/src/runsvdir.c
+++ b/src/runsvdir.c
@@ -42,13 +42,13 @@ int exitsoon =0;
 int pgrp =0;
 
 void usage () { strerr_die4x(1, "usage: ", progname, USAGE, "\n"); }
-void fatal(char *m1, char *m2) {
+void fatal(const char *m1, const char *m2) {
   strerr_die6sys(100, "runsvdir ", svdir, ": fatal: ", m1, m2, ": ");
 }
-void warn(char *m1, char *m2) {
+void warn(const char *m1, const char *m2) {
   strerr_warn6("runsvdir ", svdir, ": warning: ", m1, m2, ": ", &strerr_sys);
 }
-void warn3x(char *m1, char *m2, char *m3) {
+void warn3x(const char *m1, const char *m2, const char *m3) {
   strerr_warn6("runsvdir ", svdir, ": warning: ", m1, m2, m3, 0);
 } 
 void s_term() { exitsoon =1; }
diff --git a/src/runsvstat.c b/src/runsvstat.c
index c17bbd3..ad07c9f 100644
--- a/src/runsvstat.c
+++ b/src/runsvstat.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include "strerr.h"
 #include "error.h"
-#include "sgetopt.h"
 #include "open.h"
 #include "buffer.h"
 #include "tai.h"
@@ -112,7 +111,7 @@ int main(int argc, char **argv) {
 
   progname =*argv;
 
-  while ((opt =getopt(argc, (const char * const *)argv, "lV")) != opteof) {
+  while ((opt =getopt(argc, (const char * const *)argv, "lV")) != -1) {
     switch(opt) {
     case 'l':
       showlog =1;
diff --git a/src/sgetopt.c b/src/sgetopt.c
deleted file mode 100644
index 8bb608f..0000000
--- a/src/sgetopt.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Public domain. */
-
-/* sgetopt.c, sgetopt.h: (yet another) improved getopt clone, outer layer
-D. J. Bernstein, djb@pobox.com.
-Depends on subgetopt.h, buffer.h.
-No system requirements.
-19991219: Switched to buffer.h.
-19970208: Cleanups.
-931201: Baseline.
-No known patent problems.
-
-Documentation in sgetopt.3.
-*/
-
-#include "buffer.h"
-#define SGETOPTNOSHORT
-#include "sgetopt.h"
-#define SUBGETOPTNOSHORT
-#include "subgetopt.h"
-
-#define getopt sgetoptmine
-#define optind subgetoptind
-#define opterr sgetopterr
-#define optproblem subgetoptproblem
-#define optprogname sgetoptprogname
-
-int opterr = 1;
-const char *optprogname = 0;
-
-int getopt(int argc,const char *const *argv,const char *opts)
-{
-  int c;
-  const char *s;
-
-  if (!optprogname) {
-    optprogname = *argv;
-    if (!optprogname) optprogname = "";
-    for (s = optprogname;*s;++s) if (*s == '/') optprogname = s + 1;
-  }
-  c = subgetopt(argc,argv,opts);
-  if (opterr)
-    if (c == '?') {
-      char chp[2]; chp[0] = optproblem; chp[1] = '\n';
-      buffer_puts(buffer_2,optprogname);
-      if (argv[optind] && (optind < argc))
-        buffer_puts(buffer_2,": illegal option -- ");
-      else
-        buffer_puts(buffer_2,": option requires an argument -- ");
-      buffer_put(buffer_2,chp,2);
-      buffer_flush(buffer_2);
-    }
-  return c;
-}
diff --git a/src/sgetopt.h b/src/sgetopt.h
deleted file mode 100644
index bf8bce6..0000000
--- a/src/sgetopt.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Public domain. */
-
-#ifndef SGETOPT_H
-#define SGETOPT_H
-
-#ifndef SGETOPTNOSHORT
-#define getopt sgetoptmine
-#define optarg subgetoptarg
-#define optind subgetoptind
-#define optpos subgetoptpos
-#define opterr sgetopterr
-#define optproblem subgetoptproblem
-#define optprogname sgetoptprogname
-#define opteof subgetoptdone
-#endif
-
-#include "subgetopt.h"
-
-extern int sgetoptmine(int,const char *const *,const char *);
-extern int sgetopterr;
-extern const char *sgetoptprogname;
-
-#endif
diff --git a/src/subgetopt.c b/src/subgetopt.c
deleted file mode 100644
index 85ace96..0000000
--- a/src/subgetopt.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Public domain. */
-
-#define SUBGETOPTNOSHORT
-#include "subgetopt.h"
-
-#define sgopt subgetopt
-#define optind subgetoptind
-#define optpos subgetoptpos
-#define optarg subgetoptarg
-#define optproblem subgetoptproblem
-#define optdone subgetoptdone
-
-int optind = 1;
-int optpos = 0;
-const char *optarg = 0;
-int optproblem = 0;
-int optdone = SUBGETOPTDONE;
-
-int sgopt(int argc,const char *const *argv,const char *opts)
-{
-  int c;
-  const char *s;
-
-  optarg = 0;
-  if (!argv || (optind >= argc) || !argv[optind]) return optdone;
-  if (optpos && !argv[optind][optpos]) {
-    ++optind;
-    optpos = 0;
-    if ((optind >= argc) || !argv[optind]) return optdone;
-  }
-  if (!optpos) {
-    if (argv[optind][0] != '-') return optdone;
-    ++optpos;
-    c = argv[optind][1];
-    if ((c == '-') || (c == 0)) {
-      if (c) ++optind;
-      optpos = 0;
-      return optdone;
-    }
-    /* otherwise c is reassigned below */
-  }
-  c = argv[optind][optpos];
-  ++optpos;
-  s = opts;
-  while (*s) {
-    if (c == *s) {
-      if (s[1] == ':') {
-        optarg = argv[optind] + optpos;
-        ++optind;
-        optpos = 0;
-        if (!*optarg) {
-          optarg = argv[optind];
-          if ((optind >= argc) || !optarg) { /* argument past end */
-            optproblem = c;
-            return '?';
-          }
-          ++optind;
-        }
-      }
-      return c;
-    }
-    ++s;
-    if (*s == ':') ++s;
-  }
-  optproblem = c;
-  return '?';
-}
diff --git a/src/subgetopt.h b/src/subgetopt.h
deleted file mode 100644
index 41ad26a..0000000
--- a/src/subgetopt.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Public domain. */
-
-#ifndef SUBGETOPT_H
-#define SUBGETOPT_H
-
-#ifndef SUBGETOPTNOSHORT
-#define sgopt subgetopt
-#define sgoptarg subgetoptarg
-#define sgoptind subgetoptind
-#define sgoptpos subgetoptpos
-#define sgoptproblem subgetoptproblem
-#define sgoptprogname subgetoptprogname
-#define sgoptdone subgetoptdone
-#endif
-
-#define SUBGETOPTDONE -1
-
-extern int subgetopt(int,const char *const *,const char *);
-extern const char *subgetoptarg;
-extern int subgetoptind;
-extern int subgetoptpos;
-extern int subgetoptproblem;
-extern const char *subgetoptprogname;
-extern int subgetoptdone;
-
-#endif
diff --git a/src/sv.c b/src/sv.c
index e076bd6..7943665 100644
--- a/src/sv.c
+++ b/src/sv.c
@@ -4,7 +4,6 @@
 #include "str.h"
 #include "strerr.h"
 #include "error.h"
-#include "sgetopt.h"
 #include "open.h"
 #include "env.h"
 #include "buffer.h"
@@ -31,8 +30,8 @@
 
 char *progname;
 char *action;
-char *acts;
-char *varservice ="/var/service/";
+const char *acts;
+const char *varservice ="/var/service/";
 char **service;
 char **servicex;
 unsigned int services;
@@ -45,8 +44,8 @@ unsigned int islog =0;
 struct taia tstart, tnow, tdiff;
 struct tai tstatus;
 
-int (*act)(char*) =0;
-int (*cbk)(char*) =0;
+int (*act)(const char*) =0;
+int (*cbk)(const char*) =0;
 
 int curdir, fd, r;
 char svstatus[20];
@@ -57,15 +56,15 @@ void usage() {
   strerr_die4x(2, "usage: ", progname, USAGELSB, "\n");
 }
 void done(unsigned int e) { if (curdir != -1) fchdir(curdir); _exit(e); }
-void fatal(char *m1) {
+void fatal(const char *m1) {
   strerr_warn3(FATAL, m1, ": ", &strerr_sys);
   done(lsb ? 151 : 100);
 }
-void fatal2(char *m1, char *m2) {
+void fatal2(const char *m1, const char *m2) {
   strerr_warn4(FATAL, m1, m2, ": ", &strerr_sys);
   done(lsb ? 151 : 100);
 }
-void out(char *p, char *m1) {
+void out(const char *p, const char *m1) {
   buffer_puts(buffer_1, p);
   buffer_puts(buffer_1, *service);
   if (islog) buffer_puts(buffer_1, "/log");
@@ -78,11 +77,11 @@ void out(char *p, char *m1) {
   buffer_puts(buffer_1, "\n");
   buffer_flush(buffer_1);
 }
-void fail(char *m1) { ++rc; out(FAIL, m1); }
-void failx(char *m1) { errno =0; fail(m1); }
-void warn(char *m1) { ++rc; out(WARN, m1); }
-void warnx(char *m1) { errno =0; warn(m1); }
-void ok(char *m1) { errno =0; out(OK, m1); }
+void fail(const char *m1) { ++rc; out(FAIL, m1); }
+void failx(const char *m1) { errno =0; fail(m1); }
+void warn(const char *m1) { ++rc; out(WARN, m1); }
+void warnx(const char *m1) { errno =0; warn(m1); }
+void ok(const char *m1) { errno =0; out(OK, m1); }
 
 void outs(const char *s) { buffer_puts(buffer_1, s); }
 void flush(const char *s) { outs(s); buffer_flush(buffer_1); }
@@ -112,7 +111,7 @@ int svstatus_get() {
   }
   return(1);
 }
-unsigned int svstatus_print(char *m) {
+unsigned int svstatus_print(const char *m) {
   int pid;
   int normallyup =0;
   struct stat s;
@@ -151,12 +150,12 @@ unsigned int svstatus_print(char *m) {
   if (pid && svstatus[18]) outs(", got TERM");
   return(pid ? 1 : 2);
 }
-int status(char *unused) {
-  int rc;
+int status(const char *unused) {
+  int rv;
 
-  rc =svstatus_get();
-  switch(rc) { case -1: if (lsb) done(4); case 0: return(0); }
-  rc =svstatus_print(*service);
+  rv =svstatus_get();
+  switch(rv) { case -1: if (lsb) done(4); case 0: return(0); }
+  rv =svstatus_print(*service);
   islog =1;
   if (chdir("log") == -1) {
     if (errno != error_noent) {
@@ -167,16 +166,16 @@ int status(char *unused) {
   }
   else {
     outs("; ");
-    if (svstatus_get()) { rc =svstatus_print("log"); outs("\n"); }
+    if (svstatus_get()) { rv =svstatus_print("log"); outs("\n"); }
   }
   islog =0;
   flush("");
-  if (lsb) switch(rc) { case 1: done(0); case 2: done(3); case 0: done(4); }
-  return(rc);
+  if (lsb) switch(rv) { case 1: done(0); case 2: done(3); case 0: done(4); }
+  return(rv);
 }
 
 int checkscript() {
-  char *prog[2];
+  const char *prog[2];
   struct stat s;
   int pid, w;
 
@@ -210,7 +209,7 @@ int checkscript() {
   return(!wait_exitcode(w));
 }
 
-int check(char *a) {
+int check(const char *a) {
   unsigned int pid;
 
   if ((r =svstatus_get()) == -1) return(-1);
@@ -248,7 +247,7 @@ int check(char *a) {
   outs(OK); svstatus_print(*service); flush("\n");
   return(1);
 }
-int control(char *a) {
+int control(const char *a) {
   if (svstatus_get() <= 0) return(-1);
   if (svstatus[17] == *a)
     if (*a != 'd' || svstatus[18] == 1) return(0); /* once w/o term */
@@ -275,13 +274,13 @@ int main(int argc, char **argv) {
   progname =*argv;
   for (i =str_len(*argv); i; --i) if ((*argv)[i -1] == '/') break;
   *argv +=i;
-  optprogname =progname =*argv;
+  progname =*argv;
   service =argv;
   services =1;
   lsb =(str_diff(progname, "sv"));
   if ((x =env_get("SVDIR"))) varservice =x;
   if ((x =env_get("SVWAIT"))) scan_ulong(x, &wait);
-  while ((i =getopt(argc, (const char* const*)argv, "w:vV")) != opteof) {
+  while ((i =getopt(argc, (const char* const*)argv, "w:vV")) != -1) {
     switch(i) {
     case 'w': scan_ulong(optarg, &wait);
     case 'v': verbose =1; break;
diff --git a/src/svlogd.c b/src/svlogd.c
index 8c68c73..7b29d5a 100644
--- a/src/svlogd.c
+++ b/src/svlogd.c
@@ -20,7 +20,6 @@
 #include "fd.h"
 #include "wait.h"
 #include "error.h"
-#include "sgetopt.h"
 #include "open.h"
 #include "openreadclose.h"
 #include "coe.h"
@@ -87,7 +86,7 @@ struct logdir {
   stralloc processor;
   int ppid;
   char fnsave[FMT_PTIME];
-  char *name;
+  const char *name;
   int fdcur;
   int fdlock;
   char match;
@@ -100,19 +99,19 @@ unsigned int dirn =0;
 
 void usage() { strerr_die4x(111, "usage: ", progname, USAGE, "\n"); }
 void die_nomem() { strerr_die2x(111, FATAL, "out of memory."); }
-void fatal(char *m0) { strerr_die3sys(111, FATAL, m0, ": "); }
-void fatalx(char *m0) { strerr_die2x(111, FATAL, m0); }
-void fatal2(char *m0, char *m1) {
+void fatal(const char *m0) { strerr_die3sys(111, FATAL, m0, ": "); }
+void fatalx(const char *m0) { strerr_die2x(111, FATAL, m0); }
+void fatal2(const char *m0, const char *m1) {
   strerr_die5sys(111, FATAL, m0, ": ", m1, ": ");
 }
-void warn(char *m0) { strerr_warn3(WARNING, m0, ": ", &strerr_sys); }
-void warn2(char *m0, char *m1) {
+void warn(const char *m0) { strerr_warn3(WARNING, m0, ": ", &strerr_sys); }
+void warn2(const char *m0, const char *m1) {
   strerr_warn5(WARNING, m0, ": ", m1, ": ", &strerr_sys);
 }
-void warnx(char *m0, char *m1) { strerr_warn4(WARNING, m0, ": ", m1, 0); }
+void warnx(const char *m0, const char *m1) { strerr_warn4(WARNING, m0, ": ", m1, 0); }
 void pause_nomem() { strerr_warn2(PAUSE, "out of memory.", 0); sleep(3); }
-void pause1(char *m0) { strerr_warn3(PAUSE, m0, ": ", &strerr_sys); sleep(3); }
-void pause2(char *m0, char *m1) {
+void pause1(const char *m0) { strerr_warn3(PAUSE, m0, ": ", &strerr_sys); sleep(3); }
+void pause2(const char *m0, const char *m1) {
   strerr_warn5(PAUSE, m0, ": ", m1, ": ", &strerr_sys);
   sleep(3);
 }
@@ -128,7 +127,7 @@ unsigned int processorstart(struct logdir *ld) {
   while ((pid =fork()) == -1)
     pause2("unable to fork for processor", ld->name);
   if (! pid) {
-    char *prog[4];
+    const char *prog[4];
     int fd;
 
     /* child */
@@ -405,19 +404,19 @@ unsigned int logdir_open(struct logdir *ld, const char *fn) {
   int i;
 
   if ((ld->fddir =open_read(fn)) == -1) {
-    warn2("unable to open log directory", (char*)fn);
+    warn2("unable to open log directory", fn);
     return(0);
   }
   coe(ld->fddir);
   if (fchdir(ld->fddir) == -1) {
     logdir_close(ld);
-    warn2("unable to change directory", (char*)fn);
+    warn2("unable to change directory", fn);
     return(0);
   }
   ld->fdlock =open_append("lock");
   if ((ld->fdlock == -1) || (lock_exnb(ld->fdlock) == -1)) {
     logdir_close(ld);
-    warn2("unable to lock directory", (char*)fn);
+    warn2("unable to lock directory", fn);
     while (fchdir(fdwdir) == -1)
       pause1("unable to change to initial working directory");
     return(0);
@@ -428,7 +427,7 @@ unsigned int logdir_open(struct logdir *ld, const char *fn) {
   ld->sizemax =1000000;
   ld->nmax =ld->nmin =10;
   ld->tmax =0;
-  ld->name =(char*)fn;
+  ld->name =fn;
   ld->ppid =0;
   ld->match ='+';
   ld->udpaddr.sin_family =AF_INET;
@@ -669,7 +668,7 @@ int main(int argc, const char **argv) {
 
   progname =*argv;
 
-  while ((opt =getopt(argc, argv, "R:r:l:b:tvV")) != opteof) {
+  while ((opt =getopt(argc, argv, "R:r:l:b:tvV")) != -1) {
     switch(opt) {
     case 'R':
       replace =optarg;
diff --git a/src/svwaitdown.c b/src/svwaitdown.c
index 6cd3efc..f6bb1e3 100644
--- a/src/svwaitdown.c
+++ b/src/svwaitdown.c
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include "strerr.h"
 #include "error.h"
-#include "sgetopt.h"
 #include "scan.h"
 #include "open.h"
 #include "tai.h"
@@ -41,7 +40,7 @@ int main(int argc, const char * const *argv) {
   
   progname =*argv;
   
-  while ((opt =getopt(argc, argv, "t:xkvV")) != opteof) {
+  while ((opt =getopt(argc, argv, "t:xkvV")) != -1) {
     switch(opt) {
     case 't':
       scan_ulong(optarg, &sec);
diff --git a/src/svwaitup.c b/src/svwaitup.c
index e2d6c57..a183f16 100644
--- a/src/svwaitup.c
+++ b/src/svwaitup.c
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include "strerr.h"
 #include "error.h"
-#include "sgetopt.h"
 #include "scan.h"
 #include "open.h"
 #include "tai.h"
@@ -40,7 +39,7 @@ int main(int argc, const char * const *argv) {
 
   progname =*argv;
   
-  while ((opt =getopt(argc, argv, "s:vV")) != opteof) {
+  while ((opt =getopt(argc, argv, "s:vV")) != -1) {
     switch(opt) {
     case 's': 
       scan_ulong(optarg, &sec);
diff --git a/src/uidgid.c b/src/uidgid.c
index befa754..48c847b 100644
--- a/src/uidgid.c
+++ b/src/uidgid.c
@@ -6,7 +6,7 @@
 #include "scan.h"
 
 /* user */
-unsigned int uidgid_get(struct uidgid *u, char *ug) {
+unsigned int uidgid_get(struct uidgid *u, const char *ug) {
   struct passwd *pwd =0;
 
   if (! (pwd =getpwnam(ug))) return(0);
@@ -16,7 +16,7 @@ unsigned int uidgid_get(struct uidgid *u, char *ug) {
 }
 
 /* uid:gid[:gid[:gid]...] */
-unsigned int uidgids_set(struct uidgid *u, char *ug) {
+unsigned int uidgids_set(struct uidgid *u, const char *ug) {
   unsigned long id;
   int i;
 
diff --git a/src/uidgid.h b/src/uidgid.h
index 13cacbc..872d60b 100644
--- a/src/uidgid.h
+++ b/src/uidgid.h
@@ -10,7 +10,7 @@ struct uidgid {
 };
 
 /* user */
-extern unsigned int uidgid_get(struct uidgid *, char *);
+extern unsigned int uidgid_get(struct uidgid *, const char *);
 
 /* [:]user[:group[:group]...] */
 extern unsigned int uidgids_get(struct uidgid *, char *);
diff --git a/src/utmpset.c b/src/utmpset.c
index 2011f1d..e775ee4 100644
--- a/src/utmpset.c
+++ b/src/utmpset.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include "uw_tmp.h"
 #include "strerr.h"
-#include "sgetopt.h"
 #include "seek.h"
 #include "str.h"
 #include "open.h"
@@ -91,7 +90,7 @@ int main (int argc, const char * const *argv, const char * const *envp) {
 
   progname =*argv;
 
-  while ((opt =getopt(argc, argv, "wV")) != opteof) {
+  while ((opt =getopt(argc, argv, "wV")) != -1) {
     switch(opt) {
     case 'w':
       wtmp =1;