s_char purge directed by compiler warnings.

src/lib/commands/arm.c

@@ -54,14 +54,14 @@ arm(void)
     struct plnstr pl;
     struct plnstr start;	/* Used for sanity checking */
     struct nukstr nuke;
-    s_char *p;
+    char *p;
     int pno;
     int nuketype;
     int found;
     struct nstr_item ni;
-    s_char buf[1024];
+    char buf[1024];
     int disarm = **player->argp == 'd';
-    s_char *prompt = disarm ? "Disarm plane: " : "Arm plane: ";
+    char *prompt = disarm ? "Disarm plane: " : "Arm plane: ";
 
     if (!(p = getstarg(player->argp[1], prompt, buf)) || !*p)
 	return RET_SYN;

src/lib/commands/army.c

@@ -46,12 +46,12 @@ army(void)
 {
     struct lndstr land;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
     struct nstr_item ni;
     struct lndstr land2;
-    s_char buf[1024];
+    char buf[1024];
 
     cp = getstarg(player->argp[1], "army? ", buf);
     if (cp == 0)

src/lib/commands/assa.c

@@ -60,8 +60,8 @@ assa(void)
     int a_spy = 0;		/* the best assaulter scout */
     double osupport = 1.0;	/* assault support */
     double dsupport = 1.0;	/* defense support */
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int n;
     int ourtotal;
     struct emp_qelem *qp, *next;

src/lib/commands/atta.c

@@ -65,8 +65,8 @@ atta(void)
     double osupport = 1.0;	/* attack support */
     double dsupport = 1.0;	/* defense support */
     int last, n;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int rel;
 
     att_combat_init(def, EF_SECTOR);

src/lib/commands/bdes.c

@@ -45,11 +45,11 @@
 int
 bdes(void)
 {
-    s_char *p, d;
+    char *p, d;
     struct nstr_sect nstr;
     struct sctstr sect;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     int changed = 0;
 
     if (!snxtsct(&nstr, player->argp[1]))

src/lib/commands/best.c

@@ -46,10 +46,10 @@ int
 best(void)
 {
     double cost;
-    s_char *s;
+    char *s;
     struct sctstr s1, s2;
     struct nstr_sect nstr, nstr2;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;

src/lib/commands/boar.c

@@ -63,8 +63,8 @@ boar(void)
     struct lndstr land;
     struct nstr_item ni;
     int foundland;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_SHIP);
     /*

src/lib/commands/bomb.c

@@ -86,13 +86,13 @@ static int nbomb = sizeof(bombcomm) / sizeof(*bombcomm);
 int
 bomb(void)
 {
-    s_char *p;
+    char *p;
     int mission_flags;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -100,10 +100,10 @@ bomb(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char mission;
+    char mission;
     int rel;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
@@ -202,13 +202,13 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
     int nships;
     int type;
     int bad;
-    s_char *p;
+    char *p;
     struct plist *plp;
     int nsubs;
     int nunits;
     struct natstr *natp;
     int rel;
-    s_char buf[1024];
+    char buf[1024];
     int i;
 
     bad = 0;
@@ -473,7 +473,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     struct plist *plp;
     struct mchrstr *mcp;
     int dam;
-    s_char *q;
+    char *q;
     int n;
     struct emp_qelem *qp;
     int shipno;
@@ -481,8 +481,8 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     struct shpstr ship;
     int nships = 0;
     struct shiplist *head = NULL;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
     int hitchance;
     int nukedam;
     int flak;
@@ -614,7 +614,7 @@ static void
 plane_bomb(struct emp_qelem *list, struct sctstr *target)
 {
     int dam;
-    s_char *q;
+    char *q;
     int n;
     natid own;
     struct plnstr plane;
@@ -622,8 +622,8 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
     int planeno;
     int ignore;
     struct plist *plp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     int hitchance;
     int nukedam;
     int nplanes;
@@ -724,11 +724,11 @@ static void
 land_bomb(struct emp_qelem *list, struct sctstr *target)
 {
     int dam;
-    s_char *q;
+    char *q;
     int n;
     natid own;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     struct lndstr land;
     struct emp_qelem *qp;
     int unitno;
@@ -862,7 +862,7 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
 		    int flak)
 {
     int disp;
-    s_char dmess[255];
+    char dmess[255];
     int eff;
     struct shpstr ship;
     struct lndstr land;

src/lib/commands/buil.c

@@ -86,11 +86,11 @@ buil(void)
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct nchrstr *np;
-    s_char *p;
+    char *p;
     int gotsect = 0;
     int built;
     int number;
-    s_char buf[1024];
+    char buf[1024];
 
     natp = getnatp(player->cnum);
     if ((p =
@@ -221,7 +221,7 @@ buil(void)
 	if (player->argp[4]) {
 	    number = atoi(player->argp[4]);
 	    if (number > 20) {
-		s_char bstr[80];
+		char bstr[80];
 		sprintf(bstr,
 			"Are you sure that you want to build %s of them? ",
 			player->argp[4]);
@@ -536,8 +536,8 @@ build_bridge(struct sctstr *sp, short *vec)
     int newx, newy;
     int avail;
     int nx, ny, i, good = 0;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (opt_EASY_BRIDGES == 0) {	/* must have a bridge head or tower */
 	if (sp->sct_type != SCT_BTOWER) {
@@ -801,8 +801,8 @@ build_tower(struct sctstr *sp, short *vec)
     int val;
     int newx, newy;
     int avail;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int good;
     int i;
     int nx;

src/lib/commands/buy.c

@@ -75,7 +75,7 @@ buy(void)
     time_t now;
     double tally;
     double canspend;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");

src/lib/commands/cede.c

@@ -61,11 +61,11 @@ cede(void)
     natid to;
     int n;
     int is_sector = 0, is_ship = 0;
-    s_char *p;
+    char *p;
     struct nstr_sect ns;
     struct nstr_item ni;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((p = getstarg(player->argp[1], "Cede what? ", buf)) == 0)
 	return RET_SYN;

src/lib/commands/chan.c

@@ -45,14 +45,14 @@
 int
 chan(void)
 {
-    s_char *temp;
+    char *temp;
     struct natstr *natp;
-    register s_char *p;
+    char *p;
     natid cn;
     int charge;
     int nonb;
     int btucost;
-    s_char buf[1024];
+    char buf[1024];
     struct natstr *us;
 
     if ((p =

src/lib/commands/comm.c

@@ -48,7 +48,7 @@ int
 comm(void)
 {
     struct sctstr sect;
-    s_char dirstr[12];
+    char dirstr[12];
     int nsect;
     int n;
     struct nstr_sect nstr;

src/lib/commands/cons.c

@@ -51,8 +51,8 @@
 struct ltcomstr {
     int type;			/* EF_LOAN or EF_TREATY */
     int num;			/* number */
-    s_char *name;		/* "loan" or "treaty" */
-    s_char *Name;		/* "Loan" or "Treaty" */
+    char *name;			/* "loan" or "treaty" */
+    char *Name;			/* "Loan" or "Treaty" */
     natid proposer;		/* country offering */
     natid proposee;		/* country offered to */
     natid mailee;		/* who gets mail about it */
@@ -113,11 +113,11 @@ static int
 cons_choose(struct ltcomstr *ltcp)
 {
     static int lon_or_trt[] = { EF_LOAN, EF_TREATY, EF_BAD };
-    s_char *p;
+    char *p;
     struct lonstr *lp;
     struct trtstr *tp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     memset(ltcp, 0, sizeof(*ltcp));
     if (getstarg(player->argp[1], "loan or treaty? ", buf) == 0)

src/lib/commands/cuto.c

@@ -49,7 +49,7 @@ cuto(void)
     int nsect;
     int n;
     struct nstr_sect nstr;
-    s_char dirstr[12];
+    char dirstr[12];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;

src/lib/commands/decl.c

@@ -49,8 +49,8 @@ decl(void)
     int rel;
     int who;
     struct nstr_item ni;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "alliance, friendly, neutrality, hostility, or war? ",

src/lib/commands/deli.c

@@ -53,9 +53,9 @@ deli(void)
     int thresh;
     int sx, sy;
     struct nstr_sect nstr;
-    s_char buf[1024];
-    s_char prompt[128];
-    s_char *p;
+    char buf[1024];
+    char prompt[128];
+    char *p;
 
     if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
 	return RET_SYN;

src/lib/commands/demo.c

@@ -48,7 +48,7 @@
  */
 
 static long do_demo(struct natstr *natp, struct nstr_sect nstr, int number,
-		    s_char *p, int for_real);
+		    char *p, int for_real);
 
 int
 demo(void)
@@ -57,8 +57,8 @@ demo(void)
     long cash;
     long cost;
     int number;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     struct nstr_sect nstr;
 
     natp = getnatp(player->cnum);
@@ -80,7 +80,7 @@ demo(void)
 }
 
 static long
-do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
+do_demo(struct natstr *natp, struct nstr_sect nstr, int number, char *p,
 	int for_real)
 {
     struct sctstr sect;

src/lib/commands/desi.c

@@ -44,7 +44,7 @@
 #include "optlist.h"
 #include "commands.h"
 
-static long do_desi(struct natstr *natp, s_char *sects, s_char *deschar,
+static long do_desi(struct natstr *natp, char *sects, char *deschar,
 		    long int cash, int for_real);
 
 int
@@ -67,11 +67,11 @@ desi(void)
 }
 
 static long
-do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
+do_desi(struct natstr *natp, char *sects, char *deschar, long int cash,
 	int for_real)
 {
     int n;
-    s_char *p;
+    char *p;
     int breaksanct;
     int cap_x;
     int cap_y;
@@ -79,8 +79,8 @@ do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
     struct nstr_sect nstr;
     struct sctstr sect;
     struct sctstr check;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     long cost = 0;
     int changed = 0;
     int warned = 0;

src/lib/commands/dist.c

@@ -53,10 +53,10 @@ dist(void)
 {
     struct sctstr sect, dsect, tsect;
     struct nstr_sect nstr;
-    s_char *path, *p;
+    char *path, *p;
     double move_cost = 0.0;
     coord dstx, dsty;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;

src/lib/commands/drop.c

@@ -54,7 +54,7 @@ drop(void)
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -62,7 +62,7 @@ drop(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))

src/lib/commands/dump.c

@@ -49,7 +49,7 @@ int
 dump(void)
 {
     struct sctstr sect;
-    s_char dirstr[20];
+    char dirstr[20];
     int nsect;
     int n, i;
     struct nstr_sect nstr;

src/lib/commands/enli.c

@@ -55,10 +55,10 @@ enli(void)
     int milwant;
     int totalmil;
     long reserve;
-    s_char *p;
+    char *p;
     int quota;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;

src/lib/commands/flee.c

@@ -46,12 +46,12 @@ flee(void)
 {
     struct shpstr ship;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
     struct nstr_item ni;
     struct shpstr ship2;
-    s_char buf[1024];
+    char buf[1024];
 
     cp = getstarg(player->argp[1], "fleet? ", buf);
     if (cp == 0)

src/lib/commands/fly.c

@@ -55,7 +55,7 @@ fly(void)
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct shpstr ship;
     int cno;
     struct nstr_item ni_bomb;
@@ -67,7 +67,7 @@ fly(void)
     struct sctstr ap_sect;
     int dst_type;
     s_char *dst_ptr;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))

src/lib/commands/foll.c

@@ -48,11 +48,11 @@ int
 foll(void)
 {
     struct shpstr ship;
-    s_char *cp;
+    char *cp;
     int good, leader, count = 0;
     coord x, y;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_SAIL) {
 	pr("The SAIL option is not enabled, so this command is not valid.\n");

src/lib/commands/fort.c

@@ -48,8 +48,8 @@ fort(void)
     struct nstr_item ni;
     struct lndstr land;
     int fort_amt, hard_amt;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;

src/lib/commands/fuel.c

@@ -62,7 +62,7 @@ fuel(void)
     int type;
     struct mchrstr *mp;
     struct lchrstr *lcp;
-    s_char *p;
+    char *p;
     int fueled;
     int land_fuel, ship_fuel;
     int oil_amt, pet_amt, fuel_amt, tot_fuel, max_amt;
@@ -73,8 +73,8 @@ fuel(void)
     int harbor, sector;
     int fuelled_ship = -1;
     struct nstr_item tender, ltender;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (opt_FUEL == 0) {
 	pr("Option 'FUEL' not enabled\n");

src/lib/commands/give.c

@@ -56,9 +56,9 @@ give(void)
     int amt;
     struct ichrstr *ip;
     int m, n;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "which commodity? ")))
 	return RET_SYN;

src/lib/commands/grin.c

@@ -48,10 +48,10 @@ grin(void)
 {
     struct nstr_sect nstr;
     struct sctstr sect;
-    s_char *p;
+    char *p;
     int i, n, qty;
     int avail;
-    s_char buf[1024];
+    char buf[1024];
     double grind_eff = 0.8;
 
     if ((p = getstarg(player->argp[1], "Sectors? ", buf)) == 0)

src/lib/commands/hard.c

@@ -54,12 +54,12 @@ hard(void)
     struct plchrstr *pcp;
     struct plnstr pln;
     int level;
-    s_char *p;
+    char *p;
     int hcm;
     int n;
     struct nstr_item ni;
     struct sctstr sect;
-    s_char buf[1024];
+    char buf[1024];
     long cash;
     struct natstr *natp;
 

src/lib/commands/improve.c

@@ -56,9 +56,9 @@ improve(void)
     struct sctstr sect;
     int nsect;
     struct nstr_sect nstr;
-    s_char *p;
-    s_char buf[1024];
-    s_char inbuf[128];
+    char *p;
+    char buf[1024];
+    char inbuf[128];
     int type;
     int value;
     int ovalue;

src/lib/commands/info.c

@@ -52,14 +52,14 @@
 #include "commands.h"
 #include "optlist.h"
 
-static s_char *
-lowerit(s_char *buf, int n, s_char *orig)
+static char *
+lowerit(char *buf, int n, char *orig)
 {				/* converts a string to lower case */
     /* lower case output buffer */
     /* size of output buffer */
     /* input strig */
     int i;
-    s_char *tmp;
+    char *tmp;
     tmp = buf;
     memset(buf, 0, n);
     for (i = 0; i < n && *orig; i++) {
@@ -73,14 +73,14 @@ lowerit(s_char *buf, int n, s_char *orig)
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
+    char *name;
+    char *tmp_name;
     struct stat statb;
     struct dirent *dp;
-    s_char filename[1024];
-    s_char last[256];
+    char filename[1024];
+    char last[256];
     DIR *info_dp;
     int nmatch = 0;
     int width = 0;
@@ -172,11 +172,11 @@ int
 apro(void)
 {
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
     struct dirent *dp;
-    s_char filename[1024];
+    char filename[1024];
     DIR *info_dp;
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
@@ -277,17 +277,17 @@ apro(void)
     return RET_OK;
 }
 
-#else
+#else  /* _WIN32 */
 
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
-    s_char filename[1024];
-    s_char last[256];
+    char *name;
+    char *tmp_name;
+    char filename[1024];
+    char last[256];
     int nmatch = 0;
     int width = 0;
     char sep;
@@ -402,10 +402,10 @@ apro(void)
     HANDLE hDir;
     WIN32_FIND_DATA fData;
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
-    s_char filename[1024];
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
+    char filename[1024];
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
     int lhitlim;
@@ -504,4 +504,4 @@ apro(void)
     return RET_OK;
 }
 
-#endif
+#endif	/* _WIN32 */

src/lib/commands/laun.c

@@ -177,7 +177,7 @@ static int
 launch_as(struct plnstr *pp)
 {
     coord sx, sy;
-    s_char *cp, buf[1024];
+    char *cp, buf[1024];
     struct plnstr plane;
     struct nstr_item ni;
     int goodtarget;
@@ -243,14 +243,14 @@ launch_missile(struct plnstr *pp, int sublaunch)
     struct plchrstr *pcp = plchr + pp->pln_type;
     coord sx, sy;
     int n, dam;
-    s_char *cp;
+    char *cp;
     struct mchrstr *mcp;
     struct shpstr target_ship;
     struct sctstr sect;
     int nukedam;
     int rel;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     if (pcp->pl_flags & P_MAR)
 	cp = getstarg(player->argp[2], "Target ship? ", buf);
@@ -380,9 +380,9 @@ launch_sat(struct plnstr *pp, int sublaunch)
     int i;
     int dist;
     int dir;
-    s_char *cp;
-    s_char *p;
-    s_char buf[1024];
+    char *cp;
+    char *p;
+    char buf[1024];
 
     pr("\n");
     cp = getstarg(player->argp[2], "Target sector? ", buf);

src/lib/commands/lboard.c

@@ -59,8 +59,8 @@ lboa(void)
     int a_spy = 0;		/* the best boarder scout */
     struct sctstr sect;
     struct lndstr land;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_LAND);
     /*

src/lib/commands/load.c

@@ -84,8 +84,8 @@ load(void)
     struct sctstr sect;
     struct shpstr ship;
     int retval;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "What commodity (or 'plane' or 'land')? ", buf))
@@ -223,8 +223,8 @@ lload(void)
     struct sctstr sect;
     struct lndstr land;
     int retval;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "What commodity (or 'plane' or 'land')? ", buf))
@@ -371,9 +371,9 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     struct nstr_item ni;
     struct plnstr pln;
     int loaded = 0;
-    s_char buf[1024];
-    s_char *p;
-    s_char prompt[512];
+    char buf[1024];
+    char *p;
+    char prompt[512];
     struct mchrstr *mcp = mchr + sp->shp_type;
 
     if (!(mcp->m_flags & (M_CHOPPER | M_XLIGHT | M_FLY | M_MSL))) {
@@ -504,9 +504,9 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     struct lndstr land;
     struct plnstr plane;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
     int load_spy = 0;
 
     count_units(sp);
@@ -724,9 +724,9 @@ load_comm_ship(struct sctstr *sectp, struct shpstr *sp,
     struct mchrstr *mcp = &mchr[(int)sp->shp_type];
     int ship_amt, ship_max, sect_amt, move_amt;
     int amount;
-    s_char prompt[512];
-    s_char *p;
-    s_char buf[1024];
+    char prompt[512];
+    char *p;
+    char buf[1024];
 
     sprintf(prompt, "Number of %s to %s %s at %s? ",
 	    ich->i_name,
@@ -801,9 +801,9 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     struct nstr_item ni;
     struct plnstr pln;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     if (!lp->lnd_maxlight) {
 	if (noisy)
@@ -917,9 +917,9 @@ load_comm_land(struct sctstr *sectp, struct lndstr *lp,
     struct lchrstr *lcp = &lchr[(int)lp->lnd_type];
     int land_amt, land_max, sect_amt, move_amt;
     int amount;
-    s_char prompt[512];
-    s_char *p;
-    s_char buf[1024];
+    char prompt[512];
+    char *p;
+    char buf[1024];
 
     sprintf(prompt, "Number of %s to %s %s at %s? ",
 	    ich->i_name,
@@ -999,9 +999,9 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     struct lndstr land;
     struct plnstr plane;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     lnd_count_units(lp);
 

src/lib/commands/lten.c

@@ -67,8 +67,8 @@ ltend(void)
     int maxtarget;
     int transfer;
     int total;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
 	return RET_SYN;

src/lib/commands/map.c

@@ -49,7 +49,7 @@
 int
 map(void)
 {
-    register s_char *b;
+    char *b;
     int unit_type = 0;
     int bmap = 0;
     struct nstr_sect ns;

src/lib/commands/marc.c

@@ -54,15 +54,15 @@ march(void)
     struct emp_qelem land_list;
     double minmob, maxmob;
     int together;
-    s_char *cp = 0;
+    char *cp = 0;
     struct lndstr *lnd = 0;	/* leader */
     struct nstr_sect ns;
     s_char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!snxtitem(&ni_land, EF_LAND, player->argp[1]))
 	return RET_SYN;

src/lib/commands/mfir.c

@@ -88,8 +88,8 @@ int
 multifire(void)
 {
     static int ef_with_guns[] = { EF_SECTOR, EF_SHIP, EF_LAND, EF_BAD };
-    s_char vbuf[20];
-    s_char *ptr;
+    char vbuf[20];
+    char *ptr;
     double range2, range;
     int trange;
     coord fx;
@@ -117,13 +117,13 @@ multifire(void)
     struct natstr *natp;
     struct nstr_item nbst;
     int type;
-    s_char *p;
+    char *p;
     int nfiring = 0;
     int ndefending = 0;
     union item_u item;
     struct emp_qelem fired, defended;
     double odds;
-    s_char buf[1024];
+    char buf[1024];
 
     emp_initque(&fired);
     emp_initque(&defended);

src/lib/commands/mine.c

@@ -105,7 +105,7 @@ landmine(void)
     int mines_wanted;
     int mines_laid;
     int total_mines_laid;
-    s_char prompt[128];
+    char prompt[128];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;

src/lib/commands/mobq.c

@@ -48,10 +48,10 @@ int
 mobq(void)
 {
     struct shpstr ship;
-    s_char *cp, *oldmq;
+    char *cp, *oldmq;
     int good, mobquota, count = 0;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_SAIL) {
 	pr("The SAIL option is not enabled, so this command is not valid.\n");

src/lib/commands/mora.c

@@ -50,9 +50,9 @@ morale(void)
     struct lndstr land;
     struct natstr *natp;
     int i, min;
-    s_char *p;
-    s_char mess[128];
-    s_char buf[1024];
+    char *p;
+    char mess[128];
+    char buf[1024];
 
     if (!snxtitem(&np, EF_LAND, player->argp[1]))
 	return RET_SYN;

src/lib/commands/name.c

@@ -49,9 +49,9 @@ int
 name(void)
 {
     struct shpstr ship;
-    s_char *p;
+    char *p;
     struct nstr_item nb;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;

src/lib/commands/navi.c

@@ -56,17 +56,17 @@ navi(void)
     struct emp_qelem ship_list;
     double minmob, maxmob;
     int together;
-    s_char *cp = 0;
+    char *cp = 0;
     struct shpstr *shp = 0;	/* flagship */
     struct nstr_sect ns;
     s_char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
-    s_char buf[1024];
-    s_char prompt[128];
-    s_char pathtaken[1024];	/* Doubtful we'll have a path longer than this */
-    s_char *pt = pathtaken;
+    char buf[1024];
+    char prompt[128];
+    char pathtaken[1024];	/* Doubtful we'll have a path longer than this */
+    char *pt = pathtaken;
 
     if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1]))
 	return RET_SYN;

src/lib/commands/news.c

@@ -64,8 +64,8 @@ news(void)
     short k;
     int sectors_were_taken = 0;
     natid i, j;
-    s_char num[128];
-    s_char *verb;
+    char num[128];
+    char *verb;
 
     if (!snxtitem(&nstr, EF_NEWS, "*"))
     	return RET_SYN;
@@ -176,11 +176,11 @@ news(void)
 static void
 preport(register struct nwsstr *np)
 {
-    register s_char *cp;
+    char *cp;
     register int i;
-    s_char buf[255];
-    s_char num[128];
-    s_char *ptr;
+    char buf[255];
+    char num[128];
+    char *ptr;
 
     cp = buf;
     sprintf(buf, "%-16.16s  ", ctime(&np->nws_when));

src/lib/commands/offe.c

@@ -51,8 +51,8 @@ static int do_loan(void);
 int
 offe(void)
 {
-    register s_char *cp;
-    s_char buf[1024];
+    char *cp;
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "loan or treaty? ", buf)) || !*cp)
 	return RET_SYN;
@@ -79,7 +79,7 @@ offe(void)
 static int
 do_treaty(void)
 {
-    register s_char *cp;
+    char *cp;
     register int ourcond;
     register int theircond;
     register int j;
@@ -90,8 +90,8 @@ do_treaty(void)
     time_t now;
     int n;
     struct natstr *natp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if ((n = natarg(player->argp[2], "Treaty offered to? ")) < 0)
 	return RET_SYN;
@@ -169,7 +169,7 @@ do_loan(void)
     struct lonstr loan;
     natid recipient;
     int n;
-    s_char prompt[128];
+    char prompt[128];
 
     if ((n = natarg(player->argp[2], "Lend to? ")) < 0)
 	return RET_SYN;

src/lib/commands/orde.c

@@ -78,10 +78,10 @@ orde(void)
     struct ichrstr *i1;
     coord p0x, p0y, p1x, p1y;
     int i;
-    s_char *p, *p1, *dest;
-    s_char buf1[128];
-    s_char buf[1024];
-    s_char prompt[128];
+    char *p, *p1, *dest;
+    char buf1[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;
@@ -322,7 +322,7 @@ orde(void)
 }
 
 static void
-eta_calc(struct shpstr *sp, s_char *path, int *len, int *nupdates)
+eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
 {
     double mobcost, mobil;
     int i;
@@ -423,10 +423,10 @@ sorde(void)
 {
     int nships = 0;
     int len, updates;
-    s_char *c;
+    char *c;
     struct nstr_item nb;
     struct shpstr ship;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;

src/lib/commands/orig.c

@@ -45,9 +45,9 @@
 int
 orig(void)
 {
-    s_char *p;
+    char *p;
     coord x, y;
-    s_char buf[1024];
+    char buf[1024];
     natid cnum;
     struct natstr *np;
 

src/lib/commands/para.c

@@ -59,7 +59,7 @@ para(void)
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -67,7 +67,7 @@ para(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = P_P;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))

src/lib/commands/path.c

@@ -58,13 +58,13 @@ path(void)
     coord cx, cy;
     int i;
     int y;
-    s_char *pp, *p;
+    char *pp, *p;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
     double move_cost;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "from sector : ", buf)) ||
 	!sarg_xy(p, &cx, &cy) || !getsect(cx, cy, &sect))

src/lib/commands/powe.c

@@ -80,7 +80,7 @@ powe(void)
     int use_targets = 0;
     int got_targets = 0;
     int no_numbers = 0;
-    s_char *p;
+    char *p;
 
     memset(targets, 0, sizeof(targets));
     natp = getnatp(player->cnum);

src/lib/commands/rada.c

@@ -49,7 +49,7 @@
 int
 rada(void)
 {
-    s_char *cp;
+    char *cp;
     double tf;
     double tech;
     struct nstr_item ni;
@@ -58,7 +58,7 @@ rada(void)
     struct lndstr land;
     struct sctstr sect;
     int from_unit;
-    s_char buf[1024];
+    char buf[1024];
 
     from_unit = (**player->argp == 'l');
 

src/lib/commands/rang.c

@@ -47,8 +47,8 @@ range(void)
     struct nstr_item np;
     struct plnstr plane;
     int i;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!snxtitem(&np, EF_PLANE, player->argp[1]))
 	return RET_SYN;

src/lib/commands/rea.c

@@ -53,13 +53,13 @@
 int
 rea(void)
 {
-    static s_char *telnames[] = {
+    static char *telnames[] = {
 	/* must follow TEL_ defines in tel.h */
 	"Telegram", "Announcement", "BULLETIN", "Production Report"
     };
-    register s_char *p;
-    register s_char *mbox;
-    s_char mbox_buf[256];	/* Maximum path length */
+    char *p;
+    char *mbox;
+    char mbox_buf[256];		/* Maximum path length */
     struct telstr tgm;
     FILE *telfp;
     int teles;
@@ -72,7 +72,7 @@ rea(void)
     time_t lastdate;
     int header;
     int filelen;
-    s_char kind[80];
+    char kind[80];
     int n;
     int num = player->cnum;
     struct natstr *np = getnatp(player->cnum);

src/lib/commands/reco.c

@@ -52,7 +52,7 @@ reco(void)
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     int cno;
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
@@ -61,7 +61,7 @@ reco(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))

src/lib/commands/reje.c

@@ -45,12 +45,12 @@
 int
 reje(void)
 {
-    register s_char *p;
+    char *p;
     int rel;
     int do_undo;
     struct natstr nat;
     struct nstr_item ni;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((p = getstarg(player->argp[1], "reject or accept? ", buf)) == 0)
 	return RET_SYN;

src/lib/commands/rese.c

@@ -60,7 +60,7 @@ rese(void)
     char *p;
     float price;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");

src/lib/commands/retr.c

@@ -47,7 +47,7 @@
 int
 retr(void)
 {
-    s_char *pq, *fl;
+    char *pq, *fl;
     int nships;
     struct nstr_item ni;
     struct shpstr ship;
@@ -55,8 +55,8 @@ retr(void)
     int rflags = -2;
     int zero;
     unsigned int x;
-    s_char buf1[1024];
-    s_char buf2[1024];
+    char buf1[1024];
+    char buf2[1024];
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
 	return RET_SYN;
@@ -195,15 +195,15 @@ retr(void)
 int
 lretr(void)
 {
-    s_char *pq, *fl;
+    char *pq, *fl;
     int nunits;
     struct nstr_item ni;
     struct lndstr land;
     int isarmy = 0;
     int rflags = -2;
     int zero;
-    s_char buf1[1024];
-    s_char buf2[1024];
+    char buf1[1024];
+    char buf2[1024];
     unsigned int x;
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))

src/lib/commands/rout.c

@@ -61,12 +61,12 @@ rout(void)
     int ry;
     i_type i_del;
     int dir;
-    s_char *p;
+    char *p;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
-    static s_char *buf = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
+    static char *buf = NULL;
     int i;
 
     if ((ip = whatitem(player->argp[1], "What item? ")) == 0)

src/lib/commands/scra.c

@@ -62,14 +62,14 @@ scra(void)
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct lchrstr *lp;
-    s_char *p;
+    char *p;
     i_type i;
     struct nstr_item ni2;
     struct plnstr plane;
     struct lndstr land;
     struct sctstr sect2;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     float eff;
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
@@ -95,7 +95,7 @@ scra(void)
 	return RET_SYN;
     if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
 	      || islist(p))) {
-	s_char y_or_n[80], bbuf[80];
+	char y_or_n[80], bbuf[80];
 
 	memset(y_or_n, 0, sizeof(y_or_n));
 	if (type == EF_SHIP) {

src/lib/commands/scut.c

@@ -64,7 +64,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     struct sctstr sect;
     struct mchrstr *mp;
     struct natstr *np;
-    s_char buf[512];
+    char buf[512];
     struct natstr *natp;
 
     mp = &mchr[(int)sp->shp_type];
@@ -138,9 +138,9 @@ scut(void)
     union item_u item;
     int type;
     struct mchrstr *mp;
-    s_char *p;
-    s_char prompt[128];
-    s_char buf[1024];
+    char *p;
+    char prompt[128];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
 	return RET_SYN;
@@ -165,7 +165,7 @@ scut(void)
 	return RET_SYN;
     if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
 	      || islist(p))) {
-	s_char y_or_n[80], bbuf[80];
+	char y_or_n[80], bbuf[80];
 
 	if (type == EF_SHIP) {
 	    if (*p == '*')

src/lib/commands/sect.c

@@ -54,13 +54,13 @@ sct(void)
     struct natstr *np;
     int ncond;
     int nsect;
-    s_char *ptr;
+    char *ptr;
     coord y, yval;
     int i;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
 
     nsect = 0;
     if (!snxtsct(&ns, player->argp[1]))

src/lib/commands/sell.c

@@ -75,7 +75,7 @@ sell(void)
     time_t now;
     int ii = 0;
     coord x, y;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");

src/lib/commands/set.c

@@ -69,7 +69,7 @@ set(void)
     int foundslot;
     int id;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");

src/lib/commands/setres.c

@@ -53,11 +53,11 @@ int
 setres(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((what = getstarg(player->argp[1],
 			 "Set What (iron, gold, oil, uranium, fertility)? ",

src/lib/commands/setsect.c

@@ -55,12 +55,12 @@ int
 setsector(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt, current;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
-    s_char char0, char1;
+    char buf[1024];
+    char char0, char1;
 
     if ((what = getstarg(player->argp[1],
 			 "Give What (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ",
@@ -360,10 +360,10 @@ resbenefit(natid who, int good)
 }
 
 void
-resnoise(struct sctstr *sptr, int public_amt, s_char *name, int old,
+resnoise(struct sctstr *sptr, int public_amt, char *name, int old,
 	 int new)
 {
-    s_char p[100];
+    char p[100];
 
     pr("%s of %s changed from %d to %d%%\n",
        name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);

src/lib/commands/show.c

@@ -45,13 +45,13 @@
 int
 show(void)
 {
-    s_char *p;
+    char *p;
     void (*cfunc)(int);
     void (*sfunc)(int);
     void (*bfunc)(int);
     struct natstr *natp;
     int tlev;
-    s_char buf[1024];
+    char buf[1024];
     int rlev;
 
     if (!(p = getstarg(player->argp[1],

src/lib/commands/skyw.c

@@ -141,7 +141,7 @@ showsat(struct sky **skypp, int x, int y)
     struct sky *todelete = 0;
     struct sky **prev;
     struct plchrstr *pcp;
-    s_char *name;
+    char *name;
     int nsat = 0;
 
     prev = 0;

src/lib/commands/strv.c

@@ -47,9 +47,9 @@
 #include "land.h"
 #include "commands.h"
 
-static void starv_sects(s_char *range);
-static void starv_ships(s_char *range);
-static void starv_units(s_char *range);
+static void starv_sects(char *range);
+static void starv_ships(char *range);
+static void starv_units(char *range);
 static void sect_hdr(void);
 static void ship_hdr(void);
 static void unit_hdr(void);
@@ -61,7 +61,7 @@ starve(void)
     int do_sects = 0;
     int do_ships = 0;
     int do_units = 0;
-    s_char range[1024];
+    char range[1024];
 
     if (opt_NOFOOD) {		/* no food - no work! */
 	pr("No food is required in this game\n");
@@ -98,7 +98,7 @@ starve(void)
 }
 
 static void
-starv_sects(s_char *range)
+starv_sects(char *range)
 {
     struct nstr_sect nstr;
     struct sctstr sect;
@@ -158,7 +158,7 @@ sect_hdr(void)
 }
 
 static void
-starv_ships(s_char *range)
+starv_ships(char *range)
 {
     struct nstr_item ni;
     struct shpstr ship;
@@ -206,7 +206,7 @@ ship_hdr(void)
 }
 
 static void
-starv_units(s_char *range)
+starv_units(char *range)
 {
     struct nstr_item ni;
     struct lndstr land;

src/lib/commands/surv.c

@@ -61,15 +61,15 @@ surv(void)
     struct natstr *np;
     struct sctstr sect;
     struct range range;
-    s_char *ptr;
+    char *ptr;
     struct nscstr cond[NS_NCOND];
     int ncond;
     int i;
-    s_char buf[1024];
+    char buf[1024];
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
 
     nsect = 0;
     ptr = getstarg(player->argp[1], "commodity or variable? ", buf);

src/lib/commands/swap.c

@@ -54,8 +54,8 @@ swaps(void)
 {
     struct sctstr secta, sectb;
     coord x, y;
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (!(p = getstarg(player->argp[1], "First sector : ", buf)) ||
 	!sarg_xy(p, &secta.sct_x, &secta.sct_y) ||

src/lib/commands/tend.c

@@ -51,7 +51,7 @@
 #include "commands.h"
 
 static void expose_ship(struct shpstr *s1, struct shpstr *s2);
-static int tend_land(struct shpstr *tenderp, s_char *units);
+static int tend_land(struct shpstr *tenderp, char *units);
 
 int
 tend(void)
@@ -71,9 +71,9 @@ tend(void)
     int transfer;
     int total;
     int type;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "Tend what commodity (or 'land')? ", buf)) || !*p)
@@ -205,7 +205,7 @@ expose_ship(struct shpstr *s1, struct shpstr *s2)
 }
 
 static int
-tend_land(struct shpstr *tenderp, s_char *units)
+tend_land(struct shpstr *tenderp, char *units)
 {
     struct nstr_item lni;
     struct nstr_item targets;
@@ -213,7 +213,7 @@ tend_land(struct shpstr *tenderp, s_char *units)
     struct lndstr land;
     struct plnstr plane;
     struct nstr_item pni;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&lni, EF_LAND, units))
 	return RET_SYN;

src/lib/commands/terr.c

@@ -46,12 +46,12 @@ int
 terr(void)
 {
     struct sctstr sect;
-    s_char *p;
+    char *p;
     int terr_n;
     int field;
     struct nstr_sect nstr;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;

src/lib/commands/thre.c

@@ -54,11 +54,11 @@ thre(void)
     struct nstr_sect nstr;
     int val;
     struct ichrstr *ip;
-    s_char *p;
+    char *p;
     int thresh;
     i_type type;
-    s_char prompt[128];
-    s_char buf[128];
+    char prompt[128];
+    char buf[128];
 
     if ((ip = whatitem(player->argp[1], "What commodity? ")) == 0)
 	return RET_SYN;

src/lib/commands/togg.c

@@ -45,7 +45,7 @@ togg(void)
 {
     int flag = 0;
     int pos;
-    s_char *name;
+    char *name;
     struct natstr *np;
 
     np = getnatp(player->cnum);

src/lib/commands/torp.c

@@ -70,14 +70,14 @@ torp(void)
     double hitchance;
     struct shpstr vship;
     struct shpstr sub;
-    s_char *ptr;
+    char *ptr;
     double mobcost;
     struct mchrstr *mcp;
     struct nstr_item nbst;
-    s_char buf[1024];
-    s_char *sav;
+    char buf[1024];
+    char *sav;
     int ntorping = 0;
-    s_char prompt[128];
+    char prompt[128];
 
     if (!(sav = getstarg(player->argp[1], "From ship(s)? ", buf)))
 	return RET_SYN;
@@ -470,7 +470,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
     return 1;
 }
 
-s_char *
+char *
 prsub(struct shpstr *sp)
 {
     if (mchr[(int)sp->shp_type].m_flags & M_SUB)

src/lib/commands/trad.c

@@ -79,7 +79,7 @@ trad(void)
     double tleft;
     double tally;
     int q;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");

src/lib/commands/upgr.c

@@ -58,8 +58,8 @@ static int supgr(void);
 int
 upgr(void)
 {
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
 	return RET_SYN;

src/lib/commands/wing.c

@@ -47,10 +47,10 @@ wing(void)
 
     struct plnstr plane;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "wing? ", buf)))
 	return RET_SYN;

src/lib/commands/work.c

@@ -54,9 +54,9 @@ work(void)
     struct sctstr sect;
     struct lndstr land;
     int work_amt, eff_amt, w;
-    s_char *p;
+    char *p;
     coord donex = 0, doney = 1;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;

src/lib/commands/zdon.c

@@ -66,7 +66,7 @@ zdon(void)
 {
     natid whichcnum;
     struct natstr *natp;
-    register s_char *p;
+    char *p;
 
     int update;
     int checking;
@@ -74,7 +74,7 @@ zdon(void)
     int totpop;
     int totwant;
     int dowant;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_DEMANDUPDATE) {
 	pr("Demand updates are not enabled.\n");

src/lib/common/mailbox.c

@@ -38,8 +38,8 @@
 #include "optlist.h"
 #include <stdio.h>
 
-s_char *
-mailbox(s_char *buf, natid cn)
+char *
+mailbox(char *buf, natid cn)
 {
     (void)sprintf(buf, "%s%d", telfil, cn);
     return buf;

src/lib/common/maps.c

@@ -51,7 +51,7 @@
 #include "optlist.h"
 
 static int bmnxtsct(struct nstr_sect *);
-static s_char map_char(unsigned char type, natid own, int owner_or_god);
+static char map_char(unsigned char type, natid own, int owner_or_god);
 
 int
 draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
@@ -67,8 +67,8 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
     static unsigned char *bitmap = NULL;
-    static s_char *wmapbuf = NULL;
-    static s_char **wmap = NULL;
+    static char *wmapbuf = NULL;
+    static char **wmap = NULL;
 
     if (!wmapbuf)
 	wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
@@ -153,7 +153,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
 	}
     } else {
 	struct sctstr sect;
-	s_char mapch;
+	char mapch;
 	int changed = 0;
 
 	if (!player->god) {
@@ -218,7 +218,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
 	}
     }
     if (map_flags & MAP_HIGH) {
-	s_char *ptr;
+	char *ptr;
 	struct sctstr sect;
 
 	snxtsct_rewind(nsp);
@@ -287,7 +287,7 @@ bmnxtsct(struct nstr_sect *np)
  * Return character to use in maps for sector type TYPE owned by OWN.
  * If OWNER_OR_GOD, the map is for the sector's owner or a deity.
  */
-static s_char
+static char
 map_char(unsigned char type, natid own, int owner_or_god)
 {
     if (type > SCT_MAXDEF) {
@@ -352,16 +352,16 @@ bmaps_intersect(natid a, natid b)
 /* Note that this requires that the BMAP is mapped into memory */
 
 int
-share_bmap(natid from, natid to, struct nstr_sect *ns, s_char des,
-	   s_char *from_name)
+share_bmap(natid from, natid to, struct nstr_sect *ns, char des,
+	   char *from_name)
 {
-    s_char *from_bmap = ef_ptr(EF_BMAP, from);
-    s_char *to_bmap = ef_ptr(EF_BMAP, to);
+    char *from_bmap = ef_ptr(EF_BMAP, from);
+    char *to_bmap = ef_ptr(EF_BMAP, to);
     int n = 0;
     struct sctstr sect;
-    s_char fromdes;
-    s_char todes;
-    s_char from_des = *from_name;
+    char fromdes;
+    char todes;
+    char from_des = *from_name;
 
     if (isalpha(from_des))
 	from_des &= ~0x20;

src/lib/common/path.c

@@ -59,7 +59,7 @@ struct bestp {
     struct as_data *adp;
 };
 
-static int bp_path(struct as_path *pp, s_char *buf);
+static int bp_path(struct as_path *pp, char *buf);
 static int bp_neighbors(struct as_coord c, struct as_coord *cp, void *);
 static double bp_lbcost(struct as_coord from, struct as_coord to, void *);
 static double bp_realcost(struct as_coord from, struct as_coord to, void *);
@@ -96,7 +96,7 @@ bp_init(void)
  * string in path.  Return 0 on success, -1 on error.
  */
 static int
-best_path(struct sctstr *from, struct sctstr *to, s_char *path,
+best_path(struct sctstr *from, struct sctstr *to, char *path,
 	  int mob_type)
 {
     static struct bestp *mybestpath;
@@ -138,10 +138,10 @@ best_path(struct sctstr *from, struct sctstr *to, s_char *path,
  * success, -1 on failure.
  */
 static int
-bp_path(struct as_path *pp, s_char *buf)
+bp_path(struct as_path *pp, char *buf)
 {
     struct as_path *np;
-    s_char *cp = buf;
+    char *cp = buf;
     int dx, dy;
     int n;
 
@@ -301,7 +301,7 @@ bp_clear_cachepath(void)
 }
 
 double
-pathcost(struct sctstr *start, s_char *path, int mob_type)
+pathcost(struct sctstr *start, char *path, int mob_type)
 {
     struct sctstr *sectp = (void *)empfile[EF_SECTOR].cache;
     unsigned i;
@@ -338,16 +338,16 @@ pathcost(struct sctstr *start, s_char *path, int mob_type)
     return cost;
 }
 
-s_char *
-BestDistPath(s_char *path,
+char *
+BestDistPath(char *path,
 	     struct sctstr *from,
 	     struct sctstr *to, double *cost, int mob_type)
 {
     return BestLandPath(path, from, to, cost, mob_type);
 }
 
-s_char *
-BestLandPath(s_char *path,
+char *
+BestLandPath(char *path,
 	     struct sctstr *from,
 	     struct sctstr *to, double *cost, int mob_type)
 {
@@ -364,8 +364,8 @@ BestLandPath(s_char *path,
     return path;
 }
 
-s_char *
-BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
+char *
+BestShipPath(char *path, int fx, int fy, int tx, int ty, int owner)
 {
     char *map;
 
@@ -376,8 +376,8 @@ BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
     return bestownedpath(path, map, fx, fy, tx, ty, owner);
 }
 
-s_char *
-BestAirPath(s_char *path, int fx, int fy, int tx, int ty)
+char *
+BestAirPath(char *path, int fx, int fy, int tx, int ty)
 {
     return bestownedpath(path, 0, fx, fy, tx, ty, -1);
 }

src/lib/gen/copy.c

@@ -44,11 +44,11 @@
  * null terminate
  */
 void
-blankfill(s_char *ptr, register struct range *range, int size)
+blankfill(char *ptr, struct range *range, int size)
 {
-    register s_char *p;
-    register int row;
-    register int col;
+    char *p;
+    int row;
+    int col;
 
     for (row = 0; row < range->height; row++) {
 	col = (range->width + 1) * (size + 1) / 2 - 1;

src/lib/gen/emp_config.c

@@ -67,7 +67,7 @@ struct keymatch configkeys[] = {
 #undef	EMP_CONFIG_C_OUTPUT
 };
 
-static struct keymatch *keylookup(s_char *key, struct keymatch tbl[]);
+static struct keymatch *keylookup(char *key, struct keymatch tbl[]);
 static void set_dirs(char *);
 
 /*
@@ -159,9 +159,9 @@ done:
 
 /* find the key in the table */
 static struct keymatch *
-keylookup(register s_char *command, struct keymatch *tbl)
+keylookup(char *command, struct keymatch *tbl)
 {
-    register struct keymatch *kp;
+    struct keymatch *kp;
 
     if (command == 0 || *command == 0)
 	return 0;

src/lib/gen/io.c

@@ -126,7 +126,7 @@ io_close(struct iop *iop)
 int
 io_input(struct iop *iop, int waitforinput)
 {
-    s_char buf[IO_BUFSIZE];
+    char buf[IO_BUFSIZE];
     int cc;
 
     /* Not a read IOP */
@@ -278,7 +278,7 @@ io_output(struct iop *iop, int waitforoutput)
 }
 
 int
-io_peek(struct iop *iop, s_char *buf, int nbytes)
+io_peek(struct iop *iop, char *buf, int nbytes)
 {
     if ((iop->flags & IO_READ) == 0)
 	return -1;
@@ -286,7 +286,7 @@ io_peek(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_read(struct iop *iop, s_char *buf, int nbytes)
+io_read(struct iop *iop, char *buf, int nbytes)
 {
     int cc;
 
@@ -299,7 +299,7 @@ io_read(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_write(struct iop *iop, s_char *buf, int nbytes, int doWait)
+io_write(struct iop *iop, char *buf, int nbytes, int doWait)
 {
     int len;
 
@@ -335,7 +335,7 @@ io_output_all(struct iop *iop)
 }
 
 int
-io_gets(struct iop *iop, s_char *buf, int nbytes)
+io_gets(struct iop *iop, char *buf, int nbytes)
 {
     if ((iop->flags & IO_READ) == 0)
 	return -1;
@@ -343,7 +343,7 @@ io_gets(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_puts(struct iop *iop, s_char *buf)
+io_puts(struct iop *iop, char *buf)
 {
     if ((iop->flags & IO_WRITE) == 0)
 	return -1;

src/lib/gen/ioqueue.c

@@ -49,14 +49,14 @@
 #include "queue.h"
 #include "ioqueue.h"
 
-static int ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc,
+static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc,
 		     register int stopc);
 #if !defined(_WIN32)
 static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov,
 		    register int max);
 #endif
-static int ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc);
-static int appendcc(struct ioqueue *ioq, s_char *buf, int cc);
+static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
+static int appendcc(struct ioqueue *ioq, char *buf, int cc);
 static int removecc(struct ioqueue *ioq, register int cc);
 
 #if defined(_WIN32)
@@ -123,7 +123,7 @@ ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc)
  * number of bytes actually found.
  */
 int
-ioq_peek(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_peek(struct ioqueue *ioq, char *buf, int cc)
 {
     return ioqtobuf(ioq, buf, cc);
 }
@@ -135,7 +135,7 @@ ioq_dequeue(struct ioqueue *ioq, int cc)
 }
 
 void
-ioq_append(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_append(struct ioqueue *ioq, char *buf, int cc)
 {
     appendcc(ioq, buf, cc);
 }
@@ -152,7 +152,7 @@ ioq_qsize(struct ioqueue *ioq)
  * no input is available
  */
 int
-ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_gets(struct ioqueue *ioq, char *buf, int cc)
 {
     int nbytes;
     int actual;
@@ -173,7 +173,7 @@ ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
 }
 
 int
-ioq_puts(struct ioqueue *ioq, s_char *buf)
+ioq_puts(struct ioqueue *ioq, char *buf)
 {
     return appendcc(ioq, buf, strlen(buf));
 }
@@ -189,14 +189,14 @@ ioq_puts(struct ioqueue *ioq, s_char *buf)
  * left for a higher level.
  */
 static int
-ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
+ioqtobuf(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     struct emp_qelem *qp;
     struct emp_qelem *head;
     register int nbytes;
     register int nleft;
-    register s_char *offset;
+    char *offset;
 
     nleft = cc;
     offset = buf;
@@ -223,7 +223,7 @@ ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
  * terminating on the stop character.
  */
 static int
-ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc, register int stopc)
+ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, register int stopc)
 {
     register int nbytes;
     register s_char *p;
@@ -294,7 +294,7 @@ ioqtoiov(struct ioqueue *ioq, struct iovec *iov, register int max)
  * append a buffer to the end of the ioq.
  */
 static int
-appendcc(struct ioqueue *ioq, s_char *buf, int cc)
+appendcc(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     int len;

src/lib/gen/numstr.c

@@ -37,16 +37,16 @@
 #include "misc.h"
 #include "gen.h"
 
-s_char *
-numstr(s_char *buf, int n)
+char *
+numstr(char *buf, int n)
 {
-    static s_char *numnames[] = {
+    static char *numnames[] = {
 	"zero", "one", "two", "three", "four", "five", "six",
 	"seven", "eight", "nine", "ten", "eleven", "twelve",
 	"thirteen", "fourteen", "fifteen", "sixteen",
 	"seventeen", "eighteen", "nineteen",
     };
-    static s_char *tennames[] = {
+    static char *tennames[] = {
 	"", "", "twenty", "thirty", "forty", "fifty",
 	"sixty", "seventy", "eighty", "ninety",
 	"hundred", "hundred ten", "hundred twenty",
@@ -71,10 +71,10 @@ numstr(s_char *buf, int n)
     return buf;
 }
 
-s_char *
+char *
 effadv(int n)
 {
-    static s_char *effadv_list[] = {
+    static char *effadv_list[] = {
 	"minimally", "partially", "moderately", "completely",
     };
 

src/lib/gen/onearg.c

@@ -37,10 +37,10 @@
 #include "gen.h"
 
 int
-onearg(s_char *arg, s_char *prompt)
+onearg(char *arg, char *prompt)
 {
     int n;
-    s_char buf[1024];
+    char buf[1024];
 
     if (arg == 0 || *arg == 0) {
 	if ((arg = getstring(prompt, buf)) == 0)

src/lib/gen/plur.c

@@ -35,19 +35,19 @@
 
 #include "prototypes.h"
 
-s_char *
+char *
 splur(int n)
 {
     return n == 1 ? "" : "s";
 }
 
-s_char *
+char *
 esplur(int n)
 {
     return n == 1 ? "" : "es";
 }
 
-s_char *
+char *
 iesplur(int n)
 {
     return n == 1 ? "y" : "ies";

src/lib/player/empdis.c

@@ -124,8 +124,8 @@ log_last_commands(void)
 int
 explain(void)
 {
-    register s_char *format;
-    register int i;
+    char *format;
+    int i;
 
     pr("\t\tCurrent EMPIRE Command List\n"
        "\t\t------- ------ ------- ----\n"

src/lib/player/nat.c

@@ -41,7 +41,7 @@
 #include <fcntl.h>
 
 int
-natbyname(s_char *name, natid *result)
+natbyname(char *name, natid *result)
 {
     struct natstr *np;
     int i;
@@ -57,7 +57,7 @@ natbyname(s_char *name, natid *result)
 }
 
 int
-natpass(int cn, s_char *pass)
+natpass(int cn, char *pass)
 {
     struct natstr *np;
 

src/lib/subs/aircombat.c

@@ -65,7 +65,7 @@ static void ac_dog(struct plist *ap, struct plist *dp);
 
 void
 ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
-	     coord x, coord y, s_char *path, int mission_flags,
+	     coord x, coord y, char *path, int mission_flags,
 	     int no_air_defense, struct emp_qelem *obomb,
 	     struct emp_qelem *oesc)
 {
@@ -78,7 +78,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
     int unfriendly[MAXNOC];
     int overfly[MAXNOC];
     struct emp_qelem ilist[MAXNOC], *qp;
-    s_char mypath[1024];
+    char mypath[1024];
     int myp;
     int civ, mil;
     natid plane_owner;
@@ -602,8 +602,8 @@ ac_dog(struct plist *ap, struct plist *dp)
     int intensity;
     natid att_own, def_own;
     int adam, ddam;
-    s_char mesg[1024];
-    s_char temp[14];
+    char mesg[1024];
+    char temp[14];
 
     att_own = ap->plane.pln_own;
     def_own = dp->plane.pln_own;
@@ -694,11 +694,11 @@ ac_dog(struct plist *ap, struct plist *dp)
  */
 void
 ac_planedamage(struct plist *plp, natid from, int dam, natid other,
-	       int checkabort, int show, s_char *mesg)
+	       int checkabort, int show, char *mesg)
 {
     struct plnstr *pp;
     int disp;
-    s_char dmess[255];
+    char dmess[255];
     int eff;
     struct shpstr ship;
     struct lndstr land;
@@ -953,7 +953,7 @@ ac_fireflak(struct emp_qelem *list, natid from, natid other, int guns)
     int diff;
     struct emp_qelem *qp;
     struct emp_qelem *next;
-    s_char msg[255];
+    char msg[255];
 
     plp = (struct plist *)list->q_forw;
 

src/lib/subs/askyn.c

@@ -42,9 +42,9 @@
  * If they don't answer 'y' or 'Y', return 0
  */
 int
-confirm(s_char *promptstring)
+confirm(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
     if (getstring(promptstring, y_or_n) == 0)
@@ -60,9 +60,9 @@ confirm(s_char *promptstring)
  * return 1 for y or Y, and 0 for n or N
  */
 int
-askyn(s_char *promptstring)
+askyn(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
     while (getstring(promptstring, y_or_n)) {

src/lib/subs/attsub.c

@@ -127,7 +127,7 @@ att_combat_init(struct combat *com, int type)
 
 /* print a combat object with optional preposition */
 
-static s_char *
+static char *
 pr_com(int inon, struct combat *com, natid who)
 {
     if (com->type == EF_SECTOR) {
@@ -148,7 +148,7 @@ pr_com(int inon, struct combat *com, natid who)
     }
 }
 
-static s_char *
+static char *
 prcom(int inon, struct combat *com)
 {
     return pr_com(inon, com, player->cnum);
@@ -452,7 +452,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
 {
     struct sctstr sect;
     int rel;
-    s_char y_or_n[512];
+    char y_or_n[512];
     struct natstr *natp;
 
     if (player->aborted)
@@ -708,8 +708,8 @@ int
 att_ask_support(int offset, int *fortp, int *shipp, int *landp,
 		int *planep)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
     *fortp = *shipp = *landp = *planep = 1;
 
     if (player->argp[offset] != NULL) {
@@ -880,7 +880,7 @@ ask_off(int combat_mode, struct combat *off, struct combat *def)
 {
     int attacking_mil;
     int mob_support;
-    s_char prompt[512];
+    char prompt[512];
 
     if (att_get_combat(off, 0) <= 0)
 	return 0;
@@ -959,7 +959,7 @@ ask_olist(int combat_mode, struct combat *off, struct combat *def,
     int count = 0;
     int maxland = 0;
     int first_time = 1;
-    s_char prompt[512];
+    char prompt[512];
 
     if (def->type == EF_LAND)
 	return;
@@ -1342,7 +1342,7 @@ get_land(int combat_mode, struct combat *def, int uid, struct llist *llp,
 	 int victim_land)
 {
     struct lndstr *lp = &llp->land;
-    s_char buf[512];
+    char buf[512];
 
     getland(uid, lp);
 
@@ -1473,8 +1473,8 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
     int radius;
     int origx, origy;
     double eff = att_combat_eff(def);
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     /*
      *
@@ -1580,7 +1580,7 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
 /* Pop off shells and fly bombing missions to get your attack multiplier up */
 
 static double
-get_osupport(s_char *outs, struct combat *def, int fort_sup, int ship_sup,
+get_osupport(char *outs, struct combat *def, int fort_sup, int ship_sup,
 	     int land_sup, int plane_sup)
 {
     double osupport = 1.0;
@@ -1619,7 +1619,7 @@ get_osupport(s_char *outs, struct combat *def, int fort_sup, int ship_sup,
 /* Pop off shells and fly bombing missions to get your defense multiplier up */
 
 static double
-get_dsupport(s_char *outs, struct emp_qelem *list, struct combat *def,
+get_dsupport(char *outs, struct emp_qelem *list, struct combat *def,
 	     int ototal, int dtotal)
 {
     double dsupport = 1.0;
@@ -1708,8 +1708,8 @@ att_get_support(int combat_mode, int ofort, int oship, int oland,
 		double *osupportp, double *dsupportp, int a_engineer)
 {
     int ototal, dtotal;
-    s_char osupports[512];
-    s_char dsupports[512];
+    char osupports[512];
+    char dsupports[512];
 
     if (combat_mode == A_PARA)
 	*osupports = '\0';
@@ -1801,7 +1801,7 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
     int news_item;
     int recalctime;
     double odds;
-    s_char *action;
+    char *action;
 
     ototal = get_ototal(combat_mode, off, olist, osupport,
 			combat_mode != A_PARA);
@@ -2154,7 +2154,7 @@ send_reacting_units_home(struct emp_qelem *list)
 {
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[1024];
+    char buf[1024];
 
     for (qp = list->q_forw; qp != list; qp = next) {
 	next = qp->q_forw;
@@ -2199,7 +2199,7 @@ take_def(int combat_mode, struct emp_qelem *list, struct combat *off,
     int n;
     int occuppied = 0;
     struct llist *llp, *delete_me = 0;
-    s_char buf[1024];
+    char buf[1024];
     struct sctstr sect;
     struct shpstr ship;
     struct lndstr land;
@@ -2281,8 +2281,8 @@ ask_move_in(struct combat *off, struct emp_qelem *olist,
     int n;
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[512];
-    s_char prompt[512];
+    char buf[512];
+    char prompt[512];
     s_char land_answer[1024];
     s_char *answerp;
 
@@ -2351,7 +2351,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist,
 {
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[512];
+    char buf[512];
 
     if (QEMPTY(olist))
 	return;
@@ -2450,9 +2450,9 @@ ask_move_in_off(struct combat *off, struct combat *def)
     int mob_support;
     int num_mil, dam = 0, left;
     double d, weight;
-    s_char prompt[512];
-    s_char buf[1024];
-    s_char *p;
+    char prompt[512];
+    char buf[1024];
+    char *p;
 
     if (att_get_combat(off, 0) <= 0)
 	return;

src/lib/subs/border.c

@@ -39,7 +39,7 @@
 #include "optlist.h"
 
 void
-border(struct range *rp, s_char *prefstr, s_char *sep)
+border(struct range *rp, char *prefstr, char *sep)
 
 				/* prefixes each line */
 				/* separates the numbers */

src/lib/subs/caploss.c

@@ -42,7 +42,7 @@
 #include "optlist.h"
 
 void
-caploss(struct sctstr *sp, natid coun, s_char *msg)
+caploss(struct sctstr *sp, natid coun, char *msg)
 {
     struct natstr *natp;
     struct lonstr loan;

src/lib/subs/chkmoney.c

@@ -38,10 +38,10 @@
 #include "prototypes.h"
 
 int
-chkmoney(long int cost, long int cash, s_char *argp)
+chkmoney(long int cost, long int cash, char *argp)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (cash > 0 && cost > cash / 2) {
 	pr("This operation will cost you $%ld, and you only have $%ld.\n",
@@ -58,10 +58,10 @@ chkmoney(long int cost, long int cash, s_char *argp)
 
 int
 check_cost(int looping, int cost, long int cash, int *warnedp,
-	   s_char *argp)
+	   char *argp)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (looping && cash > 0 && player->dolcost + cost > cash
 	&& *warnedp < 2) {