Index: gnu/usr.bin/man/lib/gripes.c
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/man/lib/gripes.c,v
retrieving revision 1.1
diff -u -r1.1 gripes.c
--- gnu/usr.bin/man/lib/gripes.c	17 Jun 2003 02:50:14 -0000	1.1
+++ gnu/usr.bin/man/lib/gripes.c	24 Aug 2008 22:48:26 -0000
@@ -28,8 +28,7 @@
 extern char *prognam;
 
 void
-gripe_no_name (section)
-     char *section;
+gripe_no_name (char *section)
 {
   if (section)
     fprintf (stderr, "What manual page do you want from section %s?\n",
@@ -41,8 +40,7 @@
 }
 
 void
-gripe_reading_man_file (name)
-     char *name;
+gripe_reading_man_file (char *name)
 {
   fprintf (stderr, "Read access denied for file %s\n", name);
 
@@ -50,9 +48,7 @@
 }
 
 void
-gripe_converting_name (name, to_cat)
-     char *name;
-     int to_cat;
+gripe_converting_name (char *name, int to_cat)
 {
   if (to_cat)
     fprintf (stderr, "Error converting %s to cat name\n", name);
@@ -65,8 +61,7 @@
 }
 
 void
-gripe_system_command (status)
-     int status;
+gripe_system_command (int status)
 {
   fprintf (stderr, "Error executing formatting or display command.\n");
   fprintf (stderr, "system command exited with status %d\n", status);
@@ -75,8 +70,7 @@
 }
 
 void
-gripe_not_found (name, section)
-     char *name, *section;
+gripe_not_found (char *name, char *section)
 {
   if (section)
     fprintf (stderr, "No entry for %s in section %s of the manual\n",
@@ -88,8 +82,7 @@
 }
 
 void
-gripe_incompatible (s)
-     char *s;
+gripe_incompatible (char *s)
 {
   fprintf (stderr, "%s: incompatible options %s\n", prognam, s);
 
@@ -99,8 +92,7 @@
 }
 
 void
-gripe_getting_mp_config (file)
-     char *file;
+gripe_getting_mp_config (char *file)
 {
   fprintf (stderr, "%s: unable to find the file %s\n", prognam, file);
 
@@ -110,8 +102,7 @@
 }
 
 void
-gripe_reading_mp_config (file)
-     char *file;
+gripe_reading_mp_config (char *file)
 {
   fprintf (stderr, "%s: unable to make sense of the file %s\n", prognam, file);
 
@@ -121,8 +112,7 @@
 }
 
 void
-gripe_invalid_section (section)
-     char *section;
+gripe_invalid_section (char *section)
 {
   fprintf (stderr, "%s: invalid section (%s) selected\n", prognam, section);
 
@@ -132,7 +122,7 @@
 }
 
 void
-gripe_manpath ()
+gripe_manpath (void)
 {
   fprintf (stderr, "%s: manpath is null\n", prognam);
 
@@ -142,9 +132,7 @@
 }
 
 void
-gripe_alloc (bytes, object)
-     int bytes;
-     char *object;
+gripe_alloc (int bytes, char *object)
 {
   fprintf (stderr, "%s: can't malloc %d bytes for %s\n",
 	   prognam, bytes, object);
@@ -155,8 +143,7 @@
 }
 
 void
-gripe_roff_command_from_file (file)
-     char *file;
+gripe_roff_command_from_file (char *file)
 {
   fprintf (stderr, "Error parsing *roff command from file %s\n", file);
 
@@ -164,7 +151,7 @@
 }
 
 void
-gripe_roff_command_from_env ()
+gripe_roff_command_from_env (void)
 {
   fprintf (stderr, "Error parsing MANROFFSEQ.  Using system defaults.\n");
 
@@ -172,7 +159,7 @@
 }
 
 void
-gripe_roff_command_from_command_line ()
+gripe_roff_command_from_command_line (void)
 {
   fprintf (stderr, "Error parsing *roff command from command line.\n");
 
Index: gnu/usr.bin/man/lib/util.c
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/man/lib/util.c,v
retrieving revision 1.1
diff -u -r1.1 util.c
--- gnu/usr.bin/man/lib/util.c	17 Jun 2003 02:50:14 -0000	1.1
+++ gnu/usr.bin/man/lib/util.c	24 Aug 2008 23:03:35 -0000
@@ -37,8 +37,7 @@
  * Extract last element of a name like /foo/bar/baz.
  */
 char *
-mkprogname (s)
-     register char *s;
+mkprogname (char *s)
 {
   char *t;
 
@@ -52,10 +51,9 @@
 }
 
 void
-downcase (s)
-     unsigned char *s;
+downcase (unsigned char *s)
 {
-  register unsigned char c;
+  unsigned char c;
   while ((c = *s) != '\0')
     {
       if (isalpha (c))
@@ -76,15 +74,13 @@
  *   stat on a and b fails  returns   -3
  */
 int
-is_newer (fa, fb)
-  register char *fa;
-  register char *fb;
+is_newer (char *fa, char *fb)
 {
   struct stat fa_sb;
   struct stat fb_sb;
-  register int fa_stat;
-  register int fb_stat;
-  register int status = 0;
+  int fa_stat;
+  int fb_stat;
+  int status = 0;
 
   fa_stat = stat (fa, &fa_sb);
   if (fa_stat != 0)
@@ -104,11 +100,10 @@
  * Is path a directory?
  */
 int
-is_directory (path)
-     char *path;
+is_directory (char *path)
 {
   struct stat sb;
-  register int status;
+  int status;
 
   status = stat (path, &sb);
 
@@ -124,8 +119,7 @@
  * (handy for counting successes :-).
  */
 int
-do_system_command (command)
-     char *command;
+do_system_command (char *command)
 {
   int status = 0;
   extern int debug;
Index: gnu/usr.bin/man/man/glob.c
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/man/man/glob.c,v
retrieving revision 1.2
diff -u -r1.2 glob.c
--- gnu/usr.bin/man/man/glob.c	3 Feb 2004 19:22:59 -0000	1.2
+++ gnu/usr.bin/man/man/glob.c	24 Aug 2008 23:04:01 -0000
@@ -115,8 +115,7 @@
 static int glob_match_after_star ();
 
 #ifdef __DragonFly__
-static int collate_range_cmp (a, b)
-	int a, b;
+static int collate_range_cmp (int a, int b)
 {
 	int r;
 	static char s[2][2];
@@ -134,11 +133,10 @@
 /* Return nonzero if PATTERN has any special globbing chars in it.  */
 
 int
-glob_pattern_p (pattern)
-     char *pattern;
+glob_pattern_p (char *pattern)
 {
-  register char *p = pattern;
-  register char c;
+  char *p = pattern;
+  char c;
   int open = 0;
 
   while ((c = *p++) != '\0')
@@ -186,12 +184,10 @@
    `*' and `?' do not match `.' at the beginning of TEXT.  */
 
 int
-glob_match (pattern, text, dot_special)
-     char *pattern, *text;
-     int dot_special;
+glob_match (char *pattern, char *text, int dot_special)
 {
-  register char *p = pattern, *t = text;
-  register char c;
+  char *p = pattern, *t = text;
+  char c;
 
   while ((c = *p++) != '\0')
     switch (c)
@@ -215,7 +211,7 @@
 
       case '[':
 	{
-	  register char c1 = *t++;
+	  char c1 = *t++;
 	  int invert;
 	  char *cp1 = p;
 
@@ -230,7 +226,7 @@
 	  c = *p++;
 	  while (1)
 	    {
-	      register char cstart = c, cend = c;
+	      char cstart = c, cend = c;
 
 	      if (c == '\\')
 		{
@@ -303,11 +299,10 @@
 /* Like glob_match, but match PATTERN against any final segment of TEXT.  */
 
 static int
-glob_match_after_star (pattern, text)
-     char *pattern, *text;
+glob_match_after_star (char *pattern, char *text)
 {
-  register char *p = pattern, *t = text;
-  register char c, c1;
+  char *p = pattern, *t = text;
+  char c, c1;
 
   while ((c = *p++) == '?' || c == '*')
     if (c == '?' && *t++ == '\0')
@@ -349,9 +344,7 @@
    Look in errno for more information.  */
 
 char **
-glob_vector (pat, dir)
-     char *pat;
-     char *dir;
+glob_vector (char *pat, char *dir)
 {
   struct globval
   {
@@ -360,14 +353,14 @@
   };
 
   DIR *d;
-  register struct direct *dp;
+  struct direct *dp;
   struct globval *lastlink;
-  register struct globval *nextlink;
-  register char *nextname;
+  struct globval *nextlink;
+  char *nextname;
   unsigned int count;
   int lose;
-  register char **name_vector;
-  register unsigned int i;
+  char **name_vector;
+  unsigned int i;
 #ifdef ALLOCA_MISSING
   struct globval *templink;
 #endif
@@ -474,10 +467,9 @@
    Return NULL if out of memory.  */
 
 static char **
-glob_dir_to_array (dir, array)
-     char *dir, **array;
+glob_dir_to_array (char *dir, char **array)
 {
-  register unsigned int i, l;
+  unsigned int i, l;
   int add_slash = 0;
   char **result;
 
@@ -524,8 +516,7 @@
    do not match an initial period if noglob_dot_filenames is nonzero.  */
 
 char **
-glob_filename (pathname)
-     char *pathname;
+glob_filename (char *pathname)
 {
   char **result;
   unsigned int result_size;
@@ -565,7 +556,7 @@
   if (glob_pattern_p (directory_name))
     {
       char **directories;
-      register unsigned int i;
+      unsigned int i;
 
       if (directory_name[directory_len - 1] == '/')
 	directory_name[directory_len - 1] = '\0';
@@ -598,7 +589,7 @@
 	  else
 	    {
 	      char **array = glob_dir_to_array (directories[i], temp_results);
-	      register unsigned int l;
+	      unsigned int l;
 
 	      l = 0;
 	      while (array[l] != NULL)
@@ -673,7 +664,7 @@
  memory_error:
   if (result != NULL)
     {
-      register unsigned int i;
+      unsigned int i;
       for (i = 0; result[i] != NULL; ++i)
 	free (result[i]);
       free ((char *) result);
@@ -691,9 +682,7 @@
 
 #ifdef TEST
 
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   char **value;
   int i, optind;
Index: gnu/usr.bin/man/man/man.c
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/man/man/man.c,v
retrieving revision 1.9
diff -u -r1.9 man.c
--- gnu/usr.bin/man/man/man.c	10 Jul 2008 18:29:51 -0000	1.9
+++ gnu/usr.bin/man/man/man.c	24 Aug 2008 23:04:23 -0000
@@ -134,9 +134,7 @@
 #endif
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int status = 0;
   char *nextarg;
@@ -221,7 +219,7 @@
 }
 
 void
-usage ()
+usage (void)
 {
   static char usage_string[1024] = "%s, version %s\n\n";
 
@@ -290,9 +288,7 @@
 }
 
 char **
-add_dir_to_mpath_list (mp, p)
-     char **mp;
-     char *p;
+add_dir_to_mpath_list (char **mp, char *p)
 {
   int status;
 
@@ -320,14 +316,12 @@
  * Get options from the command line and user environment.
  */
 void
-man_getopt (argc, argv)
-     register int argc;
-     register char **argv;
-{
-  register int c;
-  register char *p;
-  register char *end;
-  register char **mp;
+man_getopt (int argc, char **argv)
+{
+  int c;
+  char *p;
+  char *end;
+  char **mp;
   extern void downcase ();
   extern char *manpath ();
 
@@ -524,11 +518,9 @@
  * named directories like .../man3f.  Yuk.
  */
 char *
-is_section (name, path)
-     char *name;
-     char *path;
+is_section (char *name, char *path)
 {
-  register char **vs;
+  char **vs;
   char *temp, *end, *loc;
   char **plist;
   int x;
@@ -580,11 +572,10 @@
  * Handle the apropos option.  Cheat by using another program.
  */
 void
-do_apropos (name)
-     register char *name;
+do_apropos (char *name)
 {
-  register int len;
-  register char *command;
+  int len;
+  char *command;
 
   len = strlen (APROPOS) + strlen (name) + 4;
 
@@ -602,11 +593,10 @@
  * Handle the whatis option.  Cheat by using another program.
  */
 void
-do_whatis (name)
-     register char *name;
+do_whatis (char *name)
 {
-  register int len;
-  register char *command;
+  int len;
+  char *command;
 
   len = strlen (WHATIS) + strlen (name) + 4;
 
@@ -625,13 +615,11 @@
  * or a name of the form ...man/cat1/name.1 to ...man/man1/name.1
  */
 char *
-convert_name (name, to_cat)
-     register char *name;
-     register int to_cat;
-{
-  register char *to_name;
-  register char *t1;
-  register char *t2 = NULL;
+convert_name (char *name, int to_cat)
+{
+  char *to_name;
+  char *t1;
+  char *t2 = NULL;
 
 #ifdef DO_COMPRESS
   if (to_cat)
@@ -703,12 +691,7 @@
  * Note that globbing is only done when the section is unspecified.
  */
 char **
-glob_for_file (path, section, longsec, name, cat)
-     char *path;
-     char *section;
-     char *longsec;
-     char *name;
-     int cat;
+glob_for_file (char *path, char *section, char *longsec, char *name, int cat)
 {
   char pathname[FILENAME_MAX];
   char **gf;
@@ -757,14 +740,9 @@
  * globbing.
  */
 char **
-make_name (path, section, longsec, name, cat)
-     char *path;
-     char *section;
-     char *longsec;
-     char *name;
-     int cat;
+make_name (char *path, char *section, char *longsec, char *name, int cat)
 {
-  register int i = 0;
+  int i = 0;
   static char *names[3];
   char buf[FILENAME_MAX];
 
@@ -798,8 +776,7 @@
 }
 
 char *
-get_expander (file)
-     char *file;
+get_expander (char *file)
 {
   char *end = file + (strlen (file) - 1);
 
@@ -826,10 +803,9 @@
  * Simply display the preformatted page.
  */
 int
-display_cat_file (file)
-     register char *file;
+display_cat_file (char *file)
 {
-  register int found;
+  int found;
   char command[FILENAME_MAX];
 
   found = 0;
@@ -857,9 +833,7 @@
  * the input file name is returned.
  */
 char *
-ultimate_source (name, path)
-     char *name;
-     char *path;
+ultimate_source (char *name, char *path)
 {
   static  char buf[BUFSIZ];
   static  char ult[FILENAME_MAX];
@@ -909,12 +883,7 @@
 }
 
 void
-add_directive (first, d, file, buf, bufsize)
-     int *first;
-     char *d;
-     char *file;
-     char *buf;
-     int bufsize;
+add_directive (int *first, char *d, char *file, char *buf, int bufsize)
 {
   if (strcmp (d, "") != 0)
     {
@@ -932,11 +901,7 @@
 }
 
 int
-parse_roff_directive (cp, file, buf, bufsize)
-  char *cp;
-  char *file;
-  char *buf;
-  int bufsize;
+parse_roff_directive (char *cp, char *file, char *buf, int bufsize)
 {
   char c;
   char *exp;
@@ -1061,8 +1026,7 @@
 }
 
 char *
-make_roff_command (file)
-     char *file;
+make_roff_command (char *file)
 {
 #if HAVE_LIBZ > 0
   gzFile fp;
@@ -1153,14 +1117,14 @@
 sig_t ohup, oint, oquit, oterm;
 static char temp[FILENAME_MAX];
 
-void cleantmp()
+void cleantmp(int signo __unused)
 {
 	unlink(temp);
 	exit(1);
 }
 
 void
-set_sigs()
+set_sigs(void)
 {
   ohup = signal(SIGHUP, cleantmp);
   oint = signal(SIGINT, cleantmp);
@@ -1169,7 +1133,7 @@
 }
 
 void
-restore_sigs()
+restore_sigs(void)
 {
   signal(SIGHUP, ohup);
   signal(SIGINT, oint);
@@ -1182,10 +1146,7 @@
  * 1 for success and 0 for failure.
  */
 int
-make_cat_file (path, man_file, cat_file, manid)
-     register char *path;
-     register char *man_file;
-     register char *cat_file;
+make_cat_file (char *path, char *man_file, char *cat_file, int manid)
 {
   int s, f;
   FILE *fp, *pp;
@@ -1344,13 +1305,10 @@
  * file at this point.
  */
 int
-format_and_display (path, man_file, cat_file)
-     register char *path;
-     register char *man_file;
-     register char *cat_file;
+format_and_display (char *path, char *man_file, char *cat_file)
 {
   int status;
-  register int found;
+  int found;
   char *roff_command;
   char command[FILENAME_MAX];
 
@@ -1481,18 +1439,13 @@
  * section.
  */
 int
-try_section (path, section, longsec, name, glob)
-     char *path;
-     char *section;
-     char *longsec;
-     char *name;
-     int glob;
-{
-  register int found = 0;
-  register int to_cat;
-  register int cat;
-  register char **names;
-  register char **np;
+try_section (char *path, char *section, char *longsec, char *name, int glob)
+{
+  int found = 0;
+  int to_cat;
+  int cat;
+  char **names;
+  char **np;
   static int arch_search;
   char buf[FILENAME_MAX];
 
@@ -1565,8 +1518,8 @@
     {
       for (np = names; *np != NULL; np++)
 	{
-	  register char *cat_file = NULL;
-	  register char *man_file;
+	  char *cat_file = NULL;
+	  char *man_file;
 
 	  man_file = ultimate_source (*np, path);
 
@@ -1602,13 +1555,12 @@
  *
  */
 int
-man (name)
-     char *name;
+man (char *name)
 {
-  register int found;
-  register int glob;
-  register char **mp;
-  register char **sp;
+  int found;
+  int glob;
+  char **mp;
+  char **sp;
 #ifdef __DragonFly__
   int l_found;
   char buf[FILENAME_MAX];
@@ -1734,7 +1686,7 @@
 }
 
 char **
-get_section_list ()
+get_section_list (void)
 {
   int i;
   char *p;
Index: gnu/usr.bin/man/manpath/manpath.c
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/man/manpath/manpath.c,v
retrieving revision 1.5
diff -u -r1.5 manpath.c
--- gnu/usr.bin/man/manpath/manpath.c	10 Jul 2008 18:29:51 -0000	1.5
+++ gnu/usr.bin/man/manpath/manpath.c	24 Aug 2008 23:04:38 -0000
@@ -63,9 +63,7 @@
  * Examine user's PATH and print a reasonable MANPATH.
  */
 int
-main(argc, argv)
-     int argc;
-     char **argv;
+main(int argc, char **argv)
 {
   int c;
   int quiet;
@@ -109,7 +107,7 @@
 }
 
 void
-usage ()
+usage (void)
 {
   fprintf (stderr, "usage: %s [-dLq]\n", prognam);
   exit (1);
@@ -135,12 +133,11 @@
  * Example: $HOME/bin will look for $HOME/man
  */
 char *
-manpath (perrs)
-     register int perrs;
+manpath (int perrs)
 {
-  register int len;
-  register char *manpathlist;
-  register char *path;
+  int len;
+  char *manpathlist;
+  char *path;
   int  get_dirlist ();
   char *def_path ();
   char *get_manpath ();
@@ -204,7 +201,7 @@
  * This is ugly.
  */
 int
-get_dirlist ()
+get_dirlist (void)
 {
   int i;
   char *bp;
@@ -334,12 +331,11 @@
  * and optional (if they exist) manpaths only.
  */
 char *
-def_path (perrs)
-     int perrs;
+def_path (int perrs)
 {
-  register int len;
-  register char *manpathlist, *p;
-  register DIRLIST *dlp;
+  int len;
+  char *manpathlist, *p;
+  DIRLIST *dlp;
 
   len = 0;
   dlp = list;
@@ -399,18 +395,16 @@
  * to the manpath.
  */
 char *
-get_manpath (perrs, path)
-     register int perrs;
-     register char *path;
+get_manpath (int perrs, char *path)
 {
-  register int len;
-  register char *tmppath;
-  register char *t;
-  register char *p;
-  register char **lp;
-  register char *end;
-  register char *manpathlist;
-  register DIRLIST *dlp;
+  int len;
+  char *tmppath;
+  char *t;
+  char *p;
+  char **lp;
+  char *end;
+  char *manpathlist;
+  DIRLIST *dlp;
   void add_dir_to_list ();
   char *has_subdirs ();
   int fnd = 0;
@@ -529,10 +523,7 @@
  * Add a directory to the manpath list if it isn't already there.
  */
 void
-add_dir_to_list (lp, dir, perrs)
-     char **lp;
-     char *dir;
-     int perrs;
+add_dir_to_list (char **lp, char *dir, int perrs)
 {
   extern char *strdup ();
   int status;
@@ -574,11 +565,10 @@
  * subdirectories.
  */
 char *
-has_subdirs (p)
-     register char *p;
+has_subdirs (char *p)
 {
   int len;
-  register char *t;
+  char *t;
 
   len = strlen (p);
 
Index: lib/libalias/alias_db.c
===================================================================
RCS file: /home/dcvs/src/lib/libalias/alias_db.c,v
retrieving revision 1.6
diff -u -r1.6 alias_db.c
--- lib/libalias/alias_db.c	5 Nov 2007 08:58:35 -0000	1.6
+++ lib/libalias/alias_db.c	24 Aug 2008 22:33:31 -0000
@@ -1976,7 +1976,7 @@
 
 
 struct in_addr
-GetDefaultAliasAddress()
+GetDefaultAliasAddress(void)
 {
     return aliasAddress;
 }
Index: lib/libatm/atm_addr.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/atm_addr.c,v
retrieving revision 1.3
diff -u -r1.3 atm_addr.c
--- lib/libatm/atm_addr.c	23 Sep 2004 21:39:08 -0000	1.3
+++ lib/libatm/atm_addr.c	24 Aug 2008 22:34:26 -0000
@@ -69,10 +69,7 @@
  *
  */
 int
-get_hex_atm_addr(in, out, len)
-	char	*in;
-	u_char	*out;
-	int	len;
+get_hex_atm_addr(char *in, u_char *out, int len)
 {
 	int	c_type, c_value, i, out_len, state, val = 0;
 
@@ -211,8 +208,7 @@
  *
  */
 char *
-format_atm_addr(addr)
-	Atm_addr *addr;
+format_atm_addr(Atm_addr *addr)
 {
 	int		i;
 	char		*nsap_format;
Index: lib/libatm/cache_key.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/cache_key.c,v
retrieving revision 1.2
diff -u -r1.2 cache_key.c
--- lib/libatm/cache_key.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libatm/cache_key.c	24 Aug 2008 22:34:53 -0000
@@ -66,11 +66,7 @@
  *
  */
 void
-scsp_cache_key(ap, ip, ol, op)
-	Atm_addr	*ap;
-	struct in_addr	*ip;
-	int		ol;
-	char 		*op;
+scsp_cache_key(Atm_addr *ap, struct in_addr *ip, int ol, char *op)
 {
 	int	i, len;
 	char	buff[32], digest[16];
Index: lib/libatm/ioctl_subr.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/ioctl_subr.c,v
retrieving revision 1.4
diff -u -r1.4 ioctl_subr.c
--- lib/libatm/ioctl_subr.c	23 Sep 2004 21:39:08 -0000	1.4
+++ lib/libatm/ioctl_subr.c	24 Aug 2008 22:38:02 -0000
@@ -85,9 +85,7 @@
  *
  */
 int
-do_info_ioctl(req, buf_len)
-	struct atminfreq	*req;
-	int 			buf_len;
+do_info_ioctl(struct atminfreq *req, int buf_len)
 {
 	int	rc, s;
 	caddr_t	buf;
@@ -151,9 +149,7 @@
  *
  */
 int
-get_vcc_info(intf, vccp)
-	char			*intf;
-	struct air_vcc_rsp	**vccp;
+get_vcc_info(char *intf, struct air_vcc_rsp **vccp)
 {
 	int	buf_len = sizeof(struct air_vcc_rsp) * 100;
 	struct atminfreq	air;
@@ -189,9 +185,7 @@
  *
  */
 int
-get_subnet_mask(intf, mask)
-	char			*intf;
-	struct sockaddr_in	*mask;
+get_subnet_mask(char *intf, struct sockaddr_in *mask)
 {
 	int			rc, s;
 	struct ifreq		req;
@@ -246,8 +240,7 @@
  *
  */
 int
-get_mtu(intf)
-	char	*intf;
+get_mtu(char *intf)
 {
 	int			rc, s;
 	struct ifreq		req;
@@ -300,8 +293,7 @@
  *
  */
 int
-verify_nif_name(name)
-	char *name;
+verify_nif_name(char *name)
 {
 	int	rc, s;
 	struct atminfreq	air;
@@ -371,9 +363,7 @@
  *
  */
 int
-get_cfg_info ( intf, cfgp )
-        char                    *intf;
-        struct air_cfg_rsp      **cfgp;
+get_cfg_info(char *intf, struct air_cfg_rsp **cfgp)
 {
         int     buf_len = sizeof(struct air_cfg_rsp) * 4;
         struct atminfreq air;
@@ -409,9 +399,7 @@
  *
  */
 int
-get_intf_info ( intf, intp )
-        char                    *intf;
-        struct air_int_rsp      **intp;
+get_intf_info(char *intf, struct air_int_rsp **intp)
 {
         int     buf_len = sizeof(struct air_int_rsp) * 4;
         struct atminfreq air;
@@ -448,9 +436,7 @@
  *
  */
 int
-get_netif_info ( intf, netp )
-        char                    *intf;
-        struct air_netif_rsp    **netp;
+get_netif_info(char *intf, struct air_netif_rsp **netp)
 {
         int     buf_len = sizeof(struct air_netif_rsp) * 10;
         struct atminfreq air;
@@ -472,5 +458,3 @@
         return ( buf_len );
 
 }
-
-
Index: lib/libatm/ip_addr.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/ip_addr.c,v
retrieving revision 1.4
diff -u -r1.4 ip_addr.c
--- lib/libatm/ip_addr.c	25 Nov 2007 01:28:22 -0000	1.4
+++ lib/libatm/ip_addr.c	24 Aug 2008 22:38:05 -0000
@@ -73,8 +73,7 @@
  *
  */
 struct sockaddr_in *
-get_ip_addr(p)
-	char	*p;
+get_ip_addr(char *p)
 {
 	struct hostent			*ip_host;
 	static struct sockaddr_in	sin;
@@ -120,8 +119,7 @@
  *
  */
 char *
-format_ip_addr(addr)
-	struct in_addr	*addr;
+format_ip_addr(struct in_addr *addr)
 {
 	static char	host_name[MAXHOSTNAMELEN + 18];
 	char		*ip_num;
Index: lib/libatm/ip_checksum.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/ip_checksum.c,v
retrieving revision 1.3
diff -u -r1.3 ip_checksum.c
--- lib/libatm/ip_checksum.c	25 Oct 2004 19:38:01 -0000	1.3
+++ lib/libatm/ip_checksum.c	24 Aug 2008 22:38:25 -0000
@@ -69,9 +69,7 @@
  *
  */
 short
-ip_checksum(addr, count)
-	char 	*addr;
-	int	count;
+ip_checksum(char *addr, int count)
 {
 	/* Compute Internet Checksum for "count" bytes
 	 * beginning at location "addr".
Index: lib/libatm/timer.c
===================================================================
RCS file: /home/dcvs/src/lib/libatm/timer.c,v
retrieving revision 1.2
diff -u -r1.2 timer.c
--- lib/libatm/timer.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libatm/timer.c	24 Aug 2008 22:38:58 -0000
@@ -75,7 +75,7 @@
  *
  */
 static void
-timer_tick()
+timer_tick(void)
 {
 	/*
 	 * Bump the timer flag
@@ -99,7 +99,7 @@
  *
  */
 void
-timer_proc()
+timer_proc(void)
 {
 	Harp_timer	*htp;
 	void		(*f)();
@@ -178,7 +178,7 @@
  *
  */
 int
-init_timer()
+init_timer(void)
 {
 	int			rc = 0;
 	struct itimerval	timeval;
@@ -226,7 +226,7 @@
  *
  */
 int
-block_timer()
+block_timer(void)
 {
 	/*
 	 * Block the SIGALRM signal
@@ -249,8 +249,7 @@
  *
  */
 void
-enable_timer(mask)
-	int	mask;
+enable_timer(int mask)
 {
 	/*
 	 * Set the signal mask
Index: lib/libc_r/uthread/uthread_main_np.c
===================================================================
RCS file: /home/dcvs/src/lib/libc_r/uthread/uthread_main_np.c,v
retrieving revision 1.3
diff -u -r1.3 uthread_main_np.c
--- lib/libc_r/uthread/uthread_main_np.c	30 May 2005 20:50:53 -0000	1.3
+++ lib/libc_r/uthread/uthread_main_np.c	24 Aug 2008 22:39:19 -0000
@@ -36,7 +36,7 @@
  * Provide the equivalent to Solaris thr_main() function
  */
 int
-_pthread_main_np()
+_pthread_main_np(void)
 {
 
 	if (!_thread_initial)
Index: lib/libc_r/uthread/uthread_multi_np.c
===================================================================
RCS file: /home/dcvs/src/lib/libc_r/uthread/uthread_multi_np.c,v
retrieving revision 1.3
diff -u -r1.3 uthread_multi_np.c
--- lib/libc_r/uthread/uthread_multi_np.c	30 May 2005 20:50:53 -0000	1.3
+++ lib/libc_r/uthread/uthread_multi_np.c	24 Aug 2008 22:39:29 -0000
@@ -36,7 +36,7 @@
 #include <pthread_np.h>
 
 int
-_pthread_multi_np()
+_pthread_multi_np(void)
 {
 
 	/* Return to multi-threaded scheduling mode: */
Index: lib/libc_r/uthread/uthread_single_np.c
===================================================================
RCS file: /home/dcvs/src/lib/libc_r/uthread/uthread_single_np.c,v
retrieving revision 1.3
diff -u -r1.3 uthread_single_np.c
--- lib/libc_r/uthread/uthread_single_np.c	30 May 2005 20:50:53 -0000	1.3
+++ lib/libc_r/uthread/uthread_single_np.c	24 Aug 2008 22:39:37 -0000
@@ -35,7 +35,7 @@
 #include <pthread.h>
 #include <pthread_np.h>
 
-int _pthread_single_np()
+int _pthread_single_np(void)
 {
 
 	/* Enter single-threaded (non-POSIX) scheduling mode: */
Index: lib/libedit/chared.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/chared.c,v
retrieving revision 1.8
diff -u -r1.8 chared.c
--- lib/libedit/chared.c	5 May 2007 00:27:39 -0000	1.8
+++ lib/libedit/chared.c	24 Aug 2008 23:13:30 -0000
@@ -525,8 +525,7 @@
 }
 
 private void
-ch__clearmacro(el)
-	EditLine *el;
+ch__clearmacro(EditLine *el)
 {
 	c_macro_t *ma = &el->el_chared.c_macro;
 	while (ma->level >= 0)
@@ -538,9 +537,7 @@
  *	Returns 1 if successful, 0 if not.
  */
 protected int
-ch_enlargebufs(el, addlen)
-	EditLine *el;
-	size_t addlen;
+ch_enlargebufs(EditLine *el, size_t addlen)
 {
 	size_t sz, newsz;
 	char *newbuffer, *oldbuf, *oldkbuf;
Index: lib/libedit/readline.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/readline.c,v
retrieving revision 1.4
diff -u -r1.4 readline.c
--- lib/libedit/readline.c	17 May 2008 22:48:04 -0000	1.4
+++ lib/libedit/readline.c	24 Aug 2008 23:13:48 -0000
@@ -1661,7 +1661,7 @@
 }
 
 void
-rl_callback_read_char()
+rl_callback_read_char(void)
 {
 	int count = 0, done = 0;
 	const char *buf = el_gets(e, &count);
Index: lib/libncp/ipx.c
===================================================================
RCS file: /home/dcvs/src/lib/libncp/ipx.c,v
retrieving revision 1.3
diff -u -r1.3 ipx.c
--- lib/libncp/ipx.c	12 Nov 2003 20:21:31 -0000	1.3
+++ lib/libncp/ipx.c	24 Aug 2008 23:15:46 -0000
@@ -288,12 +288,8 @@
 
 
 int
-if_ipxscan(addrcount, sdl, ifm, ifam, addr)
-	int addrcount;
-	struct	sockaddr_dl *sdl;
-	struct if_msghdr *ifm;
-	struct ifa_msghdr *ifam;
-	struct ipx_addr *addr;
+if_ipxscan(int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm,
+    struct ifa_msghdr *ifam, struct ipx_addr *addr)
 {
 	struct	rt_addrinfo info;
 	struct sockaddr_ipx *sipx;
@@ -334,9 +330,7 @@
 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 
 static void
-rt_xaddrs(cp, cplim, rtinfo)
-	caddr_t cp, cplim;
-	struct rt_addrinfo *rtinfo;
+rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo)
 {
 	struct sockaddr *sa;
 	int i;
Index: lib/libncp/ncpl_subr.c
===================================================================
RCS file: /home/dcvs/src/lib/libncp/ncpl_subr.c,v
retrieving revision 1.4
diff -u -r1.4 ncpl_subr.c
--- lib/libncp/ncpl_subr.c	17 Feb 2005 13:59:35 -0000	1.4
+++ lib/libncp/ncpl_subr.c	24 Aug 2008 23:16:20 -0000
@@ -259,10 +259,7 @@
 #define	EMSG	""
 
 int
-ncp_getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const *nargv;
-	const char *ostr;
+ncp_getopt(int nargc, char * const *nargv, const char *ostr)
 {
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */
Index: lib/libopie/opieextra.c
===================================================================
RCS file: /home/dcvs/src/lib/libopie/opieextra.c,v
retrieving revision 1.3
diff -u -r1.3 opieextra.c
--- lib/libopie/opieextra.c	4 Aug 2005 17:27:09 -0000	1.3
+++ lib/libopie/opieextra.c	24 Aug 2008 23:16:36 -0000
@@ -86,7 +86,7 @@
 
 /* Get current hash type */
 const char *
-opie_get_algorithm()
+opie_get_algorithm(void)
 {
 	return(opie_algorithm_table[opie_hash_type].name);
 }
Index: lib/libsctp/sctp_sys_calls.c
===================================================================
RCS file: /home/dcvs/src/lib/libsctp/sctp_sys_calls.c,v
retrieving revision 1.2
diff -u -r1.2 sctp_sys_calls.c
--- lib/libsctp/sctp_sys_calls.c	28 Jun 2006 23:14:43 -0000	1.2
+++ lib/libsctp/sctp_sys_calls.c	24 Aug 2008 23:17:01 -0000
@@ -652,9 +652,7 @@
 
 #ifdef SYS_sctp_peeloff
 int
-sctp_peeloff(sd, assoc_id)
-      int sd;
-      sctp_assoc_t assoc_id;
+sctp_peeloff(int sd, sctp_assoc_t assoc_id)
 {
 	return (syscall(SYS_sctp_peeloff, sd, assoc_id));
 }
Index: lib/libvgl/keyboard.c
===================================================================
RCS file: /home/dcvs/src/lib/libvgl/keyboard.c,v
retrieving revision 1.2
diff -u -r1.2 keyboard.c
--- lib/libvgl/keyboard.c	17 Jun 2003 04:26:52 -0000	1.2
+++ lib/libvgl/keyboard.c	24 Aug 2008 22:40:26 -0000
@@ -75,7 +75,7 @@
 }
 
 void
-VGLKeyboardEnd()
+VGLKeyboardEnd(void)
 {
   if (VGLKeyboardMode != -1) {
     ioctl(0, KDSKBMODE, VGLKeyboardMode);
@@ -84,7 +84,7 @@
 }
 
 int
-VGLKeyboardGetCh()
+VGLKeyboardGetCh(void)
 {
   unsigned char ch = 0;
 
Index: lib/libvgl/main.c
===================================================================
RCS file: /home/dcvs/src/lib/libvgl/main.c,v
retrieving revision 1.3
diff -u -r1.3 main.c
--- lib/libvgl/main.c	19 Aug 2007 11:39:11 -0000	1.3
+++ lib/libvgl/main.c	24 Aug 2008 23:23:57 -0000
@@ -58,7 +58,7 @@
 static struct winsize VGLOldWSize;
 
 void
-VGLEnd()
+VGLEnd(void)
 {
 struct vt_mode smode;
 
@@ -101,7 +101,7 @@
 }
 
 static void 
-VGLAbort()
+VGLAbort(int signo __unused)
 {
   VGLAbortPending = 1;
   signal(SIGINT, SIG_IGN);
@@ -112,7 +112,7 @@
 }
 
 static void
-VGLSwitch()
+VGLSwitch(int signo __unused)
 {
   if (!VGLOnDisplay)
     VGLOnDisplay = 1;
@@ -284,7 +284,7 @@
 }
 
 void
-VGLCheckSwitch()
+VGLCheckSwitch(void)
 {
   if (VGLAbortPending) {
     VGLEnd();
Index: lib/libvgl/mouse.c
===================================================================
RCS file: /home/dcvs/src/lib/libvgl/mouse.c,v
retrieving revision 1.2
diff -u -r1.2 mouse.c
--- lib/libvgl/mouse.c	17 Jun 2003 04:26:52 -0000	1.2
+++ lib/libvgl/mouse.c	24 Aug 2008 22:41:42 -0000
@@ -90,7 +90,7 @@
 static int VGLMouseButtons = 0;
 
 void
-VGLMousePointerShow()
+VGLMousePointerShow(void)
 {
   byte buf[MOUSE_IMG_SIZE*MOUSE_IMG_SIZE];
   VGLBitmap buffer =
@@ -120,7 +120,7 @@
 }
 
 void
-VGLMousePointerHide()
+VGLMousePointerHide(void)
 {
   byte crtcidx, crtcval, gdcidx, gdcval;
 
@@ -188,7 +188,7 @@
 }
 
 void
-VGLMouseSetStdImage()
+VGLMouseSetStdImage(void)
 {
   if (VGLMouseShown == VGL_MOUSESHOW)
     VGLMousePointerHide();
@@ -270,7 +270,7 @@
 }
 
 void
-VGLMouseUnFreeze()
+VGLMouseUnFreeze(void)
 {
   if (VGLMouseFrozen > 1) {
     VGLMouseFrozen = 0;
Index: lib/libvgl/simple.c
===================================================================
RCS file: /home/dcvs/src/lib/libvgl/simple.c,v
retrieving revision 1.2
diff -u -r1.2 simple.c
--- lib/libvgl/simple.c	17 Jun 2003 04:26:52 -0000	1.2
+++ lib/libvgl/simple.c	24 Aug 2008 22:42:01 -0000
@@ -303,7 +303,7 @@
 }
 
 void
-VGLRestorePalette()
+VGLRestorePalette(void)
 {
   int i;
 
@@ -323,7 +323,7 @@
 }
 
 void
-VGLSavePalette()
+VGLSavePalette(void)
 {
   int i;
 
Index: lib/liby/yyerror.c
===================================================================
RCS file: /home/dcvs/src/lib/liby/yyerror.c,v
retrieving revision 1.2
diff -u -r1.2 yyerror.c
--- lib/liby/yyerror.c	17 Jun 2003 04:26:52 -0000	1.2
+++ lib/liby/yyerror.c	24 Aug 2008 22:42:20 -0000
@@ -36,8 +36,7 @@
 #include <stdio.h>
 
 int
-yyerror(msg)
-char *msg;
+yyerror(char *msg)
 {
 	(void)fprintf(stderr, "%s\n", msg);
 	return(0);
Index: libexec/atrun/atrun.c
===================================================================
RCS file: /home/dcvs/src/libexec/atrun/atrun.c,v
retrieving revision 1.5
diff -u -r1.5 atrun.c
--- libexec/atrun/atrun.c	20 Sep 2004 19:32:19 -0000	1.5
+++ libexec/atrun/atrun.c	24 Aug 2008 23:17:29 -0000
@@ -483,7 +483,7 @@
 }
 
 static void
-usage()
+usage(void)
 {
     if (debug)
 	fprintf(stderr, "usage: atrun [-l load_avg] [-d]\n");
Index: libexec/bootpd/getether.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/getether.c,v
retrieving revision 1.4
diff -u -r1.4 getether.c
--- libexec/bootpd/getether.c	5 Jun 2008 18:01:49 -0000	1.4
+++ libexec/bootpd/getether.c	28 Aug 2008 17:10:17 -0000
@@ -125,10 +125,10 @@
 	char *eap;					/* Ether address (output) */
 {
 	int fd, rc = -1;
-	register int n;
+	int n;
 	struct ifreq ibuf[16];
 	struct ifconf ifc;
-	register struct ifreq *ifrp, *ifend;
+	struct ifreq *ifrp, *ifend;
 
 	/* Fetch the interface configuration */
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
Index: libexec/bootpd/hash.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/hash.c,v
retrieving revision 1.3
diff -u -r1.3 hash.c
--- libexec/bootpd/hash.c	5 Jun 2008 18:01:49 -0000	1.3
+++ libexec/bootpd/hash.c	28 Aug 2008 17:10:37 -0000
@@ -84,8 +84,8 @@
 hash_Init(tablesize)
 	unsigned tablesize;
 {
-	register hash_tbl *hashtblptr;
-	register unsigned totalsize;
+	hash_tbl *hashtblptr;
+	unsigned totalsize;
 
 	if (tablesize > 0) {
 		totalsize = sizeof(hash_tbl)
@@ -174,9 +174,9 @@
 unsigned
 hash_HashFunction(string, len)
 	unsigned char *string;
-	register unsigned len;
+	unsigned len;
 {
-	register unsigned accum;
+	unsigned accum;
 
 	accum = 0;
 	for (; len > 0; len--) {
@@ -200,7 +200,7 @@
 	hash_cmpfp compare;
 	hash_datum *key;
 {
-	register hash_member *memberptr;
+	hash_member *memberptr;
 
 	memberptr = (hashtable->table)[hashcode % (hashtable->size)];
 	while (memberptr) {
@@ -350,8 +350,8 @@
 hash_NextEntry(hashtable)
 	hash_tbl *hashtable;
 {
-	register unsigned bucket;
-	register hash_member *memberptr;
+	unsigned bucket;
+	hash_member *memberptr;
 
 	/*
 	 * First try to pick up where we left off.
Index: libexec/bootpd/hwaddr.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/hwaddr.c,v
retrieving revision 1.3
diff -u -r1.3 hwaddr.c
--- libexec/bootpd/hwaddr.c	14 Nov 2003 03:54:29 -0000	1.3
+++ libexec/bootpd/hwaddr.c	28 Aug 2008 17:10:49 -0000
@@ -296,7 +296,7 @@
 
 void
 haddr_conv802(addr_in, addr_out, len)
-	register u_char *addr_in, *addr_out;
+	u_char *addr_in, *addr_out;
 	int len;
 {
 	u_char *lim;
Index: libexec/bootpd/readfile.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/readfile.c,v
retrieving revision 1.2
diff -u -r1.2 readfile.c
--- libexec/bootpd/readfile.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/bootpd/readfile.c	28 Aug 2008 17:11:23 -0000
@@ -1313,7 +1313,7 @@
 
 PRIVATE boolean
 goodname(hostname)
-	register char *hostname;
+	char *hostname;
 {
 	do {
 		if (!isalpha(*hostname++)) {	/* First character must be a letter */
@@ -1532,7 +1532,7 @@
 adjust(s)
 	char **s;
 {
-	register char *t;
+	char *t;
 
 	t = *s;
 	while (*t && (*t != ':')) {
@@ -1557,7 +1557,7 @@
 eat_whitespace(s)
 	char **s;
 {
-	register char *t;
+	char *t;
 
 	t = *s;
 	while (*t && isspace(*t)) {
@@ -1676,7 +1676,7 @@
 	u_int32 *result;
 {
 	char tmpstr[MAXSTRINGLEN];
-	register u_int32 value;
+	u_int32 value;
 	u_int32 parts[4], *pp;
 	int n;
 	char *s, *t;
@@ -1861,7 +1861,7 @@
 get_u_long(src)
 	char **src;
 {
-	register u_int32 value, base;
+	u_int32 value, base;
 	char c;
 
 	/*
Index: libexec/bootpd/rtmsg.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/rtmsg.c,v
retrieving revision 1.4
diff -u -r1.4 rtmsg.c
--- libexec/bootpd/rtmsg.c	25 Nov 2007 01:28:23 -0000	1.4
+++ libexec/bootpd/rtmsg.c	28 Aug 2008 17:11:35 -0000
@@ -121,9 +121,9 @@
 	char *eaddr;
 	int len;
 {
-	register struct sockaddr_inarp *sin = &sin_m;
-	register struct sockaddr_dl *sdl;
-	register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
+	struct sockaddr_inarp *sin = &sin_m;
+	struct sockaddr_dl *sdl;
+	struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
 	u_char *ea;
 	struct timeval time;
 	int op = RTM_ADD;
@@ -190,9 +190,9 @@
 {
 	static int seq;
 	int rlen;
-	register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
-	register char *cp = m_rtmsg.m_space;
-	register int l;
+	struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+	char *cp = m_rtmsg.m_space;
+	int l;
 
 	errno = 0;
 	bzero((char *)&m_rtmsg, sizeof(m_rtmsg));
Index: libexec/bootpd/tools/bootptest/bootptest.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/tools/bootptest/bootptest.c,v
retrieving revision 1.2
diff -u -r1.2 bootptest.c
--- libexec/bootpd/tools/bootptest/bootptest.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/bootpd/tools/bootptest/bootptest.c	28 Aug 2008 17:11:51 -0000
@@ -467,9 +467,9 @@
  */
 int
 printfn(s, ep)
-	register u_char *s, *ep;
+	u_char *s, *ep;
 {
-	register u_char c;
+	u_char c;
 
 	putchar('"');
 	while ((c = *s++) != '\0') {
Index: libexec/bootpd/tools/bootptest/print-bootp.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/tools/bootptest/print-bootp.c,v
retrieving revision 1.2
diff -u -r1.2 print-bootp.c
--- libexec/bootpd/tools/bootptest/print-bootp.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/bootpd/tools/bootptest/print-bootp.c	28 Aug 2008 17:12:03 -0000
@@ -102,8 +102,8 @@
 
 	/* Client's Hardware address */
 	if (bp->bp_hlen) {
-		register struct ether_header *eh;
-		register char *e;
+		struct ether_header *eh;
+		char *e;
 
 		TCHECK(bp->bp_chaddr[0], 6);
 		eh = (struct ether_header *) packetp;
@@ -276,12 +276,12 @@
 
 static void
 rfc1048_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	u_char tag;
 	u_char *ep;
-	register int len;
+	int len;
 	u_int32 ul;
 	u_short us;
 	struct in_addr ia;
@@ -378,7 +378,7 @@
 
 static void
 cmu_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	struct cmu_vend *v;
@@ -429,7 +429,7 @@
 
 static void
 other_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	u_char *ep;					/* end pointer */
Index: libexec/fingerd/fingerd.c
===================================================================
RCS file: /home/dcvs/src/libexec/fingerd/fingerd.c,v
retrieving revision 1.3
diff -u -r1.3 fingerd.c
--- libexec/fingerd/fingerd.c	14 Nov 2003 03:54:29 -0000	1.3
+++ libexec/fingerd/fingerd.c	28 Aug 2008 17:12:19 -0000
@@ -56,13 +56,11 @@
 void logerr (const char *, ...);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
-	register FILE *fp;
-	register int ch;
-	register char *lp;
+	FILE *fp;
+	int ch;
+	char *lp;
 	struct sockaddr_storage ss;
 	int p[2], logging, secure, sval;
 #define	ENTRIES	50
Index: libexec/ftpd/ftpcmd.y
===================================================================
RCS file: /home/dcvs/src/libexec/ftpd/ftpcmd.y,v
retrieving revision 1.4
diff -u -r1.4 ftpcmd.y
--- libexec/ftpd/ftpcmd.y	19 Jun 2004 20:36:04 -0000	1.4
+++ libexec/ftpd/ftpcmd.y	28 Aug 2008 17:12:40 -0000
@@ -1190,7 +1190,7 @@
 	FILE *iop;
 {
 	int c;
-	register char *cs;
+	char *cs;
 
 	cs = s;
 /* tmpline may contain saved command from urgent mode interruption */
@@ -1243,8 +1243,8 @@
 			/* Don't syslog passwords */
 			syslog(LOG_DEBUG, "command: %.5s ???", s);
 		} else {
-			register char *cp;
-			register int len;
+			char *cp;
+			int len;
 
 			/* Don't syslog trailing CR-LF */
 			len = strlen(s);
Index: libexec/makekey/makekey.c
===================================================================
RCS file: /home/dcvs/src/libexec/makekey/makekey.c,v
retrieving revision 1.4
diff -u -r1.4 makekey.c
--- libexec/makekey/makekey.c	13 Aug 2006 16:21:34 -0000	1.4
+++ libexec/makekey/makekey.c	28 Aug 2008 17:12:51 -0000
@@ -62,11 +62,9 @@
 }
 
 static void
-get(bp, len)
-	char *bp;
-	register int len;
+get(char *bp, int len)
 {
-	register int nr;
+	int nr;
 
 	bp[len] = '\0';
 	if ((nr = read(STDIN_FILENO, bp, len)) == len)
Index: libexec/mknetid/hash.c
===================================================================
RCS file: /home/dcvs/src/libexec/mknetid/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- libexec/mknetid/hash.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/mknetid/hash.c	28 Aug 2008 17:13:07 -0000
@@ -49,13 +49,11 @@
  * OZ's original sdbm hash
  */
 u_int32_t
-hash(keyarg, len)
-	const void *keyarg;
-	register size_t len;
+hash(const void *keyarg, size_t len)
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
@@ -100,8 +98,7 @@
  * We mask off all but the lower 8 bits since our table array
  * can only hole 256 elements.
  */
-u_int32_t hashkey(key)
-	char *key;
+u_int32_t hashkey(char *key)
 {
 
 	if (key == NULL)
@@ -110,9 +107,7 @@
 }
 
 /* Find an entry in the hash table (may be hanging off a linked list). */
-struct grouplist *lookup(table, key)
-	struct member_entry *table[];
-	char *key;
+struct grouplist *lookup(struct member_entry *table[], char *key)
 {
 	struct member_entry *cur;
 
@@ -132,11 +127,7 @@
 /*
  * Store an group member entry and/or update its grouplist.
  */
-void mstore (table, key, gid, dup)
-	struct member_entry *table[];
-	char *key;
-	int gid;
-	int dup;
+void mstore (struct member_entry *table[], char *key, int gid, int dup)
 {
 	struct member_entry *cur, *new;
 	struct grouplist *tmp;
Index: libexec/mknetid/mknetid.c
===================================================================
RCS file: /home/dcvs/src/libexec/mknetid/mknetid.c,v
retrieving revision 1.3
diff -u -r1.3 mknetid.c
--- libexec/mknetid/mknetid.c	14 Nov 2003 03:54:30 -0000	1.3
+++ libexec/mknetid/mknetid.c	26 Aug 2008 20:05:55 -0000
@@ -85,7 +85,7 @@
 extern void _endgrent ( void );
 
 static void
-usage()
+usage(void)
 {
 	fprintf (stderr, "%s\n%s\n",
 	"usage: mknetid [-q] [-g group_file] [-p passwd_file] [-h hosts_file]",
@@ -96,9 +96,7 @@
 extern FILE *_gr_fp;
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	FILE *gfp, *pfp, *hfp, *nfp;
 	char readbuf[LINSIZ];
Index: libexec/mknetid/parse_group.c
===================================================================
RCS file: /home/dcvs/src/libexec/mknetid/parse_group.c,v
retrieving revision 1.3
diff -u -r1.3 parse_group.c
--- libexec/mknetid/parse_group.c	3 Aug 2006 16:40:46 -0000	1.3
+++ libexec/mknetid/parse_group.c	28 Aug 2008 17:13:14 -0000
@@ -57,7 +57,7 @@
 static char line[MAXLINELENGTH];
 
 struct group *
-_getgrent()
+_getgrent(void)
 {
 	if (!_gr_fp && !start_gr()) {
 		return NULL;
@@ -70,14 +70,13 @@
 }
 
 static int
-start_gr()
+start_gr(void)
 {
 	return 1;
 }
 
 int
-_setgroupent(stayopen)
-	int stayopen;
+_setgroupent(int stayopen)
 {
 	if (!start_gr())
 		return(0);
@@ -86,13 +85,13 @@
 }
 
 int
-_setgrent()
+_setgrent(void)
 {
 	return(_setgroupent(0));
 }
 
 void
-_endgrent()
+_endgrent(void)
 {
 	if (_gr_fp) {
 		(void)fclose(_gr_fp);
@@ -101,11 +100,9 @@
 }
 
 static int
-grscan(search, gid, name)
-	register int search, gid;
-	register char *name;
+grscan(int search, int gid, char *name)
 {
-	register char *cp, **m;
+	char *cp, **m;
 	char *bp;
 	for (;;) {
 		if (!fgets(line, sizeof(line), _gr_fp))
Index: libexec/revnetgroup/hash.c
===================================================================
RCS file: /home/dcvs/src/libexec/revnetgroup/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- libexec/revnetgroup/hash.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/revnetgroup/hash.c	28 Aug 2008 17:13:32 -0000
@@ -51,11 +51,11 @@
 u_int32_t
 hash(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
Index: libexec/revnetgroup/parse_netgroup.c
===================================================================
RCS file: /home/dcvs/src/libexec/revnetgroup/parse_netgroup.c,v
retrieving revision 1.3
diff -u -r1.3 parse_netgroup.c
--- libexec/revnetgroup/parse_netgroup.c	25 Aug 2004 01:53:39 -0000	1.3
+++ libexec/revnetgroup/parse_netgroup.c	28 Aug 2008 17:13:44 -0000
@@ -140,8 +140,8 @@
 void
 __endnetgrent()
 {
-	register struct linelist *lp, *olp;
-	register struct netgrp *gp, *ogp;
+	struct linelist *lp, *olp;
+	struct netgrp *gp, *ogp;
 
 	lp = linehead;
 	while (lp) {
@@ -178,10 +178,10 @@
 parse_netgrp(group)
 	char *group;
 {
-	register char *spos, *epos;
-	register int len, strpos;
+	char *spos, *epos;
+	int len, strpos;
 #ifdef DEBUG
-	register int fields;
+	int fields;
 #endif
 	char *pos, *gpos;
 	struct netgrp *grp;
@@ -289,8 +289,8 @@
 read_for_group(group)
 	char *group;
 {
-	register char *pos, *spos, *linep = NULL, *olinep = NULL;
-	register int len, olen;
+	char *pos, *spos, *linep = NULL, *olinep = NULL;
+	int len, olen;
 	int cont;
 	struct linelist *lp;
 	char line[LINSIZ + 1];
Index: libexec/rexecd/rexecd.c
===================================================================
RCS file: /home/dcvs/src/libexec/rexecd/rexecd.c,v
retrieving revision 1.5
diff -u -r1.5 rexecd.c
--- libexec/rexecd/rexecd.c	25 Nov 2007 01:28:23 -0000	1.5
+++ libexec/rexecd/rexecd.c	26 Aug 2008 22:48:24 -0000
@@ -49,6 +49,7 @@
 #include <libutil.h>
 #include <paths.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <skey.h>
@@ -70,7 +71,7 @@
 void doit (int, struct sockaddr_in *);
 void getstr (char *, int, char *);
 /*VARARGS1*/
-void error ();
+void error (char *fmt, ...);
 
 int no_uid_0 = 1;
 
@@ -90,9 +91,7 @@
  */
 /*ARGSUSED*/
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 	struct sockaddr_in from;
 	int fromlen;
@@ -122,9 +121,7 @@
 }
 
 void
-doit(f, fromp)
-	int f;
-	struct sockaddr_in *fromp;
+doit(int f, struct sockaddr_in *fromp)
 {
 	FILE *fp;
 	char cmdbuf[NCARGS+1], *cp, *namep;
@@ -294,24 +291,21 @@
 	err(1, "%s", pwd->pw_shell);
 }
 
-/*VARARGS1*/
 void
-error(fmt, a1, a2, a3)
-	char *fmt;
-	int a1, a2, a3;
+error(char *fmt, ...)
 {
 	char buf[BUFSIZ];
+	va_list ap;
 
+	va_start(ap, fmt);
 	buf[0] = 1;
-	(void) snprintf(buf+1, sizeof(buf) - 1, fmt, a1, a2, a3);
+	(void) snprintf(buf+1, sizeof(buf) - 1, fmt, ap);
 	(void) write(2, buf, strlen(buf));
+	va_end(ap);
 }
 
 void
-getstr(buf, cnt, err)
-	char *buf;
-	int cnt;
-	char *err;
+getstr(char *buf, int cnt, char *err)
 {
 	char c;
 
Index: libexec/rlogind/rlogind.c
===================================================================
RCS file: /home/dcvs/src/libexec/rlogind/rlogind.c,v
retrieving revision 1.5
diff -u -r1.5 rlogind.c
--- libexec/rlogind/rlogind.c	18 May 2007 17:05:12 -0000	1.5
+++ libexec/rlogind/rlogind.c	28 Aug 2008 17:13:58 -0000
@@ -421,7 +421,7 @@
 			if (fcc < 0 && errno == EWOULDBLOCK)
 				fcc = 0;
 			else {
-				register char *cp;
+				char *cp;
 				int left;
 
 				if (fcc <= 0)
@@ -575,7 +575,7 @@
 void
 setup_term(int fd)
 {
-	register char *cp = index(term+ENVSIZE, '/');
+	char *cp = index(term+ENVSIZE, '/');
 	char *speed;
 	struct termios tt;
 
Index: libexec/rpc.rstatd/rstat_proc.c
===================================================================
RCS file: /home/dcvs/src/libexec/rpc.rstatd/rstat_proc.c,v
retrieving revision 1.5
diff -u -r1.5 rstat_proc.c
--- libexec/rpc.rstatd/rstat_proc.c	31 Jan 2005 21:20:58 -0000	1.5
+++ libexec/rpc.rstatd/rstat_proc.c	28 Aug 2008 17:14:40 -0000
@@ -297,7 +297,7 @@
 int
 havedisk()
 {
-	register int i;
+	int i;
 	struct statinfo stats;
 	int num_devices, retval = 0;
 
@@ -341,7 +341,7 @@
 updatexfers(numdevs, devs)
 	int numdevs, *devs;
 {
-	register int i, j, t;
+	int i, j, t;
 	struct statinfo stats;
 	int num_devices = 0;
 	u_int64_t total_transfers;
Index: libexec/rtld-elf/malloc.c
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-elf/malloc.c,v
retrieving revision 1.3
diff -u -r1.3 malloc.c
--- libexec/rtld-elf/malloc.c	5 Jun 2008 18:01:49 -0000	1.3
+++ libexec/rtld-elf/malloc.c	28 Aug 2008 17:15:05 -0000
@@ -154,10 +154,10 @@
 malloc(nbytes)
 	size_t nbytes;
 {
-  	register union overhead *op;
-  	register int bucket;
-	register long n;
-	register unsigned amt;
+  	union overhead *op;
+  	int bucket;
+	long n;
+	unsigned amt;
 
 	/*
 	 * First time malloc is called, setup page size and
@@ -241,8 +241,8 @@
 morecore(bucket)
 	int bucket;
 {
-  	register union overhead *op;
-	register int sz;		/* size of desired block */
+  	union overhead *op;
+	int sz;		/* size of desired block */
   	int amt;			/* amount to allocate */
   	int nblks;			/* how many blocks we get */
 
@@ -285,8 +285,8 @@
 free(cp)
 	void *cp;
 {
-  	register int size;
-	register union overhead *op;
+  	int size;
+	union overhead *op;
 
   	if (cp == NULL)
   		return;
@@ -328,8 +328,8 @@
 	void *cp;
 	size_t nbytes;
 {
-  	register u_int onb;
-	register int i;
+  	u_int onb;
+	int i;
 	union overhead *op;
   	char *res;
 	int was_alloced = 0;
@@ -399,8 +399,8 @@
 	union overhead *freep;
 	int srchlen;
 {
-	register union overhead *p;
-	register int i, j;
+	union overhead *p;
+	int i, j;
 
 	for (i = 0; i < NBUCKETS; i++) {
 		j = 0;
@@ -424,8 +424,8 @@
 mstats(s)
 	char *s;
 {
-  	register int i, j;
-  	register union overhead *p;
+  	int i, j;
+  	union overhead *p;
   	int totfree = 0,
   	totused = 0;
 
Index: libexec/talkd/print.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/print.c,v
retrieving revision 1.2
diff -u -r1.2 print.c
--- libexec/talkd/print.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/talkd/print.c	28 Aug 2008 17:15:22 -0000
@@ -54,7 +54,7 @@
 void
 print_request(cp, mp)
 	char *cp;
-	register CTL_MSG *mp;
+	CTL_MSG *mp;
 {
 	char tbuf[80], *tp;
 
@@ -70,7 +70,7 @@
 void
 print_response(cp, rp)
 	char *cp;
-	register CTL_RESPONSE *rp;
+	CTL_RESPONSE *rp;
 {
 	char tbuf[80], *tp, abuf[80], *ap;
 
Index: libexec/talkd/process.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/process.c,v
retrieving revision 1.3
diff -u -r1.3 process.c
--- libexec/talkd/process.c	14 Nov 2003 03:54:31 -0000	1.3
+++ libexec/talkd/process.c	28 Aug 2008 17:15:33 -0000
@@ -69,10 +69,10 @@
 
 void
 process_request(mp, rp)
-	register CTL_MSG *mp;
-	register CTL_RESPONSE *rp;
+	CTL_MSG *mp;
+	CTL_RESPONSE *rp;
 {
-	register CTL_MSG *ptr;
+	CTL_MSG *ptr;
 	extern int debug;
 	char *s;
 
@@ -148,7 +148,7 @@
 
 void
 do_announce(mp, rp)
-	register CTL_MSG *mp;
+	CTL_MSG *mp;
 	CTL_RESPONSE *rp;
 {
 	struct hostent *hp;
Index: libexec/talkd/table.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/table.c,v
retrieving revision 1.3
diff -u -r1.3 table.c
--- libexec/talkd/table.c	14 Nov 2003 03:54:31 -0000	1.3
+++ libexec/talkd/table.c	28 Aug 2008 17:15:44 -0000
@@ -84,9 +84,9 @@
  */
 CTL_MSG *
 find_match(request)
-	register CTL_MSG *request;
+	CTL_MSG *request;
 {
-	register TABLE_ENTRY *ptr;
+	TABLE_ENTRY *ptr;
 	time_t current_time;
 
 	gettimeofday(&tp, &txp);
@@ -118,9 +118,9 @@
  */
 CTL_MSG *
 find_request(request)
-	register CTL_MSG *request;
+	CTL_MSG *request;
 {
-	register TABLE_ENTRY *ptr;
+	TABLE_ENTRY *ptr;
 	time_t current_time;
 
 	gettimeofday(&tp, &txp);
@@ -159,7 +159,7 @@
 	CTL_MSG *request;
 	CTL_RESPONSE *response;
 {
-	register TABLE_ENTRY *ptr;
+	TABLE_ENTRY *ptr;
 	time_t current_time;
 
 	gettimeofday(&tp, &txp);
@@ -203,7 +203,7 @@
 delete_invite(id_num)
 	int id_num;
 {
-	register TABLE_ENTRY *ptr;
+	TABLE_ENTRY *ptr;
 
 	ptr = table;
 	if (debug)
@@ -226,7 +226,7 @@
  */
 void
 delete(ptr)
-	register TABLE_ENTRY *ptr;
+	TABLE_ENTRY *ptr;
 {
 
 	if (debug)
Index: libexec/talkd/talkd.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/talkd.c,v
retrieving revision 1.3
diff -u -r1.3 talkd.c
--- libexec/talkd/talkd.c	14 Nov 2003 03:54:31 -0000	1.3
+++ libexec/talkd/talkd.c	28 Aug 2008 17:15:56 -0000
@@ -77,7 +77,7 @@
 	int argc;
 	char *argv[];
 {
-	register CTL_MSG *mp = &request;
+	CTL_MSG *mp = &request;
 	int cc;
 
 #ifdef NOTDEF
Index: libexec/ypxfr/ypxfr_misc.c
===================================================================
RCS file: /home/dcvs/src/libexec/ypxfr/ypxfr_misc.c,v
retrieving revision 1.2
diff -u -r1.2 ypxfr_misc.c
--- libexec/ypxfr/ypxfr_misc.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/ypxfr/ypxfr_misc.c	26 Aug 2008 19:55:19 -0000
@@ -44,8 +44,7 @@
 #include <rpcsvc/ypclnt.h>
 #include "ypxfr_extern.h"
 
-char *ypxfrerr_string(code)
-	ypxfrstat code;
+char *ypxfrerr_string(ypxfrstat code)
 {
 	switch (code) {
 	case YPXFR_SUCC:
@@ -118,11 +117,7 @@
  * allocated by the XDR routines. We have to rememver to free() or
  * xdr_free() the memory as required to avoid leaking memory.
  */
-char *ypxfr_get_master(domain,map,source,yplib)
-	char *domain;
-	char *map;
-	char *source;
-	const int yplib;
+char *ypxfr_get_master(char *domain, char *map, char *source, const int yplib)
 {
 	static char mastername[MAXPATHLEN + 2];
 
@@ -193,11 +188,8 @@
 	}
 }
 
-unsigned long ypxfr_get_order(domain, map, source, yplib)
-	char *domain;
-	char *map;
-	char *source;
-	const int yplib;
+unsigned long ypxfr_get_order(char *domain, char *map, char *source,
+    const int yplib)
 {
 	if (yplib) {
 		unsigned long order;
@@ -258,12 +250,8 @@
 	}
 }
 
-int ypxfr_match(server, domain, map, key, keylen)
-	char *server;
-	char *domain;
-	char *map;
-	char *key;
-	unsigned long keylen;
+int ypxfr_match(char *server, char *domain, char *map, char *key,
+    unsigned long keylen)
 {
 	ypreq_key ypkey;
 	ypresp_val *ypval;
Index: libexec/ypxfr/ypxfrd_getmap.c
===================================================================
RCS file: /home/dcvs/src/libexec/ypxfr/ypxfrd_getmap.c,v
retrieving revision 1.2
diff -u -r1.2 ypxfrd_getmap.c
--- libexec/ypxfr/ypxfrd_getmap.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/ypxfr/ypxfrd_getmap.c	28 Aug 2008 17:16:09 -0000
@@ -49,7 +49,7 @@
 
 int fp = 0;
 
-static bool_t xdr_my_xfr(register XDR *xdrs, xfr *objp)
+static bool_t xdr_my_xfr(XDR *xdrs, xfr *objp)
 {
 	while (1) {
 		if (!xdr_xfr(xdrs, objp))
Index: sbin/natacontrol/natacontrol.c
===================================================================
RCS file: /home/dcvs/src/sbin/natacontrol/natacontrol.c,v
retrieving revision 1.2
diff -u -r1.2 natacontrol.c
--- sbin/natacontrol/natacontrol.c	1 Aug 2007 22:54:00 -0000	1.2
+++ sbin/natacontrol/natacontrol.c	24 Aug 2008 22:44:19 -0000
@@ -95,7 +95,7 @@
 }
 
 void
-usage()
+usage(void)
 {
 	fprintf(stderr,
 		"usage:  natacontrol <command> args:\n"
Index: sbin/ping/ping.c
===================================================================
RCS file: /home/dcvs/src/sbin/ping/ping.c,v
retrieving revision 1.7
diff -u -r1.7 ping.c
--- sbin/ping/ping.c	29 May 2007 10:21:41 -0000	1.7
+++ sbin/ping/ping.c	24 Aug 2008 22:45:02 -0000
@@ -1000,11 +1000,7 @@
  * program to be run without having intermingled output (or statistics!).
  */
 static void
-pr_pack(buf, cc, from, tv)
-	char *buf;
-	int cc;
-	struct sockaddr_in *from;
-	struct timeval *tv;
+pr_pack(char *buf, int cc, struct sockaddr_in *from, struct timeval *tv)
 {
 	struct in_addr ina;
 	u_char *cp, *dp;
Index: sys/boot/pc32/boot2/boot2.c
===================================================================
RCS file: /home/dcvs/src/sys/boot/pc32/boot2/boot2.c,v
retrieving revision 1.16
diff -u -r1.16 boot2.c
--- sys/boot/pc32/boot2/boot2.c	18 Jun 2007 05:13:42 -0000	1.16
+++ sys/boot/pc32/boot2/boot2.c	24 Aug 2008 22:42:54 -0000
@@ -428,7 +428,7 @@
 }
 
 static int
-parse()
+parse(void)
 {
     char *arg = cmd;
     char *p, *q;
Index: usr.bin/colldef/scan.l
===================================================================
RCS file: /home/dcvs/src/usr.bin/colldef/scan.l,v
retrieving revision 1.3
diff -u -r1.3 scan.l
--- usr.bin/colldef/scan.l	2 Mar 2005 07:16:23 -0000	1.3
+++ usr.bin/colldef/scan.l	24 Aug 2008 18:17:40 -0000
@@ -278,7 +278,7 @@
 }
 %%
 #ifdef FLEX_DEBUG
-main()
+main(void)
 {
 	while(yylex())
 		;
Index: usr.bin/ctags/test/ctags.test
===================================================================
RCS file: /home/dcvs/src/usr.bin/ctags/test/ctags.test,v
retrieving revision 1.1
diff -u -r1.1 ctags.test
--- usr.bin/ctags/test/ctags.test	17 Jun 2003 02:56:03 -0000	1.1
+++ usr.bin/ctags/test/ctags.test	24 Aug 2008 09:39:52 -0000
@@ -55,7 +55,7 @@
 	char two[10];
 {
 typedef unsigned char	u_char;
-	register struct buf *bp;
+	struct buf *bp;
 	five(one,two);
 }
  routine2 (one,two) { puts("hello\n"); }
Index: usr.bin/doscmd/AsyncIO.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/doscmd/AsyncIO.c,v
retrieving revision 1.2
diff -u -r1.2 AsyncIO.c
--- usr.bin/doscmd/AsyncIO.c	17 Jun 2003 04:29:25 -0000	1.2
+++ usr.bin/doscmd/AsyncIO.c	24 Aug 2008 18:14:25 -0000
@@ -126,7 +126,7 @@
 }
 
 static void
-CleanIO()
+CleanIO(void)
 {
 	int x;
 	static struct timeval tv;
Index: usr.bin/doscmd/dos.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/doscmd/dos.c,v
retrieving revision 1.2
diff -u -r1.2 dos.c
--- usr.bin/doscmd/dos.c	17 Jun 2003 04:29:25 -0000	1.2
+++ usr.bin/doscmd/dos.c	24 Aug 2008 18:15:12 -0000
@@ -2054,9 +2054,7 @@
 }
 
 static void
-fcb_to_string(fcbp, buf)
-	struct fcb *fcbp;
-	u_char *buf;
+fcb_to_string(struct fcb *fcbp, u_char *buf)
 {
 
 	if (fcbp->fcbDriveID != 0x00) {
Index: usr.bin/doscmd/i386-pinsn.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/doscmd/i386-pinsn.c,v
retrieving revision 1.3
diff -u -r1.3 i386-pinsn.c
--- usr.bin/doscmd/i386-pinsn.c	4 Oct 2003 20:36:43 -0000	1.3
+++ usr.bin/doscmd/i386-pinsn.c	24 Aug 2008 18:15:34 -0000
@@ -1522,7 +1522,7 @@
 }
 
 static void
-append_prefix()
+append_prefix(void)
 {
   if (prefixes & PREFIX_CS)
     oappend ("%cs:");
Index: usr.bin/ee/ee.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/ee/ee.c,v
retrieving revision 1.4
diff -u -r1.4 ee.c
--- usr.bin/ee/ee.c	15 Jan 2006 00:07:31 -0000	1.4
+++ usr.bin/ee/ee.c	24 Aug 2008 21:06:29 -0000
@@ -64,13 +64,7 @@
 
 char *version = "@(#) ee, version 1.4.1";
 
-#ifdef NCURSE
-#include "new_curse.h"
-#elif HAS_NCURSES
 #include <ncurses.h>
-#else
-#include <curses.h>
-#endif
 
 #ifdef HAS_CTYPE
 #include <ctype.h>
@@ -222,13 +216,6 @@
 WINDOW *info_win;
 WINDOW *count_win;
 
-#if defined(__STDC__) || defined(__cplusplus)
-#define P_(s) s
-#else
-#define P_(s) ()
-#endif
-
-
 /*
  |	The following structure allows menu items to be flexibly declared.
  |	The first item is the string describing the selection, the second 
@@ -250,101 +237,100 @@
 
 struct menu_entries {
 	char *item_string;
-	int (*procedure)P_((struct menu_entries *));
+	int (*procedure)(struct menu_entries *);
 	struct menu_entries *ptr_argument;
-	int (*iprocedure)P_((int));
-	void (*nprocedure)P_((void));
+	int (*iprocedure)(int);
+	void (*nprocedure)(void);
 	int argument;
 	};
 
-int main P_((int argc, char *argv[]));
-unsigned char *resiz_line P_((int factor, struct text *rline, int rpos));
-void insert P_((int character));
-void delete P_((int disp));
-void scanline P_((unsigned char *pos));
-int tabshift P_((int temp_int));
-int out_char P_((WINDOW *window, int character, int column));
-int len_char P_((int character, int column));
-void draw_line P_((int vertical, int horiz, unsigned char *ptr, int t_pos, int length));
-void insert_line P_((int disp));
-struct text *txtalloc P_((void));
-struct files *name_alloc P_((void));
-unsigned char *next_word P_((unsigned char *string));
-void prev_word P_((void));
-void control P_((void));
-void emacs_control P_((void));
-void bottom P_((void));
-void top P_((void));
-void nextline P_((void));
-void prevline P_((void));
-void left P_((int disp));
-void right P_((int disp));
-void find_pos P_((void));
-void up P_((void));
-void down P_((void));
-void function_key P_((void));
-void print_buffer P_((void));
-void command_prompt P_((void));
-void command P_((char *cmd_str1));
-int scan P_((char *line, int offset, int column));
-char *get_string P_((char *prompt, int advance));
-int compare P_((char *string1, char *string2, int sensitive));
-void goto_line P_((char *cmd_str));
-void midscreen P_((int line, unsigned char *pnt));
-void get_options P_((int numargs, char *arguments[]));
-void check_fp P_((void));
-void get_file P_((char *file_name));
-void get_line P_((int length, unsigned char *in_string, int *append));
-void draw_screen P_((void));
-void finish P_((void));
-int quit P_((int noverify));
-void edit_abort P_((int arg));
-void delete_text P_((void));
-int write_file P_((char *file_name, int warn_if_exists));
-int search P_((int display_message));
-void search_prompt P_((void));
-void del_char P_((void));
-void undel_char P_((void));
-void del_word P_((void));
-void undel_word P_((void));
-void del_line P_((void));
-void undel_line P_((void));
-void adv_word P_((void));
-void move_rel P_((char *direction, int lines));
-void eol P_((void));
-void bol P_((void));
-void adv_line P_((void));
-void sh_command P_((char *string));
-void set_up_term P_((void));
-void resize_check P_((void));
-int menu_op P_((struct menu_entries *));
-void paint_menu P_((struct menu_entries menu_list[], int max_width, int max_height, int list_size, int top_offset, WINDOW *menu_win, int off_start, int vert_size));
-void help P_((void));
-void paint_info_win P_((void));
-void no_info_window P_((void));
-void create_info_window P_((void));
-int file_op P_((int arg));
-void shell_op P_((void));
-void leave_op P_((void));
-void redraw P_((void));
-int Blank_Line P_((struct text *test_line));
-void Format P_((void));
-void ee_init P_((void));
-void dump_ee_conf P_((void));
-void echo_string P_((char *string));
-void spell_op P_((void));
-void ispell_op P_((void));
-int first_word_len P_((struct text *test_line));
-void Auto_Format P_((void));
-void modes_op P_((void));
-char *is_in_string P_((char *string, char *substring));
-char *resolve_name P_((char *name));
-int restrict_mode P_((void));
-int unique_test P_((char *string, char *list[]));
-void renumber_lines P_((struct text *firstline, int startnumber));
-void strings_init P_((void));
+int main(int argc, char *argv[]);
+unsigned char *resiz_line(int factor, struct text *rline, int rpos);
+void insert(int character);
+void delete(int disp);
+void scanline(unsigned char *pos);
+int tabshift(int temp_int);
+int out_char(WINDOW *window, int character, int column);
+int len_char(int character, int column);
+void draw_line(int vertical, int horiz, unsigned char *ptr, int t_pos, int length);
+void insert_line(int disp);
+struct text *txtalloc(void);
+struct files *name_alloc(void);
+unsigned char *next_word(unsigned char *string);
+void prev_word(void);
+void control(void);
+void emacs_control(void);
+void bottom(void);
+void top(void);
+void nextline(void);
+void prevline(void);
+void left(int disp);
+void right(int disp);
+void find_pos(void);
+void up(void);
+void down(void);
+void function_key(void);
+void print_buffer(void);
+void command_prompt(void);
+void command(char *cmd_str1);
+int scan(char *line, int offset, int column);
+char *get_string(char *prompt, int advance);
+int compare(char *string1, char *string2, int sensitive);
+void goto_line(char *cmd_str);
+void midscreen(int line, unsigned char *pnt);
+void get_options(int numargs, char *arguments[]);
+void check_fp(void);
+void get_file(char *file_name);
+void get_line(int length, unsigned char *in_string, int *append);
+void draw_screen(void);
+void finish(void);
+int quit(int noverify);
+void edit_abort(int arg);
+void delete_text(void);
+int write_file(char *file_name, int warn_if_exists);
+int search(int display_message);
+void search_prompt(void);
+void del_char(void);
+void undel_char(void);
+void del_word(void);
+void undel_word(void);
+void del_line(void);
+void undel_line(void);
+void adv_word(void);
+void move_rel(char *direction, int lines);
+void eol(void);
+void bol(void);
+void adv_line(void);
+void sh_command(char *string);
+void set_up_term(void);
+void resize_check(void);
+int menu_op(struct menu_entries *);
+void paint_menu(struct menu_entries menu_list[], int max_width, int max_height, int list_size, int top_offset, WINDOW *menu_win, int off_start, int vert_size);
+void help(void);
+void paint_info_win(void);
+void no_info_window(void);
+void create_info_window(void);
+int file_op(int arg);
+void shell_op(void);
+void leave_op(void);
+void redraw(void);
+int Blank_Line(struct text *test_line);
+void Format(void);
+void ee_init(void);
+void dump_ee_conf(void);
+void echo_string(char *string);
+void spell_op(void);
+void ispell_op(void);
+int first_word_len(struct text *test_line);
+void Auto_Format(void);
+void modes_op(void);
+char *is_in_string(char *string, char *substring);
+char *resolve_name(char *name);
+int restrict_mode(void);
+int unique_test(char *string, char *list[]);
+void renumber_lines(struct text *firstline, int startnumber);
+void strings_init(void);
 
-#undef P_
 /*
  |	allocate space here for the strings that will be in the menu
  */
@@ -1765,19 +1751,9 @@
 	else if (compare(cmd_str, Exit_string, FALSE))
 		finish();
 	else if (compare(cmd_str, chinese_cmd, FALSE))
-	{
 		ee_chinese = TRUE;
-#ifdef NCURSE
-		nc_setattrib(A_NC_BIG5);
-#endif /* NCURSE */
-	}
 	else if (compare(cmd_str, nochinese_cmd, FALSE))
-	{
 		ee_chinese = FALSE;
-#ifdef NCURSE
-		nc_clearattrib(A_NC_BIG5);
-#endif /* NCURSE */
-	}
 	else if (compare(cmd_str, QUIT_string, FALSE))
 		quit(0);
 	else if (*cmd_str == '!')
@@ -3040,10 +3016,6 @@
 		nl();
 		noraw();
 		resetty();
-
-#ifndef NCURSE
-		endwin();
-#endif
 	}
 
 	if (in_pipe)
@@ -3244,12 +3216,6 @@
 	last_col = COLS - 1;
 	local_LINES = LINES;
 	local_COLS = COLS;
-
-#ifdef NCURSE
-	if (ee_chinese)
-		nc_setattrib(A_NC_BIG5);
-#endif /* NCURSE */
-
 }
 
 void 
@@ -4725,13 +4691,6 @@
 				eightbit = !eightbit;
 				if (!eightbit)
 					ee_chinese = FALSE;
-#ifdef NCURSE
-				if (ee_chinese)
-					nc_setattrib(A_NC_BIG5);
-				else
-					nc_clearattrib(A_NC_BIG5);
-#endif /* NCURSE */
-
 				redraw();
 				wnoutrefresh(text_win);
 				break;
@@ -4760,12 +4719,6 @@
 				ee_chinese = !ee_chinese;
 				if (ee_chinese != FALSE)
 					eightbit = TRUE;
-#ifdef NCURSE
-				if (ee_chinese)
-					nc_setattrib(A_NC_BIG5);
-				else
-					nc_clearattrib(A_NC_BIG5);
-#endif /* NCURSE */
 				redraw();
 				break;
 			default:
Index: usr.bin/ee/new_curse.c
===================================================================
RCS file: usr.bin/ee/new_curse.c
diff -N usr.bin/ee/new_curse.c
--- usr.bin/ee/new_curse.c	30 Oct 2005 23:00:57 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3686 +0,0 @@
-/*
- |	new_curse.c
- |
- |	A subset of curses developed for use with ae.
- |
- |	written by Hugh Mahon
- |
- |	THIS MATERIAL IS PROVIDED "AS IS".  THERE ARE
- |	NO WARRANTIES OF ANY KIND WITH REGARD TO THIS
- |	MATERIAL, INCLUDING, BUT NOT LIMITED TO, THE
- |	IMPLIED WARRANTIES OF MERCHANTABILITY AND
- |	FITNESS FOR A PARTICULAR PURPOSE.  Neither
- |	Hewlett-Packard nor Hugh Mahon shall be liable
- |	for errors contained herein, nor for
- |	incidental or consequential damages in
- |	connection with the furnishing, performance or
- |	use of this material.  Neither Hewlett-Packard
- |	nor Hugh Mahon assumes any responsibility for
- |	the use or reliability of this software or
- |	documentation.  This software and
- |	documentation is totally UNSUPPORTED.  There
- |	is no support contract available.  Hewlett-
- |	Packard has done NO Quality Assurance on ANY
- |	of the program or documentation.  You may find
- |	the quality of the materials inferior to
- |	supported materials.
- |
- |	This software is not a product of Hewlett-Packard, Co., or any 
- |	other company.  No support is implied or offered with this software.
- |	You've got the source, and you're on your own.
- |
- |	This software may be distributed under the terms of Larry Wall's 
- |	Artistic license, a copy of which is included in this distribution. 
- |
- |	This notice must be included with this software and any derivatives.
- |
- |	Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon
- |	All are rights reserved.
- |
- | $FreeBSD: src/usr.bin/ee/new_curse.c,v 1.4.2.1 2001/06/10 11:06:06 sobomax Exp $
- | $DragonFly: src/usr.bin/ee/new_curse.c,v 1.4 2005/10/30 23:00:57 swildner Exp $
- |
- */
-
-char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon",
-				"All rights are reserved."};
-
-char * new_curse_name= "@(#) new_curse.c $FreeBSD: src/usr.bin/ee/new_curse.c,v 1.4.2.1 2001/06/10 11:06:06 sobomax Exp $";
-
-#include "new_curse.h"
-#include <signal.h>
-#include <fcntl.h>
-
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifdef BSD_SELECT
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef SLCT_HDR
-#include <sys/select.h>  /* on AIX */
-#endif /* SLCT_HDR */
-
-#endif /* BSD_SELECT */
-
-#ifdef HAS_STDLIB
-#include <stdlib.h>
-#endif
-
-#if defined(__STDC__)
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifdef HAS_UNISTD
-#include <unistd.h>
-#endif
-
-#ifdef HAS_SYS_IOCTL
-#include <sys/ioctl.h>
-#endif
-
-
-WINDOW *curscr;
-static WINDOW *virtual_scr;
-WINDOW *stdscr;
-WINDOW *last_window_refreshed;
-
-#ifdef TIOCGWINSZ
-	struct winsize ws;
-#endif
-
-#define min(a, b)	(a < b ? a : b)
-#define highbitset(a)	((a) & 0x80)
-
-#ifndef CAP
-#define String_Out(table, stack, place) Info_Out(table, stack, place)
-#else
-#define String_Out(table, stack, place) Cap_Out(table, stack, place)
-#endif
-
-#define bw__ 0	/* booleans	*/
-#define am__ 1
-#define xb__ 2
-#define xs__ 3	/* hp glitch (standout not erased by overwrite)	*/
-#define xn__ 4
-#define eo__ 5
-#define gn__ 6	/* generic type terminal	*/
-#define hc__ 7	/* hardcopy terminal		*/
-#define km__ 8
-#define hs__ 9
-#define in__ 10
-#define da__ 11
-#define db__ 12
-#define mi__ 13	/* safe to move during insert mode	*/
-#define ms__ 14	/* safe to move during standout mode	*/
-#define os__ 15
-#define es__ 16
-#define xt__ 17
-#define hz__ 18	/* hazeltine glitch	*/
-#define ul__ 19
-#define xo__ 20
-#define chts__ 21
-#define nxon__ 22
-#define nrrmc__ 23
-#define npc__ 24
-#define mc5i__ 25
-
-#define co__ 0	/* number of columns	*/	/* numbers		*/
-#define it__ 1	/* spaces per tab	*/
-#define li__ 2	/* number of lines	*/
-#define lm__ 3
-#define sg__ 4	/* magic cookie glitch	*/
-#define pb__ 5
-#define vt__ 6
-#define ws__ 7
-
-#define cols__ 0
-#define lines__ 2
-#define xmc__ 4
-#define vt__ 6
-#define wsl__ 7
-#define nlab__ 8
-#define lh__ 9
-#define lw__ 10
-
-#define bt__ 0	/* back tab		*/	/* strings	*/
-#define bl__ 1	/* bell			*/
-#define cr__ 2	/* carriage return	*/
-#define cs__ 3	/* change scroll region	*/
-#define ct__ 4	/* clear all tab stops	*/
-#define cl__ 5	/* clear screen and home cursor	*/
-#define ce__ 6	/* clear to end of line	*/
-#define cd__ 7	/* clear to end of display	*/
-#define ch__ 8	/* set cursor column	*/
-#define CC__ 9	/* term, settable cmd char in 	*/
-#define cm__ 10	/* screen rel cursor motion, row, column	*/
-#define do__ 11	/* down one line	*/
-#define ho__ 12	/* home cursor	*/
-#define vi__ 13	/* make cursor invisible	*/
-#define le__ 14	/* move cursor left one space	*/
-#define CM__ 15	/* memory rel cursor addressing	*/
-#define ve__ 16	/* make cursor appear normal	*/
-#define nd__ 17	/* non-destructive space (cursor right)	*/
-#define ll__ 18	/* last line, first col	*/
-#define up__ 19	/* cursor up		*/
-#define vs__ 20
-#define dc__ 21	/* delete character	*/
-#define dl__ 22	/* delete line		*/
-#define ds__ 23
-#define hd__ 24
-#define as__ 25
-#define mb__ 26
-#define md__ 27	/* turn on bold		*/
-#define ti__ 28
-#define dm__ 29	/* turn on delete mode	*/
-#define mh__ 30	/* half bright mode	*/
-#define im__ 31	/* insert mode		*/
-#define mk__ 32
-#define mp__ 33
-#define mr__ 34
-#define so__ 35	/* enter standout mode	*/
-#define us__ 36
-#define ec__ 37
-#define ae__ 38
-#define me__ 39
-#define te__ 40
-#define ed__ 41
-#define ei__ 42	/* exit insert mode	*/
-#define se__ 43	/* exit standout mode	*/
-#define ue__ 44
-#define vb__ 45
-#define ff__ 46
-#define fs__ 47
-#define i1__ 48
-#define i2__ 49
-#define i3__ 50
-#define if__ 51
-#define ic__ 52
-#define al__ 53
-#define ip__ 54
-#define kb__ 55		/* backspace key	*/
-#define ka__ 56
-#define kC__ 57
-#define kt__ 58
-#define kD__ 59
-#define kL__ 60
-#define kd__ 61
-#define kM__ 62
-#define kE__ 63
-#define kS__ 64
-#define k0__ 65
-#define k1__ 66
-#define kf10__ 67
-#define k2__ 68
-#define k3__ 69
-#define k4__ 70
-#define k5__ 71
-#define k6__ 72
-#define k7__ 73
-#define k8__ 74
-#define k9__ 75
-#define kh__ 76
-#define kI__ 77
-#define kA__ 78
-#define kl__ 79
-#define kH__ 80
-#define kN__ 81
-#define kP__ 82
-#define kr__ 83
-#define kF__ 84
-#define kR__ 85
-#define kT__ 86
-#define ku__ 87	/* key up	*/
-#define ke__ 88
-#define ks__ 89
-#define l0__ 90
-#define l1__ 91
-#define la__ 92
-#define l2__ 93
-#define l3__ 94
-#define l4__ 95
-#define l5__ 96
-#define l6__ 97
-#define l7__ 98
-#define l8__ 99
-#define l9__ 100
-#define mo__ 101
-#define mm__ 102
-#define nw__ 103
-#define pc__ 104
-#define DC__ 105
-#define DL__ 106
-#define DO__ 107
-#define IC__ 118
-#define SF__ 109
-#define AL__ 110
-#define LE__ 111
-#define RI__ 112
-#define SR__ 113
-#define UP__ 114
-#define pk__ 115
-#define pl__ 116
-#define px__ 117
-#define ps__ 118
-#define pf__ 119
-#define po__ 120
-#define rp__ 121
-#define r1__ 122
-#define r2__ 123
-#define r3__ 124
-#define rf__ 125
-#define rc__ 126
-#define cv__ 127
-#define sc__ 128
-#define sf__ 129
-#define sr__ 130
-#define sa__ 131	/* sgr	*/
-#define st__ 132
-#define wi__ 133
-#define ta__ 134
-#define ts__ 135
-#define uc__ 136
-#define hu__ 137
-#define iP__ 138
-#define K1__ 139
-#define K2__ 140
-#define K3__ 141
-#define K4__ 142
-#define K5__ 143
-#define pO__ 144
-#define ml__ 145
-#define mu__ 146
-#define rmp__ 145
-#define acsc__ 146
-#define pln__ 147
-#define kcbt__ 148
-#define smxon__ 149
-#define rmxon__ 150
-#define smam__ 151
-#define rmam__ 152
-#define xonc__ 153
-#define xoffc__ 154
-#define enacs__ 155
-#define smln__ 156
-#define rmln__ 157
-#define kbeg__ 158
-#define kcan__ 159
-#define kclo__ 160
-#define kcmd__ 161
-#define kcpy__ 162
-#define kcrt__ 163
-#define kend__ 164
-#define kent__ 165
-#define kext__ 166
-#define kfnd__ 167
-#define khlp__ 168
-#define kmrk__ 169
-#define kmsg__ 170
-#define kmov__ 171
-#define knxt__ 172
-#define kopn__ 173
-#define kopt__ 174
-#define kprv__ 175
-#define kprt__ 176
-#define krdo__ 177
-#define kref__ 178
-#define krfr__ 179
-#define krpl__ 180
-#define krst__ 181
-#define kres__ 182
-#define ksav__ 183
-#define kspd__ 184
-#define kund__ 185
-#define kBEG__ 186
-#define kCAN__ 187
-#define kCMD__ 188
-#define kCPY__ 189
-#define kCRT__ 190
-#define kDC__ 191
-#define kDL__ 192
-#define kslt__ 193
-#define kEND__ 194
-#define kEOL__ 195
-#define kEXT__ 196
-#define kFND__ 197
-#define kHLP__ 198
-#define kHOM__ 199
-#define kIC__ 200
-#define kLFT__ 201
-#define kMSG__ 202
-#define kMOV__ 203
-#define kNXT__ 204
-#define kOPT__ 205
-#define kPRV__ 206
-#define kPRT__ 207
-#define kRDO__ 208
-#define kRPL__ 209
-#define kRIT__ 210
-#define kRES__ 211
-#define kSAV__ 212
-#define kSPD__ 213
-#define kUND__ 214
-#define rfi__ 215
-#define kf11__ 216
-#define kf12__ 217
-#define kf13__ 218
-#define kf14__ 219
-#define kf15__ 220
-#define kf16__ 221
-#define kf17__ 222
-#define kf18__ 223
-#define kf19__ 224
-#define kf20__ 225
-#define kf21__ 226
-#define kf22__ 227
-#define kf23__ 228
-#define kf24__ 229
-#define kf25__ 230
-#define kf26__ 231
-#define kf27__ 232
-#define kf28__ 233
-#define kf29__ 234
-#define kf30__ 235
-#define kf31__ 236
-#define kf32__ 237
-#define kf33__ 238
-#define kf34__ 239
-#define kf35__ 240
-#define kf36__ 241
-#define kf37__ 242
-#define kf38__ 243
-#define kf39__ 244
-#define kf40__ 245
-#define kf41__ 246
-#define kf42__ 247
-#define kf43__ 248
-#define kf44__ 249
-#define kf45__ 250
-#define kf46__ 251
-#define kf47__ 252
-#define kf48__ 253
-#define kf49__ 254
-#define kf50__ 255
-#define kf51__ 256
-#define kf52__ 257
-#define kf53__ 258
-#define kf54__ 259
-#define kf55__ 260
-#define kf56__ 261
-#define kf57__ 262
-#define kf58__ 263
-#define kf59__ 264
-#define kf60__ 265
-#define kf61__ 266
-#define kf62__ 267
-#define kf63__ 268
-#define el1__ 269
-#define mgc__ 270
-#define smgl__ 271
-#define smgr__ 272
-
-#ifdef CAP
-char *Boolean_names[] = {
-"bw", "am", "xb", "xs", "xn", "eo", "gn", "hc", "km", "hs", "in", "da", "db", 
-"mi", "ms", "os", "es", "xt", "hz", "ul", "xo", "HC", "nx", "NR", "NP", "5i"
-}; 
-
-char *Number_names[] = { 
-"co#", "it#", "li#", "lm#", "sg#", "pb#", "vt#", "ws#", "Nl#", "lh#", "lw#"
-};
-
-char *String_names[] = {
-"bt=", "bl=", "cr=", "cs=", "ct=", "cl=", "ce=", "cd=", "ch=", "CC=", "cm=", 
-"do=", "ho=", "vi=", "le=", "CM=", "ve=", "nd=", "ll=", "up=", "vs=", "dc=", 
-"dl=", "ds=", "hd=", "as=", "mb=", "md=", "ti=", "dm=", "mh=", "im=", "mk=", 
-"mp=", "mr=", "so=", "us=", "ec=", "ae=", "me=", "te=", "ed=", "ei=", "se=", 
-"ue=", "vb=", "ff=", "fs=", "i1=", "i2=", "i3=", "if=", "ic=", "al=", "ip=", 
-"kb=", "ka=", "kC=", "kt=", "kD=", "kL=", "kd=", "kM=", "kE=", "kS=", "k0=", 
-"k1=", "k;=", "k2=", "k3=", "k4=", "k5=", "k6=", "k7=", "k8=", "k9=", "kh=", 
-"kI=", "kA=", "kl=", "kH=", "kN=", "kP=", "kr=", "kF=", "kR=", "kT=", "ku=", 
-"ke=", "ks=", "l0=", "l1=", "la=", "l2=", "l3=", "l4=", "l5=", "l6=", "l7=", 
-"l8=", "l9=", "mo=", "mm=", "nw=", "pc=", "DC=", "DL=", "DO=", "IC=", "SF=", 
-"AL=", "LE=", "RI=", "SR=", "UP=", "pk=", "pl=", "px=", "ps=", "pf=", "po=", 
-"rp=", "r1=", "r2=", "r3=", "rf=", "rc=", "cv=", "sc=", "sf=", "sr=", "sa=", 
-"st=", "wi=", "ta=", "ts=", "uc=", "hu=", "iP=", "K1=", "K3=", "K2=", "K4=", 
-"K5=", "pO=", "rP=", "ac=", "pn=", "kB=", "SX=", "RX=", "SA=", "RA=", "XN=", 
-"XF=", "eA=", "LO=", "LF=", "@1=", "@2=", "@3=", "@4=", "@5=", "@6=", "@7=", 
-"@8=", "@9=", "@0=", "%1=", "%2=", "%3=", "%4=", "%5=", "%6=", "%7=", "%8=", 
-"%9=", "%0=", "&1=", "&2=", "&3=", "&4=", "&5=", "&6=", "&7=", "&8=", "&9=", 
-"&0=", "*1=", "*2=", "*3=", "*4=", "*5=", "*6=", "*7=", "*8=", "*9=", "*0=", 
-"#1=", "#2=", "#3=", "#4=", "%a=", "%b=", "%c=", "%d=", "%e=", "%f=", "%g=", 
-"%h=", "%i=", "%j=", "!1=", "!2=", "!3=", "RF=", "F1=", "F2=", "F3=", "F4=", 
-"F5=", "F6=", "F7=", "F8=", "F9=", "FA=", "FB=", "FC=", "FD=", "FE=", "FF=", 
-"FG=", "FH=", "FI=", "FJ=", "FK=", "FL=", "FM=", "FN=", "FO=", "FP=", "FQ=", 
-"FR=", "FS=", "FT=", "FU=", "FV=", "FW=", "FX=", "FY=", "FZ=", "Fa=", "Fb=", 
-"Fc=", "Fd=", "Fe=", "Ff=", "Fg=", "Fh=", "Fi=", "Fj=", "Fk=", "Fl=", "Fm=", 
-"Fn=", "Fo=", "Fp=", "Fq=", "Fr=", "cb=", "MC=", "ML=", "MR="
-};
-#endif
-
-char *new_curse = "October 1987";
-
-char in_buff[100];	/* buffer for ungetch			*/
-int bufp;		/* next free position in in_buff	*/
-
-char *TERMINAL_TYPE = NULL; /* terminal type to be gotten from environment	*/
-int CFOUND = FALSE;
-int Data_Line_len = 0;
-int Max_Key_len;	/* max length of a sequence sent by a key	*/
-char *Data_Line = NULL;
-char *TERM_PATH = NULL;
-char *TERM_data_ptr = NULL;
-char *Term_File_name = NULL;	/* name of file containing terminal description	*/
-FILE *TFP;		/* file pointer to file with terminal des.	*/
-int Fildes;		/* file descriptor for terminfo file		*/
-int STAND = FALSE;	/* is standout mode activated?			*/
-int TERM_INFO = FALSE;	/* is terminfo being used (TRUE), or termcap (FALSE) */
-int Time_Out;	/* set when time elapsed while trying to read function key */
-int Curr_x;		/* current x position on screen			*/
-int Curr_y;		/* current y position on the screen		*/
-int LINES;
-int COLS;
-int Move_It;		/* flag to move cursor if magic cookie glitch	*/
-int initialized = FALSE;	/* tells whether new_curse is initialized	*/
-float speed;
-float chars_per_millisecond;
-int Repaint_screen;	/* if an operation to change screen impossible, repaint screen	*/
-int Intr;		/* storeage for interrupt character		*/
-int Parity;		/* 0 = no parity, 1 = odd parity, 2 = even parity */
-int Noblock;		/* for BSD systems				*/
-int Num_bits;	/* number of bits per character	*/
-int Flip_Bytes;	/* some systems have byte order reversed	*/
-int interrupt_flag = FALSE;	/* set true if SIGWINCH received	*/
-
-#ifndef CAP
-char *Strings;
-#endif
-
-struct KEYS {
-	int length;	/* length of string sent by key			*/
-	char *string;	/* string sent by key				*/
-	int value;	/* CURSES value of key (9-bit)			*/
-	};
-
-struct KEY_STACK {
-	struct KEYS *element;
-	struct KEY_STACK *next;
-	};
-
-struct KEY_STACK *KEY_TOS = NULL;
-struct KEY_STACK *KEY_POINT;
-
-/*
- |
- |	Not all systems have good terminal information, so we will define 
- |	keyboard information here for the most widely used terminal type, 
- |	the VT100.
- |
- */
-
-struct KEYS vt100[] = 
-	{
-		{ 3, "\033[A", 0403 },	/* key up 	*/
-		{ 3, "\033[C", 0405 },	/* key right	*/
-		{ 3, "\033[D", 0404 },	/* key left	*/
-
-		{ 4, "\033[6~", 0522 },	/* key next page	*/
-		{ 4, "\033[5~", 0523 },	/* key prev page	*/
-		{ 3, "\033[[", 0550 },	/* key end	*/
-		{ 3, "\033[@", 0406 },	/* key home	*/
-		{ 4, "\033[2~", 0513 },	/* key insert char	*/
-
-		{ 3, "\033[y", 0410 },	/* key F0	*/
-		{ 3, "\033[P", 0411 },	/* key F1	*/
-		{ 3, "\033[Q", 0412 },	/* key F2	*/
-		{ 3, "\033[R", 0413 },	/* key F3	*/
-		{ 3, "\033[S", 0414 },	/* key F4	*/
-		{ 3, "\033[t", 0415 },	/* key F5	*/
-		{ 3, "\033[u", 0416 },	/* key F6	*/
-		{ 3, "\033[v", 0417 },	/* key F7	*/
-		{ 3, "\033[l", 0420 },	/* key F8	*/
-		{ 3, "\033[w", 0421 },	/* key F9	*/
-		{ 3, "\033[x", 0422 },	/* key F10	*/
-
-		{ 5, "\033[10~", 0410 },	/* key F0	*/
-		{ 5, "\033[11~", 0411 },	/* key F1	*/
-		{ 5, "\033[12~", 0412 },	/* key F2	*/
-		{ 5, "\033[13~", 0413 },	/* key F3	*/
-		{ 5, "\033[14~", 0414 },	/* key F4	*/
-		{ 5, "\033[15~", 0415 },	/* key F5	*/
-		{ 5, "\033[17~", 0416 },	/* key F6	*/
-		{ 5, "\033[18~", 0417 },	/* key F7	*/
-		{ 5, "\033[19~", 0420 },	/* key F8	*/
-		{ 5, "\033[20~", 0421 },	/* key F9	*/
-		{ 5, "\033[21~", 0422 },	/* key F10	*/
-		{ 5, "\033[23~", 0423 },	/* key F11	*/
-		{ 5, "\033[24~", 0424 },	/* key F12	*/
-		{ 3, "\033[q", 0534 },	/* ka1 upper-left of keypad	*/
-		{ 3, "\033[s", 0535 },	/* ka3 upper-right of keypad	*/
-		{ 3, "\033[r", 0536 },	/* kb2 center of keypad	*/
- 		{ 3, "\033[p", 0537 },	/* kc1 lower-left of keypad	*/
-		{ 3, "\033[n", 0540 },	/* kc3 lower-right of keypad	*/
-
-		/*
-		 |	The following are the same keys as above, but with 
-		 |	a different character following the escape char.
-		 */
-
-		{ 3, "\033OA", 0403 },	/* key up 	*/
-		{ 3, "\033OC", 0405 },	/* key right	*/
-		{ 3, "\033OD", 0404 },	/* key left	*/
-		{ 3, "\033OB", 0402 },	/* key down	*/
-		{ 4, "\033O6~", 0522 },	/* key next page	*/
-		{ 4, "\033O5~", 0523 },	/* key prev page	*/
-		{ 3, "\033O[", 0550 },	/* key end	*/
-		{ 3, "\033O@", 0406 },	/* key home	*/
-		{ 4, "\033O2~", 0513 },	/* key insert char	*/
-
-		{ 3, "\033Oy", 0410 },	/* key F0	*/
-		{ 3, "\033OP", 0411 },	/* key F1	*/
-		{ 3, "\033OQ", 0412 },	/* key F2	*/
-		{ 3, "\033OR", 0413 },	/* key F3	*/
-		{ 3, "\033OS", 0414 },	/* key F4	*/
-		{ 3, "\033Ot", 0415 },	/* key F5	*/
-		{ 3, "\033Ou", 0416 },	/* key F6	*/
-		{ 3, "\033Ov", 0417 },	/* key F7	*/
-		{ 3, "\033Ol", 0420 },	/* key F8	*/
-		{ 3, "\033Ow", 0421 },	/* key F9	*/
-		{ 3, "\033Ox", 0422 },	/* key F10	*/
-
-		{ 5, "\033O10~", 0410 },	/* key F0	*/
-		{ 5, "\033O11~", 0411 },	/* key F1	*/
-		{ 5, "\033O12~", 0412 },	/* key F2	*/
-		{ 5, "\033O13~", 0413 },	/* key F3	*/
-		{ 5, "\033O14~", 0414 },	/* key F4	*/
-		{ 5, "\033O15~", 0415 },	/* key F5	*/
-		{ 5, "\033O17~", 0416 },	/* key F6	*/
-		{ 5, "\033O18~", 0417 },	/* key F7	*/
-		{ 5, "\033O19~", 0420 },	/* key F8	*/
-		{ 5, "\033O20~", 0421 },	/* key F9	*/
-		{ 5, "\033O21~", 0422 },	/* key F10	*/
-		{ 5, "\033O23~", 0423 },	/* key F11	*/
-		{ 5, "\033O24~", 0424 },	/* key F12	*/
-		{ 3, "\033Oq", 0534 },	/* ka1 upper-left of keypad	*/
-		{ 3, "\033Os", 0535 },	/* ka3 upper-right of keypad	*/
-		{ 3, "\033Or", 0536 },	/* kb2 center of keypad	*/
- 		{ 3, "\033Op", 0537 },	/* kc1 lower-left of keypad	*/
-		{ 3, "\033On", 0540 },	/* kc3 lower-right of keypad	*/
-
-		{ 0, "", 0 }	/* end	*/
-	};
-
-struct Parameters {
-	int value;
-	struct Parameters *next;
-	};
-
-int Key_vals[] = { 
-	0407, 0526, 0515, 0525, 0512, 0510, 0402, 0514, 0517, 0516, 0410, 0411, 
-	0422, 0412, 0413, 0414, 0415, 0416, 0417, 0420, 0421, 0406, 0513, 0511, 
-	0404, 0533, 0522, 0523, 0405, 0520, 0521, 0524, 0403, 
-	0534, 0535, 0536, 0537, 0540, 0541, 0542, 0543, 0544, 0545, 0546, 0547, 
-	0550, 0527, 0551, 0552, 0553, 0554, 0555, 0556, 0557, 0560, 0561, 0562, 
-	0532, 0563, 0564, 0565, 0566, 0567, 0570, 0571, 0627, 0630, 0572, 0573, 
-	0574, 0575, 0576, 0577, 0600, 0601, 0602, 0603, 0604, 0605, 0606, 0607, 
-	0610, 0611, 0612, 0613, 0614, 0615, 0616, 0617, 0620, 0621, 0622, 0623, 
-	0624, 0625, 0626, 0423, 0424, 0425, 0426, 0427, 0430, 0431, 
-	0432, 0433, 0434, 0435, 0436, 0437, 0440, 0441, 0442, 0443, 0444, 0445, 
-	0446, 0447, 0450, 0451, 0452, 0453, 0454, 0455, 0456, 0457, 0460, 0461, 
-	0462, 0463, 0464, 0465, 0466, 0467, 0470, 0471, 0472, 0473, 0474, 0475, 
-	0476, 0477, 0500, 0501, 0502, 0503, 0504, 0505, 0506, 0507
-};
-
-int attributes_set[9];
-
-static int nc_attributes = 0;	/* global attributes for new_curse to observe */
-
-#ifdef SYS5
-struct termio Terminal;
-struct termio Saved_tty;
-#else
-struct sgttyb Terminal;
-struct sgttyb Saved_tty;
-#endif
-
-char *tc_;
-
-int Booleans[128];	
-int Numbers[128];
-char *String_table[1024];
-
-int *virtual_lines;
-
-static char nc_scrolling_ability = FALSE;
-
-#ifdef CAP
-
-#if __STDC__ || defined(__cplusplus)
-#define P_(s) s
-#else
-#define P_(s) ()
-#endif /* __STDC__ */
-
-int tc_Get_int P_((int));
-void CAP_PARSE P_((void));
-void Find_term P_((void));
-
-#undef P_
-
-#endif /* CAP */
-
-
-#ifndef __STDC__
-#ifndef HAS_STDLIB
-extern char *fgets();
-extern char *malloc();
-extern char *getenv();
-FILE *fopen();			/* declaration for open function	*/
-#endif /* HAS_STDLIB */
-#endif /* __STDC__ */
-
-#ifdef SIGWINCH
-
-/*
- |	Copy the contents of one window to another.
- */
-
-void 
-copy_window(WINDOW *origin, WINDOW *destination)
-{
-	int row, column;
-	struct _line *orig, *dest;
-
-	orig = origin->first_line;
-	dest = destination->first_line;
-
-	for (row = 0; 
-		row < (min(origin->Num_lines, destination->Num_lines)); 
-			row++)
-	{
-		for (column = 0; 
-		    column < (min(origin->Num_cols, destination->Num_cols)); 
-			column++)
-		{
-			dest->row[column] = orig->row[column];
-			dest->attributes[column] = orig->attributes[column];
-		}
-		dest->changed = orig->changed;
-		dest->scroll = orig->scroll;
-		dest->last_char = min(orig->last_char, destination->Num_cols);
-		orig = orig->next_screen;
-		dest = dest->next_screen;
-	}
-	destination->LX = min((destination->Num_cols - 1), origin->LX);
-	destination->LY = min((destination->Num_lines - 1), origin->LY);
-	destination->Attrib = origin->Attrib;
-	destination->scroll_up = origin->scroll_up;
-	destination->scroll_down = origin->scroll_down;
-	destination->SCROLL_CLEAR = origin->SCROLL_CLEAR;
-}
-
-void 
-reinitscr(int foo)
-{
-	WINDOW *local_virt;
-	WINDOW *local_std;
-	WINDOW *local_cur;
-
-	signal(SIGWINCH, reinitscr);
-#ifdef TIOCGWINSZ
-	if (ioctl(0, TIOCGWINSZ, &ws) >= 0)
-	{
-		if (ws.ws_row == LINES && ws.ws_col == COLS) 
-			return;
-		if (ws.ws_row > 0) 
-			LINES = ws.ws_row;
-		if (ws.ws_col > 0) 
-			COLS = ws.ws_col;
-	}
-#endif /* TIOCGWINSZ */
-	local_virt = newwin(LINES, COLS, 0, 0);
-	local_std = newwin(LINES, COLS, 0, 0);
-	local_cur = newwin(LINES, COLS, 0, 0);
-	copy_window(virtual_scr, local_virt);
-	copy_window(stdscr, local_std);
-	copy_window(curscr, local_cur);
-	delwin(virtual_scr);
-	delwin(stdscr);
-	delwin(curscr);
-	virtual_scr = local_virt;
-	stdscr = local_std;
-	curscr = local_cur;
-	free(virtual_lines);
-	virtual_lines = (int *) malloc(LINES * (sizeof(int)));
-	interrupt_flag = TRUE;
-}
-#endif /* SIGWINCH */
-
-void 
-initscr(void)		/* initialize terminal for operations	*/
-{
-	int value;
-	char *lines_string;
-	char *columns_string;
-#ifdef CAP
-	char *pointer;
-#endif /* CAP */
-
-#ifdef DIAG
-printf("starting initscr \n");fflush(stdout);
-#endif
-	if (initialized)
-		return;
-#ifdef BSD_SELECT
-	setbuf(stdin, NULL);
-#endif /* BSD_SELECT */
-	Flip_Bytes = FALSE;
-	Parity = 0;
-	Time_Out = FALSE;
-	bufp = 0;
-	Move_It = FALSE;
-	Noblock = FALSE;
-#ifdef SYS5
-	value = ioctl(0, TCGETA, &Terminal);
-	if (Terminal.c_cflag & PARENB)
-	{
-		if (Terminal.c_cflag & PARENB)
-			Parity = 1;
-		else
-			Parity = 2;
-	}
-	if ((Terminal.c_cflag & CS8) == CS8)
-	{
-		Num_bits = 8;
-	}
-	else if ((Terminal.c_cflag & CS7) == CS7)
-		Num_bits = 7;
-	else if ((Terminal.c_cflag & CS6) == CS6)
-		Num_bits = 6;
-	else
-		Num_bits = 5;
-	value = Terminal.c_cflag & 037;
-	switch (value) {
-	case 01:	speed = 50.0;
-		break;
-	case 02:	speed = 75.0;
-		break;
-	case 03:	speed = 110.0;
-		break;
-	case 04:	speed = 134.5;
-		break;
-	case 05:	speed = 150.0;
-		break;
-	case 06:	speed = 200.0;
-		break;
-	case 07:	speed = 300.0;
-		break;
-	case 010:	speed = 600.0;
-		break;
-	case 011:	speed = 900.0;
-		break;
-	case 012:	speed = 1200.0;
-		break;
-	case 013:	speed = 1800.0;
-		break;
-	case 014:	speed = 2400.0;
-		break;
-	case 015:	speed = 3600.0;
-		break;
-	case 016:	speed = 4800.0;
-		break;
-	case 017:	speed = 7200.0;
-		break;
-	case 020:	speed = 9600.0;
-		break;
-	case 021:	speed = 19200.0;
-		break;
-	case 022:	speed = 38400.0;
-		break;
-	default:	speed = 0.0;
-	}
-#else
-	value = ioctl(0, TIOCGETP, &Terminal);
-	if (Terminal.sg_flags & EVENP)
-		Parity = 2;
-	else if (Terminal.sg_flags & ODDP)
-		Parity = 1;
-	value = Terminal.sg_ospeed;
-	switch (value) {
-	case 01:	speed = 50.0;
-		break;
-	case 02:	speed = 75.0;
-		break;
-	case 03:	speed = 110.0;
-		break;
-	case 04:	speed = 134.5;
-		break;
-	case 05:	speed = 150.0;
-		break;
-	case 06:	speed = 200.0;
-		break;
-	case 07:	speed = 300.0;
-		break;
-	case 010:	speed = 600.0;
-		break;
-	case 011:	speed = 1200.0;
-		break;
-	case 012:	speed = 1800.0;
-		break;
-	case 013:	speed = 2400.0;
-		break;
-	case 014:	speed = 4800.0;
-		break;
-	case 015:	speed = 9600.0;
-		break;
-	default:	speed = 0.0;
-	}
-#endif
-	chars_per_millisecond = (0.001 * speed) / 8.0;
-	TERMINAL_TYPE = getenv("TERM");
-	if (TERMINAL_TYPE == NULL)
-	{
-		printf("unknown terminal type\n");
-		exit(0);
-	}
-#ifndef CAP
-	Fildes = -1;
-	TERM_PATH = getenv("TERMINFO");
-	if (TERM_PATH != NULL)
-	{
-		Data_Line_len = 23 + strlen(TERM_PATH) + strlen(TERMINAL_TYPE);
-		Term_File_name = malloc(Data_Line_len);
-		sprintf(Term_File_name, "%s/%c/%s", TERM_PATH, *TERMINAL_TYPE, TERMINAL_TYPE);
-		Fildes = open(Term_File_name, O_RDONLY);
-	}
-	if (Fildes == -1)
-	{
-		TERM_PATH = "/usr/lib/terminfo";
-		Data_Line_len = 23 + strlen(TERM_PATH) + strlen(TERMINAL_TYPE);
-		Term_File_name = malloc(Data_Line_len);
-		sprintf(Term_File_name, "%s/%c/%s", TERM_PATH, *TERMINAL_TYPE, TERMINAL_TYPE);
-		Fildes = open(Term_File_name, O_RDONLY);
-	}
-	if (Fildes == -1)
-	{
-		TERM_PATH = "/usr/share/lib/terminfo";
-		Data_Line_len = 23 + strlen(TERM_PATH) + strlen(TERMINAL_TYPE);
-		Term_File_name = malloc(Data_Line_len);
-		sprintf(Term_File_name, "%s/%c/%s", TERM_PATH, *TERMINAL_TYPE, TERMINAL_TYPE);
-		Fildes = open(Term_File_name, O_RDONLY);
-	}
-	if (Fildes == -1)
-	{
-		TERM_PATH = "/usr/share/terminfo";
-		Data_Line_len = 23 + strlen(TERM_PATH) + strlen(TERMINAL_TYPE);
-		Term_File_name = malloc(Data_Line_len);
-		sprintf(Term_File_name, "%s/%c/%s", TERM_PATH, *TERMINAL_TYPE, TERMINAL_TYPE);
-		Fildes = open(Term_File_name, O_RDONLY);
-	}
-	if (Fildes == -1)
-	{
-		free(Term_File_name);
-		Term_File_name = NULL;
-	}
-	else
-		TERM_INFO = INFO_PARSE();
-#else
-	/*
-	 |	termcap information can be in the TERMCAP env variable, if so 
-	 |	use that, otherwise check the /etc/termcap file
-	 */
-	if ((pointer = Term_File_name = getenv("TERMCAP")) != NULL)
-	{
-		if (*Term_File_name != '/')
-			Term_File_name = "/etc/termcap";
-	}
-	else
-	{
-		Term_File_name = "/etc/termcap";
-	}
-	if ((TFP = fopen(Term_File_name, "r")) == NULL)
-	{
-		printf("unable to open /etc/termcap file \n");
-		exit(0);
-	}
- 	for (value = 0; value < 1024; value++)	
-		String_table[value] = NULL;
-	for (value = 0; value < 128; value++)	
-		Booleans[value] = 0;
-	for (value = 0; value < 128; value++)	
-		Numbers[value] = 0;
-	Data_Line = malloc(512);
-	if (pointer && *pointer != '/')
-	{
-		TERM_data_ptr = pointer;
-		CAP_PARSE();
-	}
-	else
-	{
-		Find_term();
-		CAP_PARSE();
-	}
-#endif
-	if (String_table[pc__] == NULL) 
-		String_table[pc__] = "\0";
-	if ((String_table[cm__] == NULL) || (Booleans[hc__]))
-	{
-		fprintf(stderr, "sorry, unable to use this terminal type for screen editing\n");
-		exit(0);
-	}
-	Key_Get();
-	keys_vt100();
-	LINES = Numbers[li__];
-	COLS = Numbers[co__];
-	if ((lines_string = getenv("LINES")) != NULL)
-	{
-		value = atoi(lines_string);
-		if (value > 0)
-			LINES = value;
-	}
-	if ((columns_string = getenv("COLUMNS")) != NULL)
-	{
-		value = atoi(columns_string);
-		if (value > 0)
-			COLS = value;
-	}
-#ifdef TIOCGWINSZ
-	/*
-	 |	get the window size
-	 */
-	if (ioctl(0, TIOCGWINSZ, &ws) >= 0)
-	{
-		if (ws.ws_row > 0)
-			LINES = ws.ws_row;
-		if (ws.ws_col > 0)
-			COLS = ws.ws_col;
-	}
-#endif
-	virtual_scr = newwin(LINES, COLS, 0, 0);
-	stdscr = newwin(LINES, COLS, 0, 0);
-	curscr = newwin(LINES, COLS, 0, 0);
-	wmove(stdscr, 0, 0);
-	werase(stdscr);
-	Repaint_screen = TRUE;
-	initialized = TRUE;
-	virtual_lines = (int *) malloc(LINES * (sizeof(int)));
-
-#ifdef SIGWINCH
-	/*
-	 |	reset size of windows and LINES and COLS if term window 
-	 |	changes size
-	 */
-	signal(SIGWINCH, reinitscr);
-#endif /* SIGWINCH */
-
-	/*
-	 |	check if scrolling is available
-	 */
-
-	nc_scrolling_ability = ((String_table[al__] != NULL) && 
-				(String_table[dl__])) || ((String_table[cs__]) 
-				&& (String_table[sr__]));
-
-}
-
-#ifndef CAP
-int 
-Get_int(void)		/* get a two-byte integer from the terminfo file */
-{
-	int High_byte;
-	int Low_byte;
-	int temp;
-
-	Low_byte = *((unsigned char *) TERM_data_ptr++);
-	High_byte = *((unsigned char *) TERM_data_ptr++);
-	if (Flip_Bytes)
-	{
-		temp = Low_byte;
-		Low_byte = High_byte;
-		High_byte = temp;
-	}
-	if ((High_byte == 255) && (Low_byte == 255))
-		return (-1);
-	else
-		return(Low_byte + (High_byte * 256));
-}
-
-int 
-INFO_PARSE(void)		/* parse off the data in the terminfo data file	*/
-{
-	int offset;
-	int magic_number = 0;
-	int counter = 0;
-	int Num_names = 0;
-	int Num_bools = 0;
-	int Num_ints = 0;
-	int Num_strings = 0;
-	int string_table_len = 0;
-	char *temp_ptr;
-
-	TERM_data_ptr = Data_Line = malloc((10240 * (sizeof(char))));
-	Data_Line_len = read(Fildes, Data_Line, 10240);
-	if ((Data_Line_len >= 10240) || (Data_Line_len < 0))
-		return(0);
-	/*
-	 |	get magic number
-	 */
-	magic_number = Get_int();
-	/*
-	 |	if magic number not right, reverse byte order and check again
-	 */
-	if (magic_number != 282)
-	{
-		Flip_Bytes = TRUE;
-		TERM_data_ptr--;
-		TERM_data_ptr--;
-		magic_number = Get_int();
-		if (magic_number != 282)
-			return(0);
-	}
-	/*
-	 |	get the number of each type in the terminfo data file
-	 */
-	Num_names = Get_int();
-	Num_bools = Get_int();
-	Num_ints = Get_int();
-	Num_strings = Get_int();
-	string_table_len = Get_int();
-	Strings = malloc(string_table_len);
-	while (Num_names > 0)
-	{
-		TERM_data_ptr++;
-		Num_names--;
-	}
-	counter = 0;
-	while (Num_bools)
-	{
-		Num_bools--;
-		Booleans[counter++] = *TERM_data_ptr++;
-	}
-	if (((unsigned int) TERM_data_ptr) & 1)	/* force alignment	*/
-		TERM_data_ptr++;
-	counter = 0;
-	while (Num_ints)
-	{
-		Num_ints--;
-		Numbers[counter] = Get_int();
-		counter++;
-	}
-	temp_ptr = TERM_data_ptr + Num_strings + Num_strings;
-	memcpy(Strings, temp_ptr, string_table_len);
-	counter = bt__;
-	while (Num_strings)
-	{
-		Num_strings--;
-		if ((offset=Get_int()) != -1)
-		{
-			if (String_table[counter] == NULL)
-				String_table[counter] = Strings + offset;
-		}
-		else
-			String_table[counter] = NULL;
-		counter++;
-	}
-	close(Fildes);
-	free(Data_Line);
-	return(TRUE);
-}
-#endif		/* ifndef CAP	*/
-
-int 
-AtoI(void)		/* convert ascii text to integers	*/
-{
-	int Temp;
-
-	Temp = 0;
-	while ((*TERM_data_ptr >= '0') && (*TERM_data_ptr <= '9'))
-	{
-		Temp = (Temp * 10) + (*TERM_data_ptr - '0');
-		TERM_data_ptr++;
-	}
-	return(Temp);
-}
-
-void 
-Key_Get(void)		/* create linked list with all key sequences obtained from terminal database	*/
-{
-	int Counter;
-	int Klen;
-	int key_def;
-	struct KEY_STACK *Spoint;
-
-	Max_Key_len = 0;
-	Counter = 0;
-	key_def = kb__;
-	while (key_def <= kf63__)
-	{
-		if (key_def == ke__)
-			key_def = K1__;
-		else if (key_def == (K5__ + 1))
-			key_def = kcbt__;
-		else if (key_def == (kcbt__ + 1))
-			key_def = kbeg__;
-		else if (key_def == (kUND__ + 1))
-			key_def = kf11__;
-		if (String_table[key_def] != NULL)
-		{
-			if (KEY_TOS == NULL)
-				Spoint = KEY_TOS = (struct KEY_STACK *) malloc(sizeof(struct KEY_STACK));
-			else
-			{
-				Spoint = KEY_TOS;
-				while (Spoint->next != NULL)
-					Spoint = Spoint->next;
-				Spoint->next = (struct KEY_STACK *) malloc(sizeof(struct KEY_STACK));
-				Spoint = Spoint->next;
-			}
-			Spoint->next = NULL;
-			Spoint->element = (struct KEYS *) malloc(sizeof(struct KEYS));
-			Spoint->element->string = String_table[key_def];
-			Spoint->element->length = strlen(String_table[key_def]);
-			Spoint->element->value = Key_vals[Counter];
-			Klen = strlen(Spoint->element->string);
-			if (Klen > Max_Key_len)
-				Max_Key_len = Klen;
-			/*
-			 |  Some terminal types accept keystrokes of the form
-			 |  \E[A and \EOA, substituting '[' for 'O'.  Make a 
-			 |  duplicate of such key strings (since the 
-			 |  database will only have one version) so new_curse 
-			 |  can understand both.
-			 */
-			if ((Spoint->element->length > 1) && 
-			    ((String_table[key_def][1] == '[') || 
-			     (String_table[key_def][1] == 'O')))
-			{
-				Spoint->next = (struct KEY_STACK *) malloc(sizeof(struct KEY_STACK));
-				Spoint = Spoint->next;
-				Spoint->next = NULL;
-				Spoint->element = (struct KEYS *) malloc(sizeof(struct KEYS));
-				Spoint->element->length = strlen(String_table[key_def]);
-				Spoint->element->string = malloc(Spoint->element->length + 1);
-				strcpy(Spoint->element->string, String_table[key_def]);
-				Spoint->element->value = Key_vals[Counter];
-				Klen = strlen(Spoint->element->string);
-				if (Klen > Max_Key_len)
-					Max_Key_len = Klen;
-			
-				if (String_table[key_def][1] == '[')
-					Spoint->element->string[1] = 'O';
-				else
-					Spoint->element->string[1] = '[';
-			}
-		}
-		key_def++;
-		Counter++;
-	}
-}
-
-/*
- |	insert information about keys for a vt100 terminal
- */
-
-void
-keys_vt100(void)
-{
-	int counter;
-	int Klen;
-	struct KEY_STACK *Spoint;
-
-	Spoint = KEY_TOS;
-	while (Spoint->next != NULL)
-		Spoint = Spoint->next;
-	for (counter = 0; vt100[counter].length != 0; counter++)
-	{
-		Spoint->next = (struct KEY_STACK *) malloc(sizeof(struct KEY_STACK));
-		Spoint = Spoint->next;
-		Spoint->next = NULL;
-		Spoint->element = &vt100[counter];
-		Klen = strlen(Spoint->element->string);
-		if (Klen > Max_Key_len)
-			Max_Key_len = Klen;
-	}
-}
-
-#ifdef CAP
-char *
-String_Get(char *param)		/* read the string */
-{
-	char *String;
-	char *Temp;
-	int Counter;
-
-	if (param == NULL)
-	{
-		while (*TERM_data_ptr != '=')
-			TERM_data_ptr++;
-		Temp = ++TERM_data_ptr;
-		Counter = 1;
-		while ((*Temp != ':') && (*Temp != (char)NULL))
-		{
-			Counter++;
-			Temp++;
-		}
-		if (Counter == 1)	/* no data */
-			return(NULL);
-		String = Temp = malloc(Counter);
-		while ((*TERM_data_ptr != ':') && (*TERM_data_ptr != (char)NULL))
-		{
-			if (*TERM_data_ptr == '\\')
-			{
-				TERM_data_ptr++;
-				if (*TERM_data_ptr == 'n')
-					*Temp = '\n';
-				else if (*TERM_data_ptr == 't')
-					*Temp = '\t';
-				else if (*TERM_data_ptr == 'b')
-					*Temp = '\b';
-				else if (*TERM_data_ptr == 'r')
-					*Temp = '\r';
-				else if (*TERM_data_ptr == 'f')
-					*Temp = '\f';
-				else if ((*TERM_data_ptr == 'e') || (*TERM_data_ptr == 'E'))
-					*Temp = '\033';		/* escape */
-				else if (*TERM_data_ptr == '\\')
-					*Temp = '\\';
-				else if (*TERM_data_ptr == '\'')
-					*Temp = '\'';
-				else if ((*TERM_data_ptr >= '0') && (*TERM_data_ptr <= '9'))
-				{
-					Counter = 0;
-					while ((*TERM_data_ptr >= '0') && (*TERM_data_ptr <= '9'))
-					{
-						Counter = (8 * Counter) + (*TERM_data_ptr - '0');
-						TERM_data_ptr++;  /* ? */
-					}
-					*Temp = Counter;
-					TERM_data_ptr--;
-				}
-				TERM_data_ptr++;
-				Temp++;
-			}
-			else if (*TERM_data_ptr == '^')
-			{
-				TERM_data_ptr++;
-				if ((*TERM_data_ptr >= '@') && (*TERM_data_ptr <= '_'))
-					*Temp = *TERM_data_ptr - '@';
-				else if (*TERM_data_ptr == '?')
-					*Temp = 127;
-				TERM_data_ptr++;
-				Temp++;
-			}
-			else
-				*Temp++ = *TERM_data_ptr++;
-		}
-		*Temp = (char)NULL;
-		param = String;
-	}
-	else
-	{
-		while ((*TERM_data_ptr != (char)NULL) && (*TERM_data_ptr != ':'))
-			TERM_data_ptr++;
-	}
-	return(param);
-}
-
-int 
-tc_Get_int(int param)		/* read the integer			*/
-{
-	int Itemp;
-
-	if (param == 0)
-	{
-		while ((*TERM_data_ptr != (char)NULL) && (*TERM_data_ptr != '#'))
-			TERM_data_ptr++;
-		TERM_data_ptr++;
-		Itemp = AtoI();
-		param = Itemp;
-	}
-	else
-	{
-		while (*TERM_data_ptr != ':')
-			TERM_data_ptr++;
-	}
-	return(param);
-}
-
-void 
-Find_term(void)		/* find terminal description in termcap file	*/
-{
-	char *Name;
-	char *Ftemp;
-
-	Ftemp = Name = malloc(strlen(TERMINAL_TYPE + 1) + 1);
-	strcpy(Name, TERMINAL_TYPE);
-	while (*Ftemp != (char)NULL)
-		Ftemp++;
-	*Ftemp++ = '|';
-	*Ftemp = (char)NULL;
-	CFOUND = FALSE;
-	Data_Line_len = strlen(TERMINAL_TYPE) + 1;
-	while ((!CFOUND) && ((TERM_data_ptr=fgets(Data_Line, 512, TFP)) != NULL))
-	{
-		if ((*TERM_data_ptr != ' ') && (*TERM_data_ptr != '\t') && (*TERM_data_ptr != '#'))
-		{
-			while ((!CFOUND) && (*TERM_data_ptr != (char)NULL))
-			{
-				CFOUND = !strncmp(TERM_data_ptr, Name, Data_Line_len);
-				while ((*TERM_data_ptr != (char)NULL) && (*TERM_data_ptr != '|') && (*TERM_data_ptr != '#') && (*TERM_data_ptr != ':'))
-					TERM_data_ptr++;
-				if (*TERM_data_ptr == '|')
-					TERM_data_ptr++;
-				else if (!CFOUND)
-					*TERM_data_ptr = (char)NULL;
-			}
-		}
-	}
-	if (!CFOUND)
-	{
-		printf("terminal type %s not found\n", TERMINAL_TYPE);
-		exit(0);
-	}
-}
-
-void 
-CAP_PARSE(void)		/* parse off the data in the termcap data file	*/
-{
-	int offset;
-	int found;
-
-	do
-	{
-		while (*TERM_data_ptr != (char)NULL)
-		{
-			for (found = FALSE, offset = 0; (!found) && (offset < 26); offset++)
-			{
-				if (!strncmp(TERM_data_ptr, Boolean_names[offset], 2))
-				{
-					found = TRUE;
-					Booleans[offset] = TRUE;
-				}
-			}
-			if (!found)
-			{
-				for (found = FALSE, offset = 0; (!found) && (offset < lw__); offset++)
-				{
-					if (!strncmp(TERM_data_ptr, Number_names[offset], 3))
-					{
-						found = TRUE;
-						Numbers[offset] = tc_Get_int(Numbers[offset]);
-					}
-				}
-			}
-			if (!found)
-			{
-				for (found = FALSE, offset = 0; (!found) && (offset < smgr__); offset++)
-				{
-					if (!strncmp(TERM_data_ptr, String_names[offset], 3))
-					{
-						found = TRUE;
-						String_table[offset] = String_Get(String_table[offset]);
-					}
-				}
-			}
-
-			if (!strncmp(TERM_data_ptr, "tc=", 3))
-				tc_ = String_Get(NULL);
-			while ((*TERM_data_ptr != ':') && (*TERM_data_ptr != (char)NULL))
-				TERM_data_ptr++;
-			if (*TERM_data_ptr == ':')
-				TERM_data_ptr++;
-		}
-	} while (((TERM_data_ptr = fgets(Data_Line, 512, TFP)) != NULL) && ((*TERM_data_ptr == ' ') || (*TERM_data_ptr == '\t')));
-	if (tc_ != NULL)
-	{
-		TERMINAL_TYPE = tc_;
-		rewind(TFP);
-		Find_term();
-		free(tc_);
-		tc_ = NULL;
-		CAP_PARSE();
-	}
-	else
-		fclose(TFP);
-}
-#endif		/* ifdef CAP	*/
-
-struct _line *
-Screenalloc(int columns)
-{
-	int i;
-	struct _line *tmp;
-
-	tmp = (struct _line *) malloc(sizeof (struct _line));
-	tmp->row = malloc(columns + 1);
-	tmp->attributes = malloc(columns + 1);
-	tmp->prev_screen = NULL;
-	tmp->next_screen = NULL;
-	for (i = 0; i < columns; i++)
-	{
-		tmp->row[i] = ' ';
-		tmp->attributes[i] = (char) NULL;
-	}
-	tmp->scroll = tmp->changed = FALSE;
-	tmp->row[0] = (char) NULL;
-	tmp->attributes[0] = (char) NULL;
-	tmp->row[columns] = (char) NULL;
-	tmp->attributes[columns] = (char) NULL;
-	tmp->last_char = 0;
-	return(tmp);
-}
-
-/*
-lines, cols: number of lines and columns to be in window
-start_l, start_c: starting line and column to be in window
-*/
-WINDOW *
-newwin(int lines, int cols, int start_l, int start_c)
-{
-	WINDOW *Ntemp;
-	struct _line *temp_screen;
-	int i;
-
-	Ntemp = (WINDOW *) malloc(sizeof(WINDOW));
-	Ntemp->SR = start_l;
-	Ntemp->SC = start_c;
-	Ntemp->Num_lines = lines;
-	Ntemp->Num_cols = cols;
-	Ntemp->LX = 0;
-	Ntemp->LY = 0;
-	Ntemp->scroll_down = Ntemp->scroll_up = 0;
-	Ntemp->SCROLL_CLEAR = FALSE;
-	Ntemp->Attrib = FALSE;
-	Ntemp->first_line = temp_screen = Screenalloc(cols);
-	Ntemp->first_line->number = 0;
-	for (i = 1; i < lines; i++)
-	{
-		temp_screen->next_screen = Screenalloc(cols);
-		temp_screen->next_screen->number = i;
-		temp_screen->next_screen->prev_screen = temp_screen;
-		temp_screen = temp_screen->next_screen;
-	}
-	Ntemp->first_line->prev_screen = NULL;
-	temp_screen->next_screen = NULL;
-	return(Ntemp);
-}
-
-#ifdef CAP
-/*
-p_list: stack of values
-place: place keeper of top of stack
-*/
-void 
-Cap_Out(char *string, int *p_list, int place)
-/* interpret the output string if necessary */
-{
-	char *Otemp;		/* temporary string pointer to parse output */
-	int delay;
-	int p1, p2, temp;
-	float chars;
-
-	if (string == NULL)
-		return;
-
-	if (p_list != NULL)
-	{
-		p1 = p_list[--place];
-		p2 = p_list[--place];
-	}
-	delay = 0;
-	Otemp = string;
-	if ((*Otemp >= '0') && (*Otemp <= '9'))
-	{
-		delay = atoi(Otemp);
-		while ((*Otemp >= '0') && (*Otemp <= '9'))
-			Otemp++;
-		if (*Otemp == '*')
-			Otemp++;
-	}
-	while (*Otemp != (char)NULL)
-	{
-		if (*Otemp == '%')
-		{
-			Otemp++;
-			if ((*Otemp == 'd') || (*Otemp == '2') || (*Otemp == '3') || (*Otemp == '.') || (*Otemp == '+')) 
-			{
-				if (*Otemp == 'd')
-				 	printf("%d", p1);
-				else if (*Otemp == '2')
-					printf("%02d", p1);
-				else if (*Otemp == '3')
-					printf("%03d", p1);
-				else if (*Otemp == '+')
-				{
-					Otemp++;
-					p1 += *Otemp;
-					putchar(p1);
-				}
-				else if (*Otemp == '.')
-					putchar(p1);
-				p1 = p2;
-				p2 = 0;
-			}
-			else if (*Otemp == '>')
-			{
-				Otemp++;
-				if (p1 > *Otemp)
-				{
-					Otemp++;
-					p1 += *Otemp;
-				}
-				else
-					Otemp++;
-			}
-			else if (*Otemp == 'r')
-			{
-				temp = p1;
-				p1 = p2;
-				p2 = temp;
-			}
-			else if (*Otemp == 'i')
-			{
-				p1++;
-				p2++;
-			}
-			else if (*Otemp == '%')
-				putchar(*Otemp);
-			else if (*Otemp == 'n')
-			{
-				p1 ^= 0140;
-				p2 ^= 0140;
-			}
-			else if (*Otemp == 'B')
-			{
-				p1 = (16 * (p1/10)) + (p1 % 10);
-				p2 = (16 * (p2/10)) + (p2 % 10);
-			}
-			else if (*Otemp == 'D')
-			{
-				p1 = (p1 - 2 * (p1 % 16));
-				p2 = (p2 - 2 * (p2 % 16));
-			}
-		}
-		else
-			putchar (*Otemp);
-		Otemp++;
-	}
-	if (delay != 0)
-	{
-		chars = delay * chars_per_millisecond;
-		delay = chars;
-		if ((chars - delay) > 0.0)
-			delay++;
-		for (; delay > 0; delay--)
-			putchar(*String_table[pc__]);
-	}
-	fflush(stdout);
-}
-
-#else
-
-	char *Otemp;		/* temporary string pointer to parse output */
-	float chars;
-	int p[10];
-	int variable[27];
-
-int 
-Operation(int *Temp_Stack, int place)	/* handle conditional operations	*/
-{
-	int temp;
-
-	if (*Otemp == 'd')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-	 	printf("%d", temp);
-	}
-	else if (!strncmp(Otemp, "2d", 2))
-	{
-		temp = Temp_Stack[--place];
-		printf("%2d", temp);
-		Otemp++;
-		Otemp++;
-	}
-	else if (!strncmp(Otemp, "3d", 2))
-	{
-		temp = Temp_Stack[--place];
-		printf("%0d", temp);
-		Otemp++;
-		Otemp++;
-	}
-	else if (!strncmp(Otemp, "02d", 3))
-	{
-		temp = Temp_Stack[--place];
-		printf("%02d", temp);
-		Otemp++;
-		Otemp++;
-		Otemp++;
-	}
-	else if (!strncmp(Otemp, "03d", 3))
-	{
-		temp = Temp_Stack[--place];
-		printf("%03d", temp);
-		Otemp++;
-		Otemp++;
-		Otemp++;
-	}
-	else if (*Otemp == '+')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp += Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '-')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp -= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '*')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp *= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '/')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp /= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == 'm')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp %= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '&')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp &= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '|')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp |= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '^')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp ^= Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '=')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp = (temp == Temp_Stack[--place]);
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '>')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp = temp > Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == '<')
-	{
-		Otemp++;
-		temp = Temp_Stack[--place];
-		temp = temp < Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-	}
-	else if (*Otemp == 'c')
-	{
-		Otemp++;
-		putchar(Temp_Stack[--place]);
-	}
-	else if (*Otemp == 'i')
-	{
-		Otemp++;
-		p[1]++;
-		p[2]++;
-	}
-	else if (*Otemp == '%')
-	{
-		putchar(*Otemp);
-		Otemp++;
-	}
-	else if (*Otemp == '!')
-	{
-		temp = ! Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-		Otemp++;
-	}
-	else if (*Otemp == '~')
-	{
-		temp = ~Temp_Stack[--place];
-		Temp_Stack[place++] = temp;
-		Otemp++;
-	}
-	else if (*Otemp == 'p')
-	{
-		Otemp++;
-		Temp_Stack[place++] = p[*Otemp - '0'];
-		Otemp++;
-	}
-	else if (*Otemp == 'P')
-	{
-		Otemp++;
-		Temp_Stack[place++] = variable[*Otemp - 'a'];
-		Otemp++;
-	}
-	else if (*Otemp == 'g')
-	{
-		Otemp++;
-		variable[*Otemp - 'a'] = Temp_Stack[--place];
-		Otemp++;
-	}
-	else if (*Otemp == '\'')
-	{
-		Otemp++;
-		Temp_Stack[place++] = *Otemp;
-		Otemp++;
-		Otemp++;
-	}
-	else if (*Otemp == '{')
-	{
-		Otemp++;
-		temp = atoi(Otemp);
-		Temp_Stack[place++] = temp;
-		while (*Otemp != '}')
-			Otemp++;
-		Otemp++;
-	}
-	return(place);
-}
-
-void 
-Info_Out(char *string, int *p_list, int place)
-/* interpret the output string if necessary */
-{
-	char *tchar;
-	int delay;
-	int temp;
-	int Cond_FLAG;
-	int EVAL;
-	int Cond_Stack[128];
-	int Cond_place;
-	int Stack[128];
-	int Top_of_stack;
-
-	if (string == NULL)
-		return;
-
-	Cond_FLAG = FALSE;
-	Cond_place = 0;
-	Top_of_stack = 0;
-	p[0] = 0;
-	p[1] = 0;
-	p[2] = 0;
-	p[3] = 0;
-	p[4] = 0;
-	p[5] = 0;
-	p[6] = 0;
-	p[7] = 0;
-	p[8] = 0;
-	p[9] = 0;
-	if (p_list != NULL)
-	{
-		for (temp = 1; (place != 0); temp++)
-		{
-			p[temp] = p_list[--place];
-		}
-	}
-	delay = 0;
-	Otemp = string;
-	while (*Otemp != (char) NULL)
-	{
-		if (*Otemp == '%')
-		{
-			Otemp++;
-			if ((*Otemp == '?') || (*Otemp == 't') || (*Otemp == 'e') || (*Otemp == ';'))
-			{
-				if (*Otemp == '?')
-				{
-					Otemp++;
-					Cond_FLAG = TRUE;
-					EVAL = TRUE;
-					while (EVAL)
-					{
-						/*
-						 |  find the end of the 
-						 |  conditional statement
-						 */
-						while ((strncmp(Otemp, "%t", 2)) && (*Otemp != (char) NULL))
-						{
-							/*
-							 |  move past '%'
-							 */
-							Otemp++;
-							Cond_place = Operation(Cond_Stack, Cond_place);
-						}
-
-						/*
-						 |  if condition is true
-						 */
-						if ((Cond_place > 0) && (Cond_Stack[Cond_place-1]))
-						{
-							/*
-							 |  end conditional 
-							 |  parsing
-							 */
-							EVAL = FALSE;
-							Otemp++;
-							Otemp++;
-						}
-						else	/* condition is false */
-						{
-							/*
-							 |  find 'else' or end 
-							 |  of if statement
-							 */
-							while ((strncmp(Otemp, "%e", 2)) && (strncmp(Otemp, "%;", 2)) && (*Otemp != (char) NULL))
-								Otemp++;
-							/*
-							 |  if an 'else' found
-							 */
-							if ((*Otemp != (char) NULL) && (!strncmp(Otemp, "%e", 2)))
-							{
-								Otemp++;
-								Otemp++;
-								tchar = Otemp;
-								/*
-								 |  check for 'then' part
-								 */
-								while ((*tchar != (char) NULL) && (strncmp(tchar, "%t", 2)) && (strncmp(tchar, "%;", 2)))
-									tchar++;
-								/*
-								 |  if end of string
-								 */
-								if (*tchar == (char) NULL)
-								{
-									EVAL = FALSE;
-									Cond_FLAG = FALSE;
-									Otemp = tchar;
-								}
-								/*
-								 |  if end of if found,
-								 |  set up to parse 
-								 |  info
-								 */
-								else if (!strncmp(tchar, "%;", 2))
-									EVAL = FALSE;
-								/*
-								 |  otherwise, check 
-								 |  conditional in 
-								 |  'else'
-								 */
-							}
-							/*
-							 |  if end of if found,
-							 |  get out of if 
-							 |  statement
-							 */
-							else if ((*Otemp != (char) NULL) && (!strncmp(Otemp, "%;", 2)))
-							{
-								EVAL = FALSE;
-								Otemp++;
-								Otemp++;
-							}
-							else /* Otemp == NULL */
-							{
-								EVAL = FALSE;
-								Cond_FLAG = FALSE;
-							}
-						}
-					}
-				}
-				else
-				{
-					Otemp++;
-					Cond_FLAG = FALSE;
-					if (*Otemp != ';')
-					{
-						while ((*Otemp != (char) NULL) && (strncmp(Otemp, "%;", 2)))
-							Otemp++;
-						if (*Otemp != (char) NULL)
-						{
-							Otemp++;
-							Otemp++;
-						}
-					}
-					else
-						Otemp++;
-				}
-			}
-			else
-			{
-				Top_of_stack = Operation(Stack, Top_of_stack);
-			}
-		}
-		else if (!strncmp(Otemp, "$<", 2))
-		{
-			Otemp++;
-			Otemp++;
-			delay = atoi(Otemp);
-			while (*Otemp != '>')
-				Otemp++;
-			Otemp++;
-			chars = delay * chars_per_millisecond;
-			delay = chars;
-			if ((chars - delay) > 0.0)
-				delay++;
-			if (String_table[pc__] == NULL)
-				temp = 0;
-			else
-				temp = *String_table[pc__];
-			for (; delay > 0; delay--)
-				putc(temp, stdout);
-		}
-		else
-		{
-			putchar(*Otemp);
-			Otemp++;
-		}
-	}
-	fflush(stdout);
-}
-#endif
-
-void 
-wmove(WINDOW *window, int row, int column)
-/* move cursor to indicated position in window */
-{
-	if ((row < window->Num_lines) && (column < window->Num_cols))
-	{
-		window->LX = column;
-		window->LY = row;
-	}
-}
-
-void 
-clear_line(struct _line *line, int column, int cols)
-{
-	int j;
-
-	if (column > line->last_char)
-		line->row[line->last_char] = ' ';
-	line->last_char = column;
-	line->row[column] = (char) NULL;
-	line->attributes[column] = (char) NULL;
-	line->changed = TRUE;
-	for (j = column + 1; j < cols; j++)
-	{
-		line->row[j] = ' ';
-		line->attributes[j] = (char) NULL;
-	}
-}
-
-void 
-werase(WINDOW *window)			/* clear the specified window		*/
-{
-	int i;
-	struct _line *tmp;
-
-	window->SCROLL_CLEAR = CLEAR;
-	window->scroll_up = window->scroll_down = 0;
-	for (i = 0, tmp = window->first_line; i < window->Num_lines; i++, tmp = tmp->next_screen)
-		clear_line(tmp, 0, window->Num_cols);
-}
-
-void 
-wclrtoeol(WINDOW *window)
-/* erase from current cursor position to end of line */
-{
-	int column, row;
-	struct _line *tmp;
-
-	window->SCROLL_CLEAR = CHANGE;
-	column = window->LX;
-	row = window->LY;
-	for (row = 0, tmp = window->first_line; row < window->LY; row++)
-		tmp = tmp->next_screen;
-	clear_line(tmp, column, window->Num_cols);
-}
-
-void 
-wrefresh(WINDOW *window)		/* flush all previous output		*/
-{
-	wnoutrefresh(window);
-#ifdef DIAG
-{
-	struct _line *temp;
-	int value;
-	fprintf(stderr, "columns=%d, lines=%d, SC=%d, SR=%d\n",window->Num_cols, window->Num_lines, window->SC, window->SR);
-	for (value = 0, temp = window->first_line; value < window->Num_lines; value++, temp = temp->next_screen)
-	{
-		if (temp->number == -1)
-			fprintf(stderr, "line moved ");
-		if (temp->scroll)
-			fprintf(stderr, "scroll_x is set:  ");
-		fprintf(stderr, "lc%d=%s|\n", temp->last_char, temp->row);
-	}
-	fprintf(stderr, "+-------------------- virtual screen ----------------------------------------+\n");
-	fprintf(stderr, "columns=%d, lines=%d \n",virtual_scr->Num_cols, virtual_scr->Num_lines);
-	for (value = 0, temp = virtual_scr->first_line; value < virtual_scr->Num_lines; value++, temp = temp->next_screen)
-	{
-		if (temp->number == -1)
-			fprintf(stderr, "line moved ");
-		if (temp->scroll)
-			fprintf(stderr, "scroll_x is set:  ");
-		fprintf(stderr, "lc%d=%s|\n", temp->last_char, temp->row);
-	}
-	fprintf(stderr, "columns=%d, lines=%d \n",curscr->Num_cols, curscr->Num_lines);
-	for (value = 0, temp = curscr->first_line; value < curscr->Num_lines; value++, temp = temp->next_screen)
-		fprintf(stderr, "line=%s|\n", temp->row);
-}
-#endif
-	doupdate();
-	virtual_scr->SCROLL_CLEAR = FALSE;
-	virtual_scr->scroll_down = virtual_scr->scroll_up = 0;
-	fflush(stdout);
-}
-
-void 
-touchwin(WINDOW *window)
-{
-	struct _line *user_line;
-	int line_counter = 0;
-
-	for (line_counter = 0, user_line = window->first_line; 
-		line_counter < window->Num_lines; line_counter++)
-	{
-		user_line->changed = TRUE;
-	}
-	window->SCROLL_CLEAR = TRUE;
-}
-
-void 
-wnoutrefresh(WINDOW *window)
-{
-	struct _line *user_line;
-	struct _line *virtual_line;
-	int line_counter = 0;
-	int user_col = 0;
-	int virt_col = 0;
-
-	if (window->SR >= virtual_scr->Num_lines)
-		return;
-	user_line = window->first_line;
-	virtual_line = virtual_scr->first_line;
-	virtual_scr->SCROLL_CLEAR = window->SCROLL_CLEAR;
-	virtual_scr->LX = window->LX + window->SC;
-	virtual_scr->LY = window->LY + window->SR;
-	virtual_scr->scroll_up = window->scroll_up;
-	virtual_scr->scroll_down = window->scroll_down;
-	if ((last_window_refreshed == window) && (!window->SCROLL_CLEAR))
-		return;
-	for (line_counter = 0; line_counter < window->SR; line_counter++)
-	{
-		virtual_line = virtual_line->next_screen;
-	}
-	for (line_counter = 0; (line_counter < window->Num_lines)
-		&& ((line_counter + window->SR) < virtual_scr->Num_lines); 
-			line_counter++)
-	{
-		if ((last_window_refreshed != window) || (user_line->changed) || ((SCROLL | CLEAR) & window->SCROLL_CLEAR))
-		{
-			for (user_col = 0, virt_col = window->SC; 
-				(virt_col < virtual_scr->Num_cols) 
-				  && (user_col < window->Num_cols); 
-				  	virt_col++, user_col++)
-			{
-				virtual_line->row[virt_col] = user_line->row[user_col];
-				virtual_line->attributes[virt_col] = user_line->attributes[user_col];
-			}
-		}
-		if (virtual_scr->Num_cols != window->Num_cols)
-		{
-			if (virtual_line->last_char < (user_line->last_char + window->SC))
-			{
-				if (virtual_line->row[virtual_line->last_char] == (char) NULL)
-					virtual_line->row[virtual_line->last_char] = ' ';
-				virtual_line->last_char = 
-					min(virtual_scr->Num_cols, 
-					  (user_line->last_char + window->SC));
-			}
-			else if (virtual_line->last_char > (user_line->last_char + window->SC))
-			{
-				virtual_line->row[min(virtual_scr->Num_cols, 
-					  (user_line->last_char + window->SC))] = ' ';
-			}
-		}
-		else
-			virtual_line->last_char = user_line->last_char;
-		virtual_line->row[virtual_line->last_char] = (char) NULL;
-		virtual_line->changed = user_line->changed;
-		virtual_line = virtual_line->next_screen;
-		user_line = user_line->next_screen;
-	}
-	window->SCROLL_CLEAR = FALSE;
-	window->scroll_up = window->scroll_down = 0;
-	last_window_refreshed = window;
-}
-
-void 
-flushinp(void)			/* flush input				*/
-{
-}
-
-void 
-ungetch(int c)			/* push a character back on input	*/
-{
-	if (bufp < 100)
-		in_buff[bufp++] = c;
-}
-
-#ifdef BSD_SELECT
-int 
-timed_getchar(void)
-{
-	struct timeval tv;
-	fd_set fds;
-	int ret_val;
-	int nfds = 1;
-	char temp;
-
-	FD_ZERO(&fds);
-	tv.tv_sec = 0;
-	tv.tv_usec = 500000;  /* half a second */
-	FD_SET(0, &fds);
-	Time_Out = FALSE; /* just in case */
-
-	ret_val = select(nfds, &fds, 0, 0, &tv);
-
-	/*
-	 |	if ret_val is less than zero, there was no input
-	 |	otherwise, get a character and return it
-	 */
-
-	if (ret_val <= 0)
-	{ 
-		Time_Out = TRUE;
-		return(-1);
-	}
-
-	return(read(0, &temp, 1)? temp : -1);
-}
-#endif
-
-int 
-wgetch(WINDOW *window)			/* get character from specified window	*/
-{
-	int in_value;
-	char temp;
-#ifndef SYS5
-	int old_arg;
-#endif /* SYS5 */
-
-#ifdef BSD_SELECT
-	if (Noblock)
-		in_value = ((bufp > 0) ? in_buff[--bufp] : timed_getchar());
-	else
-		in_value = ((bufp > 0) ? in_buff[--bufp] : read(0, &temp, 1)? temp : -1);
-#else /* BSD_SELECT */
-#ifdef SYS5
-	in_value = ((bufp > 0) ? in_buff[--bufp] : 
-					(read(0, &temp, 1)> 0) ? temp : -1);
-#else /* SYS5 */
-	if (Noblock)
-	{
-		Time_Out = FALSE;
-		old_arg = fcntl(0, F_GETFL, 0);
-		in_value = fcntl(0, F_SETFL, old_arg | FNDELAY);
-	}
-	in_value = ((bufp > 0) ? in_buff[--bufp] : read(0, &temp, 1)? temp : -1);
-	if (Noblock)
-	{
-		fcntl(0, F_SETFL, old_arg);
-		if (Time_Out)
-			in_value = -1;
-	}
-#endif /* SYS5 */
-#endif /* BSD_SELECT */
-
-	if (in_value != -1) 
-	{
-		in_value &= 0xff;
-		if ((Parity) && (Num_bits < 8))	
-				/* strip eighth bit if parity in use */
-		in_value &= 0177;
-	}
-	else if (interrupt_flag)
-	{
-		interrupt_flag = FALSE;
-		in_value = wgetch(window);
-	}
-
-	if ((in_value == '\033') || (in_value == '\037'))/* escape character */
-		in_value = Get_key(in_value);
-	return(in_value);
-}
-
-#ifndef BSD_SELECT
-void 
-Clear(int arg)		/* notify that time out has occurred	*/
-{
-	Time_Out = TRUE;
-#ifdef DEBUG
-fprintf(stderr, "inside Clear()\n");
-fflush(stderr);
-#endif /* DEBUG */
-}
-#endif /* BSD_SELECT */
-
-/* first_char: first character of sequence */
-int 
-Get_key(int first_char)			/* try to decode key sequence	*/
-{
-	int in_char;
-	int Count;
-	char string[128];
-	char *Gtemp;
-	int Found;
-#ifdef SYS5
-	struct termio Gterminal;
-#else
-	struct sgttyb Gterminal;
-#endif
-	struct KEY_STACK *St_point;
-#if (!defined( BSD_SELECT)) || (!defined(SYS5))
-	int value;
-#endif /* BSD_SELECT */
-
-	Count = 0;
-	Gtemp = string;
-	string[Count++] = first_char;
-	string[Count] = (char) NULL;
-	Time_Out = FALSE;
-#ifndef BSD_SELECT
-	signal(SIGALRM, Clear);
-	value = alarm(1);
-#endif /* BSD_SELECT */
-	Noblock = TRUE;
-#ifdef SYS5
-	Gterminal.c_cc[VTIME] = 0;		/* timeout value	*/
-	Gterminal.c_lflag &= ~ICANON;	/* disable canonical operation	*/
-	Gterminal.c_lflag &= ~ECHO;		/* disable echo		*/
-#endif
-	Count = 1;
-	Found = FALSE;
-	while ((Count < Max_Key_len) && (!Time_Out) && (!Found))
-	{
-		in_char = wgetch(stdscr);
-#ifdef DEBUG
-fprintf(stderr, "back in GetKey()\n");
-fflush(stderr);
-#endif /* DEBUG */
-		if (in_char != -1)
-		{
-			string[Count++] = in_char;
-			string[Count] = (char) NULL;
-			St_point = KEY_TOS;
-			while ((St_point != NULL) && (!Found))
-			{
-				if (!strcmp(string, St_point->element->string))
-					Found = TRUE;
-				else
-					St_point = St_point->next;
-			}
-		}
-	}
-#ifndef BSD_SELECT
-	if (!Time_Out)
-		value = alarm(0);
-#endif /* BSD_SELECT */
-#ifdef SYS5
-/*	value = ioctl(0, TCSETA, &Terminal);*/
-#else
-	value = ioctl(0, TIOCSETP, &Terminal);
-/*	value = fcntl(0, F_SETFL, old_arg);*/
-#endif
-	Noblock = FALSE;
-	if (Found)
-	{
-		return(St_point->element->value);
-	}
-	else
-	{
-		while (Count > 1)
-		{
-			if ((string[--Count] != -1) && 
-					((unsigned char) (string[Count]) != 255))
-			{
-#ifdef DIAG
-fprintf(stderr, "ungetting character %d\n", string[Count]);fflush(stdout);
-#endif
-				ungetch(string[Count]);
-			}
-		}
-		return(first_char);
-	}
-}
-
-void 
-waddch(WINDOW *window, int c)	/* output the character in the specified window */
-{
-	int row, column;
-	int shift;	/* number of spaces to shift if a tab		*/
-	struct _line *tmpline;
-
-#ifdef DIAG
-/*printf("starting waddch \n");fflush(stdout);*/
-#endif
-	row = window->LY;
-	column = window->LX;
-	if (c == '\t')
-	{
-		shift = (column + 1) % 8;
-		if (shift == 0)
-			shift++;
-		else
-			shift = 9 - shift;
-		while (shift > 0)
-		{
-			shift--;
-			waddch(window, ' ');
-		}
-	}
-	else if ((column < window->Num_cols) && (row < window->Num_lines))
-	{
-		if ((c == '~') && (Booleans[hz__]))
-			c = '@';
-
-		if (( c != '\b') && (c != '\n') && (c != '\r'))
-		{
-			row = 0;
-			tmpline = window->first_line; 
-			while (row < window->LY)
-			{
-				row++;
-				tmpline = tmpline->next_screen;
-			}
-			tmpline->row[column] = c;
-			tmpline->attributes[column] = window->Attrib;
-			tmpline->changed = TRUE;
-			if (column >= tmpline->last_char)
-			{
-				if (column > tmpline->last_char)
-					tmpline->row[tmpline->last_char] = ' ';
-				tmpline->row[column + 1] = (char) NULL;
-				tmpline->attributes[column + 1] = (char) NULL;
-				tmpline->last_char = column + 1;
-			}
-		}
-		if (c == '\n')
-		{
-			wclrtoeol(window);
-			window->LX = window->Num_cols;
-		}
-		else if (c == '\r')
-			window->LX = 0;
-		else if (c == '\b')
-			window->LX--;
-		else
-			window->LX++;
-	}
-	if (window->LX >= window->Num_cols)
-	{
-		window->LX = 0;
-		window->LY++;
-		if (window->LY >= window->Num_lines)
-		{
-			window->LY = window->Num_lines - 1;
-/*			window->LY = row;
-			wmove(window, 0, 0);
-			wdeleteln(window);
-			wmove(window, row, 0);*/
-		}
-	}
-	window->SCROLL_CLEAR = CHANGE;
-}
-
-void 
-winsertln(WINDOW *window) /* insert a blank line into the specified window */
-{
-	int row, column;
-	struct _line *tmp;
-	struct _line *tmp1;
-
-	window->scroll_down += 1;
-	window->SCROLL_CLEAR = SCROLL;
-	column = window->LX;
-	row = window->LY;
-	for (row = 0, tmp = window->first_line; (row < window->Num_lines) && (tmp->next_screen != NULL); row++)
-		tmp = tmp->next_screen;
-	if (tmp->prev_screen != NULL)
-		tmp->prev_screen->next_screen = NULL;
-	tmp1 = tmp;
-	clear_line(tmp1, 0, window->Num_cols);
-	tmp1->number = -1;
-	for (row = 0, tmp = window->first_line; (row < window->LY) && (tmp->next_screen != NULL); row++)
-		tmp = tmp->next_screen;
-	if ((window->LY == (window->Num_lines - 1)) && (window->Num_lines > 1))
-	{
-		tmp1->next_screen = tmp->next_screen;
-		tmp->next_screen = tmp1;
-		tmp->changed = TRUE;
-		tmp->next_screen->prev_screen = tmp;
-	}
-	else if (window->Num_lines > 1)
-	{
-		if (tmp->prev_screen != NULL)
-			tmp->prev_screen->next_screen = tmp1;
-		tmp1->prev_screen = tmp->prev_screen;
-		tmp->prev_screen = tmp1;
-		tmp1->next_screen = tmp;
-		tmp->changed = TRUE;
-		tmp->scroll = DOWN;
-	}
-	if (window->LY == 0)
-		window->first_line = tmp1;
-}
-
-void 
-wdeleteln(WINDOW *window)	/* delete a line in the specified window */
-{
-	int row, column;
-	struct _line *tmp;
-	struct _line  *tmpline;
-
-	if (window->Num_lines > 1)
-	{
-		window->scroll_up += 1;
-		window->SCROLL_CLEAR = SCROLL;
-		column = window->LX;
-		row = window->LY;
-		for (row = 0, tmp = window->first_line; row < window->LY; row++)
-			tmp = tmp->next_screen;
-		if (window->LY == 0)
-			window->first_line = tmp->next_screen;
-		if (tmp->prev_screen != NULL)
-			tmp->prev_screen->next_screen = tmp->next_screen;
-		if (tmp->next_screen != NULL)
-		{
-			tmp->next_screen->changed = TRUE;
-			tmp->next_screen->scroll = UP;
-			tmp->next_screen->prev_screen = tmp->prev_screen;
-		}
-		tmpline = tmp;
-		clear_line(tmpline, 0, window->Num_cols);
-		tmpline->number = -1;
-		for (row = 0, tmp = window->first_line; tmp->next_screen != NULL; row++)
-			tmp = tmp->next_screen;
-		if (tmp != NULL)
-		{
-			tmp->next_screen = tmpline;
-			tmp->next_screen->prev_screen = tmp;
-			tmp->changed = TRUE;
-			tmp = tmp->next_screen;
-		}
-		else
-			tmp = tmpline;
-		tmp->next_screen = NULL;
-	}
-	else
-	{
-		clear_line(window->first_line, 0, window->Num_cols);
-	}
-}
-
-void 
-wclrtobot(WINDOW *window)
-/* delete from current position to end of the window */
-{
-	int row, column;
-	struct _line *tmp;
-
-	window->SCROLL_CLEAR |= CLEAR;
-	column = window->LX;
-	row = window->LY;
-	for (row = 0, tmp = window->first_line; row < window->LY; row++)
-		tmp = tmp->next_screen;
-	clear_line(tmp, column, window->Num_cols);
-	for (row = (window->LY + 1); row < window->Num_lines; row++)
-	{
-		tmp = tmp->next_screen;
-		clear_line(tmp, 0, window->Num_cols);
-	}
-	wmove(window, row, column);
-}
-
-void 
-wstandout(WINDOW *window)	/* begin standout mode in window	*/
-{
-	if (Numbers[sg__] < 1)	/* if not magic cookie glitch	*/
-		window->Attrib |= A_STANDOUT;
-}
-
-void 
-wstandend(WINDOW *window)	/* end standout mode in window	*/
-{
-	window->Attrib &= ~A_STANDOUT;
-}
-
-void 
-waddstr(WINDOW *window, char *string)	/* write 'string' in window	*/
-{
-	char *wstring;
-
-	for (wstring = string; *wstring != (char) NULL; wstring++)
-		waddch(window, *wstring);
-}
-
-void 
-clearok(WINDOW *window, int flag) /* erase screen and redraw at next refresh */
-{
-	Repaint_screen = TRUE;
-}
-
-
-void 
-echo(void)			/* turn on echoing				*/
-{
-	int value;
-
-#ifdef SYS5
-	Terminal.c_lflag |= ECHO;		/* enable echo		*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#else
-	Terminal.sg_flags |= ECHO;		/* enable echo		*/
-	value = ioctl(0, TIOCSETP, &Terminal);	/* set characteristics	*/
-#endif
-}
-
-void 
-noecho(void)		/* turn off echoing				*/
-{
-	int value;
-
-#ifdef SYS5
-	Terminal.c_lflag &= ~ECHO;		/* disable echo		*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#else
-	Terminal.sg_flags &= ~ECHO;		/* disable echo		*/
-	value = ioctl(0, TIOCSETP, &Terminal);	/* set characteristics	*/
-#endif
-}
-
-void 
-raw(void)			/* set to read characters immediately		*/
-{
-	int value;
-
-#ifdef SYS5
-	Intr = Terminal.c_cc[VINTR];	/* get the interrupt character	*/
-	Terminal.c_lflag &= ~ICANON;	/* disable canonical operation	*/
-	Terminal.c_lflag &= ~ISIG;	/* disable signal checking	*/
-#ifdef FLUSHO
-	Terminal.c_lflag &= ~FLUSHO;
-#endif
-#ifdef PENDIN
-	Terminal.c_lflag &= ~PENDIN;
-#endif
-#ifdef IEXTEN
-	Terminal.c_lflag &= ~IEXTEN;
-#endif
-	Terminal.c_cc[VMIN] = 1;		/* minimum of one character */
-	Terminal.c_cc[VTIME] = 255;		/* timeout value	*/
-	Terminal.c_cc[VINTR] = 0;		/* eliminate interrupt	*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#else
-	Terminal.sg_flags |= RAW;	/* enable raw mode		*/
-	value = ioctl(0, TIOCSETP, &Terminal);	/* set characteristics	*/
-#endif
-}
-
-void 
-noraw(void)			/* set to normal character read mode		*/
-{
-	int value;
-
-#ifdef SYS5
-	Terminal.c_lflag |= ICANON;	/* enable canonical operation	*/
-	Terminal.c_lflag |= ISIG;	/* enable signal checking	*/
-	Terminal.c_cc[VEOF] = 4;		/* EOF character = 4	*/
-	Terminal.c_cc[VEOL] = (char) NULL;	/* EOL = 0		*/
-	Terminal.c_cc[VINTR] = Intr;		/* reset interrupt char	*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#else
-	Terminal.sg_flags &= ~RAW;	/* disable raw mode		*/
-	value = ioctl(0, TIOCSETP, &Terminal);	/* set characteristics	*/
-/*	old_arg = fcntl(0, F_GETFL, 0);
-	value = fcntl(0, F_SETFL, old_arg & ~FNDELAY);*/
-#endif
-}
-
-void 
-nl(void)
-{
-	int value;
-
-#ifdef SYS5
-	Terminal.c_iflag |= ICRNL;	/* enable carriage-return to line-feed mapping	*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#endif
-}
-
-void 
-nonl(void)
-{
-	int value;
-
-#ifdef SYS5
-	Terminal.c_iflag &= ~ICRNL;	/* disable carriage-return to line-feed mapping	*/
-	Terminal.c_iflag &= ~IGNCR;	/* do not ignore carriage-return	*/
-	value = ioctl(0, TCSETA, &Terminal);	/* set characteristics	*/
-#endif
-}
-
-void 
-saveterm(void)
-{
-}
-
-void 
-fixterm(void)
-{
-}
-
-void 
-resetterm(void)
-{
-}
-
-void 
-nodelay(WINDOW *window, int flag)
-{
-}
-
-void 
-idlok(WINDOW *window, int flag)
-{
-}
-
-void 
-keypad(WINDOW *window, int flag)
-{
-	if (flag)
-		String_Out(String_table[ks__], NULL, 0);
-	else
-		String_Out(String_table[ke__], NULL, 0);
-}
-
-void 
-savetty(void)		/* save current tty stats			*/
-{
-	int value;
-
-#ifdef SYS5
-	value = ioctl(0, TCGETA, &Saved_tty);	/* set characteristics	*/
-#else
-	value = ioctl(0, TIOCGETP, &Saved_tty);	/* set characteristics	*/
-#endif
-}
-
-void 
-resetty(void)		/* restore previous tty stats			*/
-{
-	int value;
-
-#ifdef SYS5
-	value = ioctl(0, TCSETA, &Saved_tty);	/* set characteristics	*/
-#else
-	value = ioctl(0, TIOCSETP, &Saved_tty);	/* set characteristics	*/
-#endif
-}
-
-void 
-endwin(void)		/* end windows					*/
-{
-	keypad(stdscr, FALSE);
-	initialized = FALSE;
-	delwin(curscr);
-	delwin(virtual_scr);
-	delwin(stdscr);
-#ifndef SYS5
-{
-	int old_arg, value;
-/*	old_arg = fcntl(0, F_GETFL, 0);
-	value = fcntl(0, F_SETFL, old_arg & ~FNDELAY);*/
-}
-#endif
-}
-
-void 
-delwin(WINDOW *window)		/* delete the window structure			*/
-{
-	int i;
-
-	for (i = 1; (i < window->Num_lines) && (window->first_line->next_screen != NULL); i++)
-	{
-		window->first_line = window->first_line->next_screen;
-		free(window->first_line->prev_screen->row);
-		free(window->first_line->prev_screen->attributes);
-		free(window->first_line->prev_screen);
-	}
-	if (window == last_window_refreshed)
-		last_window_refreshed = 0;
-	if (window->first_line != NULL)
-	{
-		free(window->first_line->row);
-		free(window->first_line->attributes);
-		free(window->first_line);
-		free(window);
-	}
-}
-
-void 
-wprintw(WINDOW *window, const char *format, ...)
-{
-	va_list ap;
-	int value;
-	char *fpoint;
-	char *wtemp;
-
-	va_start(ap, format);
-
-	fpoint = (char *) format;
-	while (*fpoint != (char) NULL)
-	{
-		if (*fpoint == '%')
-		{
-			fpoint++;
-			if (*fpoint == 'd')
-			{
-				value = va_arg(ap, int);
-				iout(window, value);
-			}
-			else if (*fpoint == 'c')
-			{
-				value = va_arg(ap, int);
-				waddch(window, value);
-			}
-			else if (*fpoint == 's')
-			{
-				wtemp = va_arg(ap, char *);
-					waddstr(window, wtemp);
-			}
-			fpoint++;
-		}
-		else if (*fpoint == '\\')
-		{
-			fpoint++;
-			if (*fpoint == 'n')
-				waddch(window, '\n');
-			else if ((*fpoint >= '0') && (*fpoint <= '9'))
-			{
-				value = 0;
-				while ((*fpoint >= '0') && (*fpoint <= '9'))
-				{
-					value = (value * 8) + (*fpoint - '0');
-					fpoint++;
-				}
-				waddch(window, value);
-			}
-			fpoint++;
-		}
-		else
-			waddch(window, *fpoint++);
-	}
-	va_end(ap);
-}
-
-void 
-iout(WINDOW *window, int value)	/* output characters		*/
-{
-	int i;
-
-	if ((i = value / 10) != 0)
-		iout(window, i);
-	waddch(window, ((value % 10) + '0'));
-}
-
-int 
-Comp_line(struct _line *line1, struct _line *line2)		/* compare lines	*/
-{
-	int count1, count2;
-	int i;
-	char *att1, *att2;
-	char *c1, *c2;
-
-	c1 = line1->row;
-	c2 = line2->row;
-	att1 = line1->attributes;
-	att2 = line2->attributes;
-	count2 = strlen(c1) + 1;
-	count1 = strlen(c2) + 1;
-	if (count1 > count2)
-	{
-		i = count2;
-		count2 = count1;
-		count1 = i;
-	}
-	if (count2 > (count1 + count1))
-		return(2);
-	i = 0;
-	while ((c1[i] != (char) NULL) && (c2[i] != (char) NULL) && (c1[i] == c2[i]) && (att1[i] == att2[i]))
-		i++;
-	count1 = i + 1;
-	if ((count1 == 1) && (count2 == 1))
-		count1 = 0;			/* both lines blank	*/
-	else if (count2 == count1)
-		count1 = -1;			/* equal		*/
-	else
-		count1 = count2 / count1;	/* lines unequal	*/
-	return(count1);
-}
-
-struct _line *
-Insert_line(int row, int end_row, WINDOW *window) /* insert line into screen */
-{
-	int i;
-	struct _line *tmp;
-	struct _line *tmp1;
-
-	for (i = 0, tmp = curscr->first_line; i < window->SR; i++)
-		tmp = tmp->next_screen;
-	if ((end_row + window->SR) == 0)
-		curscr->first_line = curscr->first_line->next_screen;
-	top_of_win = tmp;
-	/*
-	 |	find bottom line to delete
-	 */
-	for (i = 0, tmp = top_of_win; (tmp->next_screen != NULL) && (i < end_row); i++)
-		tmp = tmp->next_screen;
-	if (tmp->prev_screen != NULL)
-		tmp->prev_screen->next_screen = tmp->next_screen;
-	if (tmp->next_screen != NULL)
-		tmp->next_screen->prev_screen = tmp->prev_screen;
-	tmp1 = tmp;
-	/*
-	 |	clear deleted line
-	 */
-	clear_line(tmp, 0, window->Num_cols);
-	tmp1->number = -1;
-	for (i = 0, tmp = curscr->first_line; (tmp->next_screen != NULL) && (i < window->SR); i++)
-		tmp = tmp->next_screen;
-	top_of_win = tmp;
-	for (i = 0, tmp = top_of_win; i < row; i++)
-		tmp = tmp->next_screen;
-	if ((tmp->prev_screen != NULL) && (window->Num_lines > 0))
-		tmp->prev_screen->next_screen = tmp1;
-	tmp1->prev_screen = tmp->prev_screen;
-	tmp->prev_screen = tmp1;
-	tmp1->next_screen = tmp;
-	if ((row + window->SR) == 0)
-		curscr->first_line = tmp1;
-	if (tmp1->next_screen != NULL)
-		tmp1 = tmp1->next_screen;
-
-	if ((!String_table[cs__]) && (end_row < window->Num_lines))
-	{
-		Position(window, (window->SR + end_row), 0);
-		String_Out(String_table[dl__], NULL, 0);
-	}
-	Position(window, (window->SR + row), 0);
-	if (String_table[al__] != NULL)
-		String_Out(String_table[al__], NULL, 0);
-	else
-		String_Out(String_table[sr__], NULL, 0);
-
-	for (i = 0, top_of_win = curscr->first_line; (top_of_win->next_screen != NULL) && (i < window->SR); i++)
-		top_of_win = top_of_win->next_screen;
-	return(tmp1);
-}
-
-
-struct _line *
-Delete_line(int row, int end_row, struct _line *window)
-/* delete a line on screen */
-{
-	int i;
-	struct _line *tmp;
-	struct _line *tmp1;
-	struct _line *tmp2;
-
-	i = 0;
-	tmp = curscr->first_line;
-	while (i < window->SR)
-	{
-		i++;
-		tmp = tmp->next_screen;
-	}
-	/*
-	 |	find line to delete
-	 */
-	top_of_win = tmp;
-	if ((row + window->SR) == 0)
-		curscr->first_line = top_of_win->next_screen;
-	for (i = 0, tmp = top_of_win; i < row; i++)
-		tmp = tmp->next_screen;
-	if (tmp->prev_screen != NULL)
-		tmp->prev_screen->next_screen = tmp->next_screen;
-	if (tmp->next_screen != NULL)
-		tmp->next_screen->prev_screen = tmp->prev_screen;
-	tmp2 = tmp->next_screen;
-	tmp1 = tmp;
-	/*
-	 |	clear deleted line
-	 */
-	clear_line(tmp1, 0, window->Num_cols);
-	tmp1->number = -1;
-	/*
-	 |	find location to insert deleted line
-	 */
-	for (i = 0, tmp = curscr->first_line; (tmp->next_screen != NULL) && (i < window->SR); i++)
-		tmp = tmp->next_screen;
-	top_of_win = tmp;
-	for (i = 0, tmp = top_of_win; (i < end_row) && (tmp->next_screen != NULL); i++)
-		tmp = tmp->next_screen;
-	tmp1->next_screen = tmp;
-	tmp1->prev_screen = tmp->prev_screen;
-	if (tmp1->prev_screen != NULL)
-		tmp1->prev_screen->next_screen = tmp1;
-	tmp->prev_screen = tmp1;
-
-	Position(window, (window->SR + row), 0);
-	String_Out(String_table[dl__], NULL, 0);
-	if ((!String_table[cs__]) && (end_row < window->Num_lines))
-	{
-		Position(window, (window->SR + end_row), 0);
-		String_Out(String_table[al__], NULL, 0);
-	}
-	else if ((String_table[cs__] != NULL) && (String_table[dl__] == NULL))
-	{
-		Position(window, (window->SR + end_row), 0);
-		putchar('\n');
-	}
-
-	if (row == (window->Num_lines-1))
-		tmp2 = tmp1;
-	if ((row + window->SR) == 0)
-		curscr->first_line = top_of_win = tmp2;
-	return(tmp2);
-}
-
-void 
-CLEAR_TO_EOL(WINDOW *window, int row, int column)
-{
-	int x, y;
-	struct _line *tmp1;
-
-	for (y = 0, tmp1 = curscr->first_line; (y < (window->SR+row)) && (tmp1->next_screen != NULL); y++)
-		tmp1 = tmp1->next_screen;
-	for (x = column; x<window->Num_cols; x++)
-	{
-		tmp1->row[x] = ' ';
-		tmp1->attributes[x] = (char) NULL;
-	}
-	tmp1->row[column] = (char) NULL;
-	tmp1->last_char = column;
-	if (column < COLS)
-	{
-		if (STAND)
-		{
-			STAND = FALSE;
-			Position(window, row, column);
-			attribute_off();
-		}
-		if (String_table[ce__] != NULL)
-			String_Out(String_table[ce__], NULL, 0);
-		else
-		{
-			for (x = column; x < window->Num_cols; x++)
-				putchar(' ');
-			Curr_x = x;
-		}
-	}
-}
-
-int 
-check_delete(WINDOW *window, int line, int offset, struct _line *pointer_new,
-             struct _line *pointer_old)
-{
-	int end_old;
-	int end_new;
-	int k;
-	int changed;
-	char *old_lin;
-	char *new_lin;
-	char *old_att;
-	char *new_att;
-	
-	changed = FALSE;
-	new_lin = pointer_new->row;
-	new_att = pointer_new->attributes;
-	old_lin = pointer_old->row;
-	old_att = pointer_old->attributes;
-	end_old = end_new = offset;
-	while (((new_lin[end_new] != old_lin[end_old]) || (new_att[end_new] != old_att[end_old])) && (old_lin[end_old] != (char) NULL) && (new_lin[end_old] != (char) NULL))
-		end_old++;
-	if (old_lin[end_old] != (char) NULL)
-	{
-		k = 0;
-		while ((old_lin[end_old+k] == new_lin[end_new+k]) && (new_att[end_new+k] == old_att[end_old+k]) && (new_lin[end_new+k] != (char) NULL) && (old_lin[end_old+k] != (char) NULL) && (k < 10))
-			k++;
-		if ((k > 8) || ((new_lin[end_new+k] == (char) NULL) && (k != 0)))
-		{
-			if (new_lin[end_new+k] == (char) NULL)
-			{
-				Position(window, line, (end_new+k));
-				CLEAR_TO_EOL(window, line, (end_new+k));
-			}
-			Position(window, line, offset);
-			for (k = offset; k < end_old; k++)
-				Char_del(old_lin, old_att, offset, window->Num_cols);
-			while ((old_lin[offset] != (char) NULL) && (offset < COLS))
-				offset++;
-			pointer_old->last_char = offset;
-			changed = TRUE;
-		}
-	}
-	return(changed);
-}
-
-/*
- |	Check if characters were inserted in the middle of a line, and if 
- |	so, insert them.
- */
-
-int 
-check_insert(WINDOW *window, int line, int offset, struct _line *pointer_new,
-             struct _line *pointer_old)
-{
-	int changed;
-	int end_old, end_new;
-	int k;
-	int same = FALSE;
-	int old_off;
-	int insert;
-	char *old_lin;
-	char *new_lin;
-	char *old_att;
-	char *new_att;
-
-	changed = FALSE;
-	new_lin = pointer_new->row;
-	new_att = pointer_new->attributes;
-	old_lin = pointer_old->row;
-	old_att = pointer_old->attributes;
-	end_old = end_new = offset;
-	while (((new_lin[end_new] != old_lin[end_old]) || (new_att[end_new] != old_att[end_old])) && (new_lin[end_new] != (char) NULL) && (old_lin[end_new] != (char) NULL))
-		end_new++;
-	if (new_lin[end_new] != (char) NULL)
-	{
-		k = 0;
-		while ((old_lin[end_old+k] == new_lin[end_new+k]) && (old_att[end_old+k] == new_att[end_new+k]) && (new_lin[end_new+k] != (char) NULL) && (old_lin[end_old+k] != (char) NULL) && (k < 10))
-			k++;
-		/*
-		 |  check for commonality between rest of lines (are the old 
-		 |  and new lines the same, except for a chunk in the middle?)
-		 |  if the rest of the lines are common, do not insert text
-		 */
-		old_off = end_new;
-		while ((old_lin[old_off] != (char) NULL) && (new_lin[old_off] != (char) NULL) && (old_lin[old_off] == new_lin[old_off]) && (old_att[old_off] == new_att[old_off]))
-			old_off++;
-		if ((old_lin[old_off] == new_lin[old_off]) && (old_att[old_off] == new_att[old_off]))
-			same = TRUE;
-		if ((!same) && ((k > 8) || ((new_lin[end_new+k] == (char) NULL) && (k != 0))))
-		{
-			Position(window, line, offset);
-			insert = FALSE;
-			if (String_table[ic__] == NULL)
-			{
-				String_Out(String_table[im__], NULL, 0);
-				insert = TRUE;
-			}
-			for (k = offset; k < end_new; k++)
-			{
-				if (!insert)
-					String_Out(String_table[ic__], NULL, 0);
-				Char_ins(old_lin, old_att, new_lin[k], new_att[k], k, window->Num_cols);
-			}
-			if (insert)
-				String_Out(String_table[ei__], NULL, 0);
-			while ((old_lin[offset] != (char) NULL) && (offset < COLS))
-				offset++;
-			pointer_old->last_char = offset;
-			changed = TRUE;
-		}
-	}
-	return(changed);
-}
-
-void 
-doupdate(void)
-{
-	WINDOW *window;
-	int similar;
-	int diff;
-	int begin_old, begin_new;
-	int end_old, end_new;
-	int count1, j;
-	int from_top, tmp_ft, offset;
-	int changed;
-	int first_time;
-	int first_same;
-	int last_same;
-	int list[10];
-
-	struct _line *curr;
-	struct _line *virt;
-	struct _line *old;
-
-	struct _line *new;
-
-	char *cur_lin;
-	char *vrt_lin;
-	char *cur_att;
-	char *vrt_att;
-	char *att1, *att2;
-	char *c1, *c2;
-
-	char NC_chinese = FALSE;	/* flag to indicate handling Chinese */
-
-	window = virtual_scr;
-
-	if ((nc_attributes & A_NC_BIG5) != 0)
-		NC_chinese = TRUE;
-
-	if (Repaint_screen)
-	{
-		if (String_table[cl__])
-			String_Out(String_table[cl__], NULL, 0);
-		else
-		{
-			from_top = 0;
-			while (from_top < LINES)
-			{
-				Position(curscr, from_top, 0);
-				if (String_table[ce__] != NULL)
-					String_Out(String_table[ce__], NULL, 0);
-				else
-				{
-					for (j = 0; j < window->Num_cols; j++)
-						putchar(' ');
-				}
-				from_top++;
-			}
-		}
-		for (from_top = 0, curr = curscr->first_line; from_top < curscr->Num_lines; from_top++, curr = curr->next_screen)
-		{
-			Position(curscr, from_top, 0);
-			for (j = 0; (curr->row[j] != (char) NULL) && (j < curscr->Num_cols); j++)
-			{
-				Char_out(curr->row[j], curr->attributes[j], curr->row, curr->attributes, j);
-			}
-			if (STAND)
-			{
-				STAND = FALSE;
-				Position(curscr, from_top, j);
-				attribute_off();
-			}
-		}
-		Repaint_screen = FALSE;
-	}
-
-	similar = 0;
-	diff = FALSE;
-	top_of_win = curscr->first_line;
-
-	for (from_top = 0, curr = top_of_win, virt = window->first_line; 
-			from_top < window->Num_lines; from_top++)
-	{
-		virtual_lines[from_top] = TRUE;
-		if ((similar = Comp_line(curr, virt)) > 0)
-		{
-			virtual_lines[from_top] = FALSE;
-			diff = TRUE;
-		}
-		curr = curr->next_screen;
-		virt = virt->next_screen;
-	}
-
-	from_top = 0;
-	virt = window->first_line;
-	curr = top_of_win;
-	similar = 0;
-	/*
-	 |  if the window has lines that are different, check for scrolling
-	 */
-	if (diff)
-	{
-		last_same = -1;
-		changed = FALSE;
-		for (first_same = window->Num_lines; 
-		    (first_same > from_top) && (virtual_lines[first_same - 1]);
-		     first_same--)
-			;
-		count1 = first_same - 1;
-		for (last_same = 0;
-		    (last_same < window->Num_lines) && (virtual_lines[last_same]== FALSE);
-		     last_same++)
-			;
-		while ((from_top < first_same) && nc_scrolling_ability)
-					/* check entire lines for diffs	*/
-		{
-
-
-			if (from_top >= last_same)
-			{
-				for (last_same = from_top; 
-				     (last_same < window->Num_lines) && 
-				     (virtual_lines[last_same] == FALSE);
-				      last_same++)
-					;
-			}
-			if (!virtual_lines[from_top])
-			{
-				diff = TRUE;
-				/*
-				 |	check for lines deleted (scroll up)
-				 */
-				for (tmp_ft = from_top+1, old = curr->next_screen; 
-					((window->scroll_up) && (diff) && 
-					(tmp_ft < last_same) && 
-					(!virtual_lines[tmp_ft]));
-						tmp_ft++)
-				{
-					if ((Comp_line(old, virt) == -1) && (!virtual_lines[from_top]))
-					{
-						if (String_table[cs__]) /* scrolling region */
-						{
-							list[1] = from_top;
-							list[0] = min((last_same - 1), (window->Num_lines - 1));
-							String_Out(String_table[cs__], list, 2);
-							Curr_y = Curr_x = -1;
-						}
-
-						for (offset = (tmp_ft - from_top); (offset > 0); offset--)
-						{
-							old = Delete_line(from_top, min((last_same - 1), (window->Num_lines - 1)), window);
-							diff = FALSE;
-						}
-
-						if (String_table[cs__]) /* scrolling region */
-						{
-							list[1] = 0;
-							list[0] = LINES - 1;
-							String_Out(String_table[cs__], list, 2);
-							Curr_y = Curr_x = -1;
-							}
-
-						top_of_win = curscr->first_line;
-						curr = top_of_win;
-						for (offset = 0; offset < from_top; offset++)
-							curr = curr->next_screen;
-						for (offset = from_top, old=curr, new=virt; 
-						   offset < window->Num_lines; 
-						   old=old->next_screen, new=new->next_screen,
-						   offset++)
-						{
-							similar = Comp_line(old, new);
-							virtual_lines[offset] = (similar > 0 ? FALSE : TRUE);
-						}
-					}
-					else
-						old = old->next_screen;
-				}
-				/*
-				 |	check for lines inserted (scroll down)
-				 */
-				for (tmp_ft = from_top-1, old = curr->prev_screen; 
-					((window->scroll_down) && (tmp_ft >= 0) && 
-					(diff) && 
-					(!virtual_lines[tmp_ft])); 
-					  tmp_ft--)
-				{
-					if (Comp_line(old, virt) == -1)
-					{
-						if (String_table[cs__]) /* scrolling region */
-						{
-							list[1] = tmp_ft;
-							list[0] = min((last_same - 1), (window->Num_lines - 1));
-							String_Out(String_table[cs__], list, 2);
-							Curr_y = Curr_x = -1;
-						}
-
-						for (offset = (from_top - tmp_ft); (offset > 0); offset--)
-						{
-							old = Insert_line(tmp_ft, min((last_same - 1), (window->Num_lines -1)), window);
-							diff = FALSE;
-						}
-
-						if (String_table[cs__]) /* scrolling region */
-						{
-							list[1] = 0;
-							list[0] = LINES - 1;
-							String_Out(String_table[cs__], list, 2);
-							Curr_y = Curr_x = -1;
-						}
-
-						top_of_win = curscr->first_line;
-						curr = top_of_win;
-						for (offset = 0; offset < from_top; offset++)
-							curr = curr->next_screen;
-						for (offset = from_top, old=curr, new=virt; 
-						   offset < window->Num_lines; 
-						   old=old->next_screen, new=new->next_screen,
-						   offset++)
-						{
-							similar = Comp_line(old, new);
-							virtual_lines[offset] = (similar > 0 ? FALSE : TRUE);
-						}
-					}
-					else
-						old = old->prev_screen;
-				}
-			}
-			from_top++;
-			curr = curr->next_screen;
-			virt = virt->next_screen;
-		}
-	}
-
-
-	/*
-	 |	Scrolling done, now need to insert, delete, or modify text 
-	 |	within lines.
-	 */
-
-	for (from_top = 0, curr = curscr->first_line; from_top < window->SR; from_top++)
-		curr = curr->next_screen;
-	top_of_win = curr;
-	for (from_top = 0, curr = top_of_win, virt = window->first_line; from_top < window->Num_lines; from_top++, curr = curr->next_screen, virt = virt->next_screen)
-	{
-
-		/*
-		 |	If either 'insert mode' or 'insert char' are 
-		 |	available, enter the following 'if' statement, 
-		 |	else, need to simply rewrite the contents of the line
-		 |	at the point where the contents of the line change.
-		 */
-
-		if (((String_table[ic__]) || (String_table[im__])) && 
-		    (String_table[dc__]) && (curr->row[0] != (char) NULL) &&
-		    (!NC_chinese))
-		{
-			j = 0;
-			first_time = TRUE;
-			vrt_lin = virt->row;
-			vrt_att = virt->attributes;
-			cur_lin = curr->row;
-			cur_att = curr->attributes;
-			while ((vrt_lin[j] != (char) NULL) && (j < window->Num_cols))
-			{
-				if ((STAND) && (Booleans[xs__]))
-				{
-					while ((vrt_lin[j] == cur_lin[j]) && (vrt_att[j] == cur_att[j]) && (vrt_lin[j] != (char) NULL) && (vrt_att[j]))
-						j++;
-					if ((STAND) && (!vrt_att[j]))
-					{
-						STAND = FALSE;
-						Position(window, from_top, j);
-						attribute_off();
-						attribute_off();
-					}
-				}
-				else
-				{
-					while ((vrt_lin[j] == cur_lin[j]) && (vrt_att[j] == cur_att[j]) && (vrt_lin[j] != (char) NULL))
-						j++;
-				}
-				if ((vrt_att[j] != cur_att[j]) && (cur_att[j]) && (Booleans[xs__]))
-				{
-					Position(window, from_top, j);
-/*					CLEAR_TO_EOL(window, from_top, j);*/
-					attribute_off();
-					attribute_off();
-				}
-				if (vrt_lin[j] != (char) NULL)
-				{
-					begin_new = j;
-					begin_old = j;
-					end_old = j;
-					end_new = j;
-					if ((first_time) && (virt->changed))
-					{
-						if (curr->last_char <= virt->last_char)
-							changed = check_insert(window, from_top, j, virt, curr);
-					}
-					changed = check_delete(window, from_top, j, virt, curr);
-					first_time = FALSE;
-					virt->changed = FALSE;
-					if (!changed)
-						changed = check_insert(window, from_top, j, virt, curr);
-					if (((!changed) || (cur_lin[j] != vrt_lin[j]) || (cur_att[j] != vrt_att[j])) && (j < window->Num_cols))
-					{
-						if ((vrt_lin[j] == ' ') && (cur_lin[j] == (char) NULL) && (vrt_att[j] == cur_att[j]))
-							cur_lin[j] = ' ';
-						else
-						{
-							Position(window, from_top, j);
-							Char_out(vrt_lin[j], vrt_att[j], cur_lin, cur_att, j);
-						}
-					}
-					if ((vrt_lin[j] != (char) NULL))
-						j++;
-				}
-				if ((STAND) && (!vrt_att[j]))
-				{
-					STAND = FALSE;
-					Position(window, from_top, j);
-					attribute_off();
-				}
-			}
-			if ((vrt_lin[j] == (char) NULL) && (cur_lin[j] != (char) NULL))
-			{
-				Position(window, from_top, j);
-				CLEAR_TO_EOL(window, from_top, j);
-			}
-		}
-		else /*if ((similar != -1) && (similar != 0))*/
-		{
-			j = 0;
-			c1 = curr->row;
-			att1 = curr->attributes;
-			c2 = virt->row;
-			att2 = virt->attributes;
-			while ((j < window->Num_cols) && (c2[j] != (char) NULL))
-			{
-				while ((c1[j] == c2[j]) && (att1[j] == att2[j]) && (j < window->Num_cols) && (c2[j] != (char) NULL))
-					j++;
-
-				/*
-				 |	if previous character is an eight bit 
-				 |	char, start redraw from that character
-				 */
-
-				if ((NC_chinese) && (highbitset(c1[j - 1])))
-					j--;
-				begin_old = j;
-				begin_new = j;
-				if ((j < window->Num_cols) && (c2[j] != (char) NULL))
-				{
-					Position(window, from_top, begin_old);
-					CLEAR_TO_EOL(window, from_top, j);
-					Position(window, from_top, begin_old);
-					for (j = begin_old; (c2[j] != (char) NULL) && (j < window->Num_cols); j++)
-						Char_out(c2[j], att2[j], c1, att1, j);
-				}
-			}
-			if ((c2[j] == (char) NULL) && (c1[j] != (char) NULL))
-			{
-				Position(window, from_top, j);
-				CLEAR_TO_EOL(window, from_top, j);
-			}
-		}
-		if (STAND)
-		{
-			STAND = FALSE;
-			Position(window, from_top, j);
-			attribute_off();
-		}
-		virt->number = from_top;
-	}
-	Position(window, window->LY, window->LX);
-}
-
-void 
-Position(WINDOW *window, int row, int col)
-/* position the cursor for output on the screen	*/
-{
-	int list[10];
-	int place;
-
-	int pos_row;
-	int pos_column;
-
-	pos_row = row + window->SR;
-	pos_column = col + window->SC;
-	if ((pos_row != Curr_y) || (pos_column != Curr_x))
-	{
-		if (String_table[cm__] != NULL) /* && (row < window->Num_lines) && (column < window->Num_cols))*/ 
-		{
-			place = 0;
-			list[place++] = pos_column;
-			list[place++] = pos_row;
-			String_Out(String_table[cm__], list, place);
-			if ((STAND) && (!Booleans[ms__]))
-				attribute_on();
-		}
-		Curr_x = pos_column;
-		Curr_y = pos_row;
-	}
-}
-
-void 
-Char_del(char *line, char *attrib, int offset, int maxlen)
-/* delete chars from line */
-{
-	int one, two;
-
-	for (one = offset, two = offset+1; (line[one] != (char) NULL) && (one < maxlen); one++, two++)
-	{
-		line[one] = line[two];
-		attrib[one] = attrib[two];
-	}
-	String_Out(String_table[dc__], NULL, 0);
-}
-
-void 
-Char_ins(char *line, char *attrib, char newc, char newatt, int offset,
-         int maxlen)	/* insert chars in line	*/
-{
-	int one, two;
-
-	one = 0;
-	while ((line[one] != (char) NULL) && (one < (maxlen - 2)))
-		one++;
-	for (two = one + 1; (two > offset); one--, two--)
-	{
-		line[two] = line[one];
-		attrib[two] = attrib[one];
-	}
-	line[offset] = newc;
-	attrib[offset] = newatt;
-	Char_out(newc, newatt, line, attrib, offset);
-}
-
-void 
-attribute_on(void)
-{
-	if (String_table[sa__])
-	{
-		attributes_set[0] = 1;
-		String_Out(String_table[sa__], attributes_set, 1);
-	}
-	else if (String_table[so__])
-		String_Out(String_table[so__], NULL, 0);
-}
-
-void 
-attribute_off(void)
-{
-	if (String_table[me__])
-		String_Out(String_table[me__], NULL, 0);
-	else if (String_table[sa__])
-	{
-		attributes_set[0] = 0;
-		String_Out(String_table[sa__], attributes_set, 1);
-	}
-	else if (String_table[se__])
-		String_Out(String_table[se__], NULL, 0);
-}
-
-void 
-Char_out(char newc, char newatt, char *line, char *attrib, int offset)
-/* output character with proper attribute	*/
-{
-
-
-	if ((newatt) && (!STAND))
-	{
-		STAND = TRUE;
-		attribute_on();
-	}
-	else if ((STAND) && (!newatt))
-	{
-		STAND = FALSE;
-		attribute_off();
-	}
-
-	if ((newatt) && (STAND) && (Booleans[xs__]))
-	{
-		attribute_on();
-	}
-
-	if (!((Curr_y >= (LINES - 1)) && (Curr_x >= (COLS - 1))))
-	{
-		putchar(newc);
-		line[offset] = newc;
-		attrib[offset] = newatt;
-	}
-	Curr_x++;
-}
-
-/*
- |
- |	The two routines that follow, nc_setattrib(), nc_clearattrib(), are 
- |	hacks that notify new_curse to handle characters that have the high 
- |	bit set as the first of two bytes of a multi-byte string.
- |
- */
-
-void 
-nc_setattrib(int flag)
-{
-	nc_attributes |= flag;
-}
-
-void 
-nc_clearattrib(int flag)
-{
-	nc_attributes &= ~flag;
-}
-
Index: usr.bin/ee/new_curse.h
===================================================================
RCS file: usr.bin/ee/new_curse.h
diff -N usr.bin/ee/new_curse.h
--- usr.bin/ee/new_curse.h	17 Jun 2003 04:29:26 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,262 +0,0 @@
-/*
- |	new_curse.h
- |
- |	A subset of curses developed for use with ae.
- |
- |	written by Hugh Mahon
- |
- |	THIS MATERIAL IS PROVIDED "AS IS".  THERE ARE
- |	NO WARRANTIES OF ANY KIND WITH REGARD TO THIS
- |	MATERIAL, INCLUDING, BUT NOT LIMITED TO, THE
- |	IMPLIED WARRANTIES OF MERCHANTABILITY AND
- |	FITNESS FOR A PARTICULAR PURPOSE.  Neither
- |	Hewlett-Packard nor Hugh Mahon shall be liable
- |	for errors contained herein, nor for
- |	incidental or consequential damages in
- |	connection with the furnishing, performance or
- |	use of this material.  Neither Hewlett-Packard
- |	nor Hugh Mahon assumes any responsibility for
- |	the use or reliability of this software or
- |	documentation.  This software and
- |	documentation is totally UNSUPPORTED.  There
- |	is no support contract available.  Hewlett-
- |	Packard has done NO Quality Assurance on ANY
- |	of the program or documentation.  You may find
- |	the quality of the materials inferior to
- |	supported materials.
- |
- |	This software is not a product of Hewlett-Packard, Co., or any 
- |	other company.  No support is implied or offered with this software.
- |	You've got the source, and you're on your own.
- |
- |	This software may be distributed under the terms of Larry Wall's 
- |	Artistic license, a copy of which is included in this distribution. 
- |
- |	This notice must be included with this software and any derivatives.
- |
- |	Copyright (c) 1986, 1987, 1988, 1991, 1995 Hugh Mahon
- |	All are rights reserved.
- |
- | $FreeBSD: src/usr.bin/ee/new_curse.h,v 1.2.8.1 2001/06/10 11:06:06 sobomax Exp $
- | $DragonFly: src/usr.bin/ee/new_curse.h,v 1.2 2003/06/17 04:29:26 dillon Exp $
- |
- */
-
-#include <stdio.h>
-
-#ifdef SYS5
-#include <termio.h>
-#else
-#include <sgtty.h>
-#include <fcntl.h>
-#endif
-
-#define KEY_BREAK	0401
-#define KEY_DOWN	0402
-#define KEY_UP		0403
-#define KEY_LEFT	0404
-#define KEY_RIGHT	0405
-#define KEY_HOME	0406
-#define KEY_BACKSPACE	0407
-#define KEY_F0		0410
-#define KEY_F(n) 	(KEY_F0+(n))
-#define KEY_DL		0510
-#define KEY_IL		0511
-#define KEY_DC		0512
-#define KEY_IC		0513
-#define KEY_EIC		0514
-#define KEY_CLEAR	0515
-#define KEY_EOS		0516
-#define KEY_EOL		0517
-#define KEY_SF		0520
-#define KEY_SR		0521
-#define KEY_NPAGE	0522
-#define KEY_PPAGE	0523
-#define KEY_STAB	0524
-#define KEY_CTAB	0525
-#define KEY_CATAB	0526
-#define KEY_ENTER	0527
-#define KEY_SRESET	0530
-#define KEY_RESET	0531
-#define KEY_PRINT	0532
-#define KEY_LL		0533
-#define KEY_A1	0534
-#define KEY_A3	0535
-#define KEY_B2	0536
-#define KEY_C1	0537
-#define KEY_C3	0540
-#define KEY_BTAB	0541
-#define KEY_BEG	0542
-#define KEY_CANCEL	0543
-#define KEY_CLOSE	0544
-#define KEY_COMMAND	0545
-#define KEY_COPY	0546
-#define KEY_CREATE	0547
-#define KEY_END	0550
-#define KEY_EXIT	0551
-#define KEY_FIND	0552
-#define KEY_HELP	0553
-#define KEY_MARK	0554
-#define KEY_MESSAGE	0555
-#define KEY_MOVE	0556
-#define KEY_NEXT	0557
-#define KEY_OPEN	0560
-#define KEY_OPTIONS	0561
-#define KEY_PREVIOUS	0562
-#define KEY_REDO	0563
-#define KEY_REFERENCE	0564
-#define KEY_REFRESH	0565
-#define KEY_REPLACE	0566
-#define KEY_RESTART	0567
-#define KEY_RESUME	0570
-#define KEY_SAVE	0571
-#define KEY_SBEG	0572
-#define KEY_SCANCEL	0573
-#define KEY_SCOMMAND	0574
-#define KEY_SCOPY	0575
-#define KEY_SCREATE	0576
-#define KEY_SDC	0577
-#define KEY_SDL	0600
-#define KEY_SELECT	0601
-#define KEY_SEND	0602
-#define KEY_SEOL	0603
-#define KEY_SEXIT	0604
-#define KEY_SFIND	0605
-#define KEY_SHELP	0606
-#define KEY_SHOME	0607
-#define KEY_SIC	0610
-#define KEY_SLEFT	0611
-#define KEY_SMESSAGE	0612
-#define KEY_SMOVE	0613
-#define KEY_SNEXT	0614
-#define KEY_SOPTIONS	0615
-#define KEY_SPREVIOUS	0616
-#define KEY_SPRINT	0617
-#define KEY_SREDO	0620
-#define KEY_SREPLACE	0621
-#define KEY_SRIGHT	0622
-#define KEY_SRSUME	0623
-#define KEY_SSAVE	0624
-#define KEY_SSUSPEND	0625
-#define KEY_SUNDO	0626
-#define KEY_SUSPEND	0627
-#define KEY_UNDO	0630
-
-#define TRUE 1
-#define FALSE 0
-
-#define A_STANDOUT 0001		/* standout mode		*/
-#define A_NC_BIG5  0x0100	/* Handle Chinese Big5 characters	*/
-#define SCROLL 1		/* text has been scrolled	*/
-#define CLEAR  2		/* window has been cleared	*/
-#define CHANGE 3		/* window has been changed	*/
-#define UP 1			/* direction of scroll		*/
-#define DOWN 2
-
-struct _line {
-	struct _line *next_screen;
-	struct _line *prev_screen;
-	char *row;
-	char *attributes;
-	int last_char;
-	int changed;
-	int scroll;
-	int number;
-	};
-
-struct _line *top_of_win;
-
-typedef struct WIND {
-	int SR;		/* starting row		*/
-	int SC;		/* starting column	*/
-	int LC;		/* last column		*/
-	int LX;		/* last cursor column position	*/
-	int LY;		/* last cursor row position	*/
-	int Attrib;	/* attributes active in window	*/
-	int Num_lines;	/* number of lines		*/
-	int Num_cols;	/* number of columns		*/
-	int scroll_up;	/* number of lines moved	*/
-	int scroll_down;
-	int SCROLL_CLEAR;	/* indicates that window has been scrolled or cleared	*/
-	struct _line *first_line;
-	} WINDOW;
-
-extern WINDOW *curscr;
-extern WINDOW *stdscr;
-
-extern int LINES, COLS;
-
-#if __STDC__ || defined(__cplusplus)
-#define P_(s) s
-#else
-#define P_(s) ()
-#endif
-
-extern void copy_window P_((WINDOW *origin, WINDOW *destination));
-extern void reinitscr P_((int));
-extern void initscr P_((void));
-extern int Get_int P_((void));
-extern int INFO_PARSE P_((void));
-extern int AtoI P_((void));
-extern void Key_Get P_((void));
-extern void keys_vt100 P_((void));
-extern struct _line *Screenalloc P_((int columns));
-extern WINDOW *newwin P_((int lines, int cols, int start_l, int start_c));
-extern int Operation P_((int Temp_Stack[], int place));
-extern void Info_Out P_((char *string, int p_list[], int place));
-extern void wmove P_((WINDOW *window, int row, int column));
-extern void clear_line P_((struct _line *line, int column, int cols));
-extern void werase P_((WINDOW *window));
-extern void wclrtoeol P_((WINDOW *window));
-extern void wrefresh P_((WINDOW *window));
-extern void touchwin P_((WINDOW *window));
-extern void wnoutrefresh P_((WINDOW *window));
-extern void flushinp P_((void));
-extern void ungetch P_((int c));
-extern int wgetch P_((WINDOW *window));
-extern void Clear P_((int));
-extern int Get_key P_((int first_char));
-extern void waddch P_((WINDOW *window, int c));
-extern void winsertln P_((WINDOW *window));
-extern void wdeleteln P_((WINDOW *window));
-extern void wclrtobot P_((WINDOW *window));
-extern void wstandout P_((WINDOW *window));
-extern void wstandend P_((WINDOW *window));
-extern void waddstr P_((WINDOW *window, char *string));
-extern void clearok P_((WINDOW *window, int flag));
-extern void echo P_((void));
-extern void noecho P_((void));
-extern void raw P_((void));
-extern void noraw P_((void));
-extern void nl P_((void));
-extern void nonl P_((void));
-extern void saveterm P_((void));
-extern void fixterm P_((void));
-extern void resetterm P_((void));
-extern void nodelay P_((WINDOW *window, int flag));
-extern void idlok P_((WINDOW *window, int flag));
-extern void keypad P_((WINDOW *window, int flag));
-extern void savetty P_((void));
-extern void resetty P_((void));
-extern void endwin P_((void));
-extern void delwin P_((WINDOW *window));
-extern void wprintw P_((WINDOW *window, const char* format, ...));
-extern void iout P_((WINDOW *window, int value));
-extern int Comp_line P_((struct _line *line1, struct _line *line2));
-extern struct _line *Insert_line P_((int row, int end_row, WINDOW *window));
-extern struct _line *Delete_line P_((int row, int end_row, WINDOW *window));
-extern void CLEAR_TO_EOL P_((WINDOW *window, int row, int column));
-extern int check_delete P_((WINDOW *window, int line, int offset, struct _line *pointer_new, struct _line *pointer_old));
-extern int check_insert P_((WINDOW *window, int line, int offset, struct _line *pointer_new, struct _line *pointer_old));
-extern void doupdate P_((void));
-extern void Position P_((WINDOW *window, int row, int col));
-extern void Char_del P_((char *line, char *attrib, int offset, int maxlen));
-extern void Char_ins P_((char *line, char *attrib, int newc, int newatt, int offset, int maxlen));
-extern void attribute_on P_((void));
-extern void attribute_off P_((void));
-extern void Char_out P_((int newc, int newatt, char *line, char *attrib, int offset));
-
-extern void nc_setattrib P_((int));
-extern void nc_clearattrib P_((int));
-#undef P_
-
Index: usr.bin/gencat/gencat.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/gencat/gencat.c,v
retrieving revision 1.4
diff -u -r1.4 gencat.c
--- usr.bin/gencat/gencat.c	31 Aug 2005 18:11:05 -0000	1.4
+++ usr.bin/gencat/gencat.c	24 Aug 2008 18:50:20 -0000
@@ -122,28 +122,26 @@
 static void	*xmalloc(size_t);
 static void	*xrealloc(void *, size_t);
 
-void	MCParse __P((int fd));
-void	MCReadCat __P((int fd));
-void	MCWriteCat __P((int fd));
-void	MCDelMsg __P((int msgId));
-void	MCAddMsg __P((int msgId, const char *msg));
-void	MCAddSet __P((int setId));
-void	MCDelSet __P((int setId));
-int	main __P((int, char **));
-void	usage __P((void));
+void	MCParse(int fd);
+void	MCReadCat(int fd);
+void	MCWriteCat(int fd);
+void	MCDelMsg(int msgId);
+void	MCAddMsg(int msgId, const char *msg);
+void	MCAddSet(int setId);
+void	MCDelSet(int setId);
+int	main(int, char **);
+void	usage(void);
 
 
 void
-usage()
+usage(void)
 {
 	fprintf(stderr, "usage: %s catfile msgfile ...\n", getprogname());
 	exit(1);
 }
 
 int
-main(argc, argv)
-	int     argc;
-	char   *argv[];
+main(int argc, char *argv[])
 {
 	int     ofd, ifd;
 	char   *catfile = NULL;
@@ -179,9 +177,7 @@
 }
 
 static void
-warning(cptr, msg)
-	char   *cptr;
-	char   *msg;
+warning(char *cptr, char *msg)
 {
 	fprintf(stderr, "%s: %s on line %ld\n", getprogname(), msg, lineno);
 	fprintf(stderr, "%s\n", curline);
@@ -194,9 +190,7 @@
 }
 
 static void
-error(cptr, msg)
-	char   *cptr;
-	char   *msg;
+error(char *cptr, char *msg)
 {
 	warning(cptr, msg);
 	exit(1);
@@ -204,21 +198,20 @@
 
 #if 0	/* XXX unused */
 static void
-corrupt()
+corrupt(void)
 {
 	error(NULL, "corrupt message catalog");
 }
 #endif
 
 static void
-nomem()
+nomem(void)
 {
 	error(NULL, "out of memory");
 }
 
 static void *
-xmalloc(len)
-	size_t  len;
+xmalloc(size_t len)
 {
 	void   *p;
 
@@ -228,9 +221,7 @@
 }
 
 static void *
-xrealloc(ptr, size)
-	void   *ptr;
-	size_t  size;
+xrealloc(void *ptr, size_t size)
 {
 	if ((ptr = realloc(ptr, size)) == NULL)
 		nomem();
@@ -238,8 +229,7 @@
 }
 
 static char *
-xstrdup(str)
-	const char   *str;
+xstrdup(const char *str)
 {
 	char *nstr;
 
@@ -249,8 +239,7 @@
 }
 
 static char *
-getline(fd)
-	int     fd;
+getline(int fd)
 {
 	static long curlen = BUFSIZ;
 	static char buf[BUFSIZ], *bptr = buf, *bend = buf;
@@ -293,8 +282,7 @@
 }
 
 static char *
-wskip(cptr)
-	char   *cptr;
+wskip(char *cptr)
 {
 	if (!*cptr || !isspace((unsigned char) *cptr)) {
 		warning(cptr, "expected a space");
@@ -306,8 +294,7 @@
 }
 
 static char *
-cskip(cptr)
-	char   *cptr;
+cskip(char *cptr)
 {
 	if (!*cptr || isspace((unsigned char) *cptr)) {
 		warning(cptr, "wasn't expecting a space");
@@ -319,10 +306,7 @@
 }
 
 static char *
-getmsg(fd, cptr, quote)
-	int     fd;
-	char   *cptr;
-	char    quote;
+getmsg(int fd, char *cptr, char quote)
 {
 	static char *msg = NULL;
 	static long msglen = 0;
@@ -422,8 +406,7 @@
 }
 
 void
-MCParse(fd)
-	int     fd;
+MCParse(int fd)
 {
 	char   *cptr, *str;
 	int     setid, msgid = 0;
@@ -500,8 +483,7 @@
 }
 
 void
-MCReadCat(fd)
-	int     fd;
+MCReadCat(int fd)
 {
 #if 0
 	MCHeaderT mcHead;
@@ -592,8 +574,7 @@
  * that would otherwise be required.
  */
 void
-MCWriteCat(fd)
-	int     fd;
+MCWriteCat(int fd)
 {
 	int     nsets;		/* number of sets */
 	int     nmsgs;		/* number of msgs */
@@ -698,8 +679,7 @@
 }
 
 void
-MCAddSet(setId)
-	int     setId;
+MCAddSet(int setId)
 {
 	struct _setT *p, *q;
 
@@ -736,9 +716,7 @@
 }
 
 void
-MCAddMsg(msgId, str)
-	int     msgId;
-	const char *str;
+MCAddMsg(int msgId, const char *str)
 {
 	struct _msgT *p, *q;
 
@@ -776,8 +754,7 @@
 }
 
 void
-MCDelSet(setId)
-	int     setId;
+MCDelSet(int setId)
 {
 	struct _setT *set;
 	struct _msgT *msg;
@@ -800,8 +777,7 @@
 }
 
 void
-MCDelMsg(msgId)
-	int     msgId;
+MCDelMsg(int msgId)
 {
 	struct _msgT *msg;
 
Index: usr.bin/gprof/gprof.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/gprof/gprof.c,v
retrieving revision 1.5
diff -u -r1.5 gprof.c
--- usr.bin/gprof/gprof.c	22 Jan 2006 03:43:37 -0000	1.5
+++ usr.bin/gprof/gprof.c	24 Aug 2008 09:41:31 -0000
@@ -399,7 +399,7 @@
 
 readsamples(FILE *pfile)
 {
-    register i;
+    int		i;
     UNIT	sample;
 
     if (samples == 0) {
Index: usr.bin/kdump/kdump.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.10
diff -u -r1.10 kdump.c
--- usr.bin/kdump/kdump.c	7 Jan 2008 01:35:43 -0000	1.10
+++ usr.bin/kdump/kdump.c	24 Aug 2008 21:02:57 -0000
@@ -67,7 +67,7 @@
 {
 	int ch, col, ktrlen, size;
 	pid_t do_pid = -1;
-	register void *m;
+	void *m;
 	int trpoints = ALL_POINTS;
 	char *cp;
 
@@ -244,10 +244,10 @@
 	"PT_KILL",	"PT_STEP",	"PT_ATTACH",	"PT_DETACH",
 };
 
-ktrsyscall(register struct ktr_syscall *ktr)
+ktrsyscall(struct ktr_syscall *ktr)
 {
-	register narg = ktr->ktr_narg;
-	register register_t *ip;
+	int narg = ktr->ktr_narg;
+	register_t *ip;
 	char *ioctlname();
 
 	if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)
@@ -658,9 +658,9 @@
 
 ktrsysret(struct ktr_sysret *ktr)
 {
-	register register_t ret = ktr->ktr_retval;
-	register int error = ktr->ktr_error;
-	register int code = ktr->ktr_code;
+	register_t ret = ktr->ktr_retval;
+	int error = ktr->ktr_error;
+	int code = ktr->ktr_code;
 
 	if (code >= nsyscalls || code < 0)
 		(void)printf("[%d] ", code);
@@ -697,11 +697,11 @@
 
 ktrgenio(struct ktr_genio *ktr, int len)
 {
-	register int datalen = len - sizeof (struct ktr_genio);
-	register char *dp = (char *)ktr + sizeof (struct ktr_genio);
-	register char *cp;
-	register int col = 0;
-	register width;
+	int datalen = len - sizeof (struct ktr_genio);
+	char *dp = (char *)ktr + sizeof (struct ktr_genio);
+	char *cp;
+	int col = 0;
+	int width;
 	char visbuf[5];
 	static screenwidth = 0;
 
Index: usr.bin/lex/flex.skl
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.8
diff -u -r1.8 flex.skl
--- usr.bin/lex/flex.skl	21 Jun 2008 19:32:14 -0000	1.8
+++ usr.bin/lex/flex.skl	24 Aug 2008 09:45:53 -0000
@@ -448,9 +448,9 @@
 
 YY_DECL
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
 
 %% user's declarations go here
 
@@ -747,9 +747,9 @@
 int yyFlexLexer::yy_get_next_buffer()
 %*
 	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
+	char *dest = yy_current_buffer->yy_ch_buf;
+	char *source = yytext_ptr;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -887,8 +887,8 @@
 yy_state_type yyFlexLexer::yy_get_previous_state()
 %*
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
 
 %% code to get the start state into yy_current_state goes here
 
@@ -918,7 +918,7 @@
 yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )
 %*
 	{
-	register int yy_is_jam;
+	int yy_is_jam;
 %% code to find the next state, and perhaps do backing up, goes here
 
 	return yy_is_jam ? 0 : yy_current_state;
@@ -928,17 +928,17 @@
 %-
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+char *yy_bp;
 #endif
 %+
-void yyFlexLexer::yyunput( int c, register char* yy_bp )
+void yyFlexLexer::yyunput( int c, char* yy_bp )
 %*
 	{
-	register char *yy_cp = yy_c_buf_p;
+	char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yy_hold_char;
@@ -946,11 +946,10 @@
 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
+		int number_to_move = yy_n_chars + 2;
+		char *dest = &yy_current_buffer->yy_ch_buf[
 					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+		char *source = &yy_current_buffer->yy_ch_buf[number_to_move];
 
 		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
@@ -1485,7 +1484,7 @@
 int n;
 #endif
 	{
-	register int i;
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 	}
@@ -1499,7 +1498,7 @@
 yyconst char *s;
 #endif
 	{
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
Index: usr.bin/lex/gen.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/gen.c,v
retrieving revision 1.5
diff -u -r1.5 gen.c
--- usr.bin/lex/gen.c	3 Feb 2008 13:14:12 -0000	1.5
+++ usr.bin/lex/gen.c	24 Aug 2008 09:46:36 -0000
@@ -446,7 +446,7 @@
 
 void gen_next_compressed_state(char *char_map)
 	{
-	indent_put2s( "register YY_CHAR yy_c = %s;", char_map );
+	indent_put2s( "YY_CHAR yy_c = %s;", char_map );
 
 	/* Save the backing-up info \before/ computing the next state
 	 * because we always compute one more state than needed - we
@@ -533,8 +533,8 @@
 		{
 		indent_puts( "{" );	/* } for vi */
 		indent_puts(
-		"register yyconst struct yy_trans_info *yy_trans_info;\n" );
-		indent_puts( "register YY_CHAR yy_c;\n" );
+		"yyconst struct yy_trans_info *yy_trans_info;\n" );
+		indent_puts( "YY_CHAR yy_c;\n" );
 		indent_put2s( "for ( yy_c = %s;", char_map );
 		indent_puts(
 	"      (yy_trans_info = &yy_current_state[(unsigned int) yy_c])->" );
@@ -674,7 +674,7 @@
 		/* We're going to need yy_cp lying around for the call
 		 * below to gen_backing_up().
 		 */
-		indent_puts( "register char *yy_cp = yy_c_buf_p;" );
+		indent_puts( "char *yy_cp = yy_c_buf_p;" );
 
 	outc( '\n' );
 
@@ -696,10 +696,10 @@
 	else if ( fullspd )
 		{
 		do_indent();
-		out_dec( "register int yy_c = %d;\n", NUL_ec );
+		out_dec( "int yy_c = %d;\n", NUL_ec );
 
 		indent_puts(
-		"register yyconst struct yy_trans_info *yy_trans_info;\n" );
+		"yyconst struct yy_trans_info *yy_trans_info;\n" );
 		indent_puts(
 		"yy_trans_info = &yy_current_state[(unsigned int) yy_c];" );
 		indent_puts( "yy_current_state += yy_trans_info->yy_nxt;" );
Index: usr.bin/lex/lex.1
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/lex.1,v
retrieving revision 1.2
diff -u -r1.2 lex.1
--- usr.bin/lex/lex.1	17 Jun 2003 04:29:27 -0000	1.2
+++ usr.bin/lex/lex.1	24 Aug 2008 09:47:12 -0000
@@ -946,7 +946,7 @@
 
     %%
     "/*"        {
-                register int c;
+                int c;
 
                 for ( ; ; )
                     {
Index: usr.bin/lex/parse.y
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/parse.y,v
retrieving revision 1.4
diff -u -r1.4 parse.y
--- usr.bin/lex/parse.y	21 Jun 2008 19:29:21 -0000	1.4
+++ usr.bin/lex/parse.y	24 Aug 2008 09:47:24 -0000
@@ -769,7 +769,7 @@
 
 void build_eof_action( void )
 	{
-	register int i;
+	int i;
 	char action_text[MAXLINE];
 
 	for ( i = 1; i <= scon_stk_ptr; ++i )
Index: usr.bin/lex/scan.l
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/scan.l,v
retrieving revision 1.3
diff -u -r1.3 scan.l
--- usr.bin/lex/scan.l	21 Jun 2008 19:29:21 -0000	1.3
+++ usr.bin/lex/scan.l	24 Aug 2008 09:47:36 -0000
@@ -435,7 +435,7 @@
 			}
 
 	"{"{NAME}"}"	{
-			register Char *nmdefptr;
+			Char *nmdefptr;
 			Char *ndlookup();
 
 			strcpy( nmstr, yytext + 1 );
Index: usr.bin/locate/locate/locate.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/locate/locate/locate.c,v
retrieving revision 1.4
diff -u -r1.4 locate.c
--- usr.bin/locate/locate/locate.c	6 Nov 2003 19:30:04 -0000	1.4
+++ usr.bin/locate/locate/locate.c	24 Aug 2008 09:48:09 -0000
@@ -132,7 +132,7 @@
         int argc;
         char **argv;
 {
-        register int ch;
+        int ch;
         char **dbv = NULL;
 #ifdef MMAP
         f_mmap = 1;		/* mmap is default */
Index: usr.bin/pr/egetopt.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/pr/egetopt.c,v
retrieving revision 1.3
diff -u -r1.3 egetopt.c
--- usr.bin/pr/egetopt.c	4 Oct 2003 20:36:50 -0000	1.3
+++ usr.bin/pr/egetopt.c	24 Aug 2008 09:48:49 -0000
@@ -70,9 +70,9 @@
 egetopt(int nargc, char * const *nargv, const char *ostr)
 {
 	static char *place = EMSG;	/* option letter processing */
-	register char *oli;		/* option letter list index */
+	char *oli;			/* option letter list index */
 	static int delim;		/* which option delimeter */
-	register char *p;
+	char *p;
 	static char savec = '\0';
 
 	if (savec != '\0') {
Index: usr.bin/pr/pr.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/pr/pr.c,v
retrieving revision 1.3
diff -u -r1.3 pr.c
--- usr.bin/pr/pr.c	4 Oct 2003 20:36:50 -0000	1.3
+++ usr.bin/pr/pr.c	24 Aug 2008 09:49:53 -0000
@@ -160,11 +160,11 @@
 int
 onecol(int argc, char **argv)
 {
-	register int cnt = -1;
-	register int off;
-	register int lrgln;
-	register int linecnt;
-	register int num;
+	int cnt = -1;
+	int off;
+	int lrgln;
+	int linecnt;
+	int num;
 	int lncnt;
 	int pagecnt;
 	int ips;
@@ -305,13 +305,13 @@
 int
 vertcol(int argc, char **argv)
 {
-	register char *ptbf;
-	register char **lstdat;
-	register int i;
-	register int j;
-	register int cnt = -1;
-	register int pln;
-	register int *indy;
+	char *ptbf;
+	char **lstdat;
+	int i;
+	int j;
+	int cnt = -1;
+	int pln;
+	int *indy;
 	int cvc;
 	int *lindy;
 	int lncnt;
@@ -626,13 +626,13 @@
 int
 horzcol(int argc, char **argv)
 {
-	register char *ptbf;
-	register int pln;
-	register int cnt = -1;
-	register char *lstdat;
-	register int col = colwd + 1;
-	register int j;
-	register int i;
+	char *ptbf;
+	int pln;
+	int cnt = -1;
+	char *lstdat;
+	int col = colwd + 1;
+	int j;
+	int i;
 	int lncnt;
 	int pagecnt;
 	char *buf;
@@ -769,12 +769,12 @@
 int
 mulfile(int argc, char **argv)
 {
-	register char *ptbf;
-	register int j;
-	register int pln;
-	register int cnt;
-	register char *lstdat;
-	register int i;
+	char *ptbf;
+	int j;
+	int pln;
+	int cnt;
+	char *lstdat;
+	int i;
 	FILE **fbuf;
 	int actf;
 	int lncnt;
@@ -981,13 +981,13 @@
  *	mor:	set if more data in line (not truncated)
  */
 int
-inln(FILE *inf, char *buf, register int lim, int *cps, int trnc, int *mor)
+inln(FILE *inf, char *buf, int lim, int *cps, int trnc, int *mor)
 {
-	register int col;
-	register int gap = ingap;
-	register int ch = EOF;
-	register char *ptbuf;
-	register int chk = (int)inchar;
+	int col;
+	int gap = ingap;
+	int ch = EOF;
+	char *ptbuf;
+	int chk = (int)inchar;
 
 	ptbuf = buf;
 
@@ -1086,13 +1086,13 @@
  *		1 is more, 0 is complete, -1 is no \n's
  */
 int
-otln(register char *buf, int cnt, int *svips, int *svops, int mor)
+otln(char *buf, int cnt, int *svips, int *svops, int mor)
 {
-	register int ops;		/* last col output */
-	register int ips;		/* last col in buf examined */
-	register int gap = ogap;
-	register int tbps;
-	register char *endbuf;
+	int ops;			/* last col output */
+	int ips;			/* last col in buf examined */
+	int gap = ogap;
+	int tbps;
+	char *endbuf;
 
 	if (ogap) {
 		/*
@@ -1223,10 +1223,10 @@
  *	lncnt	number of lines per page
  */
 int
-inskip(FILE *inf, register int pgcnt, register int lncnt)
+inskip(FILE *inf, int pgcnt, int lncnt)
 {
-	register int c;
-	register int cnt;
+	int c;
+	int cnt;
 
 	while(--pgcnt > 0) {
 		cnt = lncnt;
@@ -1387,9 +1387,9 @@
  *		numbers as part of the column so spaces may be replaced.
  */
 void
-addnum(register char *buf, register int wdth, register int line)
+addnum(char *buf, int wdth, int line)
 {
-	register char *pt = buf + wdth;
+	char *pt = buf + wdth;
 
 	do {
 		*--pt = digs[line % 10];
@@ -1447,7 +1447,7 @@
  *	incomp	was a '\n' missing from last line output
  */
 int
-prtail(register int cnt, int incomp)
+prtail(int cnt, int incomp)
 {
 	if (nohead) {
 		/*
@@ -1561,9 +1561,9 @@
  *		checks on options
  */
 int
-setup(register int argc, register char **argv)
+setup(int argc, char **argv)
 {
-	register int c;
+	int c;
 	int d_first;
 	int eflag = 0;
 	int iflag = 0;
Index: usr.bin/rdist/docmd.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/docmd.c,v
retrieving revision 1.4
diff -u -r1.4 docmd.c
--- usr.bin/rdist/docmd.c	24 Jul 2004 19:45:10 -0000	1.4
+++ usr.bin/rdist/docmd.c	24 Aug 2008 18:26:36 -0000
@@ -65,9 +65,9 @@
 void
 docmds(char **dhosts, int argc, char **argv)
 {
-	register struct cmd *c;
-	register struct namelist *f;
-	register char **cpp;
+	struct cmd *c;
+	struct namelist *f;
+	char **cpp;
 	extern struct cmd *cmds;
 
 	signal(SIGHUP, cleanup);
@@ -118,9 +118,9 @@
 static void
 doarrow(char **filev, struct namelist *files, char *rhost, struct subcmd *cmds)
 {
-	register struct namelist *f;
-	register struct subcmd *sc;
-	register char **cpp;
+	struct namelist *f;
+	struct subcmd *sc;
+	char **cpp;
 	int n, ddir, opts = options;
 
 	if (debug)
@@ -244,7 +244,7 @@
 static int
 makeconn(char *rhost)
 {
-	register char *ruser, *cp;
+	char *ruser, *cp;
 	static char *cur_host = NULL;
 	static int port = -1;
 	char tuser[20];
@@ -335,7 +335,7 @@
  * Signal end of previous connection.
  */
 static void
-closeconn()
+closeconn(void)
 {
 	if (debug)
 		printf("closeconn()\n");
@@ -357,10 +357,10 @@
 }
 
 static int
-okname(register char *name)
+okname(char *name)
 {
-	register char *cp;
-	register int c;
+	char *cp;
+	int c;
 
 	cp = name;
 
@@ -388,9 +388,9 @@
 static void
 dodcolon(char **filev, struct namelist *files, char *stamp, struct subcmd *cmds)
 {
-	register struct subcmd *sc;
-	register struct namelist *f;
-	register char **cpp;
+	struct subcmd *sc;
+	struct namelist *f;
+	char **cpp;
 	struct timeval tv[2];
 	struct timezone tz;
 	struct stat stb;
@@ -498,9 +498,9 @@
 static void
 rcmptime(struct stat *st)
 {
-	register DIR *d;
-	register struct dirent *dp;
-	register char *cp;
+	DIR *d;
+	struct dirent *dp;
+	char *cp;
 	char *otp;
 	int len;
 
@@ -539,9 +539,9 @@
  * stamp file.
  */
 static void
-notify(char *file, char *rhost, register struct namelist *to, time_t lmod)
+notify(char *file, char *rhost, struct namelist *to, time_t lmod)
 {
-	register int fd, len;
+	int fd, len;
 	struct stat stb;
 	FILE *pf;
 
@@ -617,7 +617,7 @@
 int
 inlist(struct namelist *list, char *file)
 {
-	register struct namelist *nl;
+	struct namelist *nl;
 
 	for (nl = list; nl != NULL; nl = nl->n_next)
 		if (!strcmp(file, nl->n_name))
@@ -631,8 +631,8 @@
 int
 except(char *file)
 {
-	register struct	subcmd *sc;
-	register struct	namelist *nl;
+	struct	subcmd *sc;
+	struct	namelist *nl;
 	regex_t rx;
 	int val;
 
@@ -661,7 +661,7 @@
 }
 
 char *
-colon(register char *cp)
+colon(char *cp)
 {
 
 	while (*cp) {
Index: usr.bin/rdist/expand.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/expand.c,v
retrieving revision 1.5
diff -u -r1.5 expand.c
--- usr.bin/rdist/expand.c	25 Nov 2007 18:10:07 -0000	1.5
+++ usr.bin/rdist/expand.c	24 Aug 2008 09:51:36 -0000
@@ -83,8 +83,8 @@
 struct namelist *
 expand(struct namelist *list, int wh)
 {
-	register struct namelist *nl, *prev;
-	register int n;
+	struct namelist *nl, *prev;
+	int n;
 	char pathbuf[BUFSIZ];
 	char *argvbuf[GAVSIZ];
 
@@ -94,7 +94,7 @@
 	}
 
 	if (wh == 0) {
-		register char *cp;
+		char *cp;
 
 		for (nl = list; nl != NULL; nl = nl->n_next)
 			for (cp = nl->n_name; *cp; cp++)
@@ -140,8 +140,8 @@
 static void
 expstr(char *s)
 {
-	register char *cp, *cp1;
-	register struct namelist *tp;
+	char *cp, *cp1;
+	struct namelist *tp;
 	char *tail;
 	char buf[BUFSIZ];
 	int savec, oeargc;
@@ -252,8 +252,8 @@
 static void
 expsh(char *s)
 {
-	register char *cp;
-	register char *spathp, *oldcp;
+	char *cp;
+	char *spathp, *oldcp;
 	struct stat stb;
 
 	spathp = pathp;
@@ -290,7 +290,7 @@
 matchdir(char *pattern)
 {
 	struct stat stb;
-	register struct dirent *dp;
+	struct dirent *dp;
 	DIR *dirp;
 
 	dirp = opendir(path);
@@ -330,7 +330,7 @@
 execbrc(char *p, char *s)
 {
 	char restbuf[BUFSIZ + 2];
-	register char *pe, *pm, *pl;
+	char *pe, *pm, *pl;
 	int brclev;
 	char *lm, savec, *spathp;
 
@@ -410,8 +410,8 @@
 static int
 match(char *s, char *p)
 {
-	register int c;
-	register char *sentp;
+	int c;
+	char *sentp;
 	char sexpany;
 
 	sexpany = expany;
@@ -426,9 +426,9 @@
 }
 
 static int
-amatch(register char *s, register char *p)
+amatch(char *s, char *p)
 {
-	register int scc;
+	int scc;
 	int ok, lc, c, cc;
 	char *spathp;
 	struct stat stb;
@@ -514,9 +514,9 @@
 }
 
 static int
-smatch(register char *s, register char *p)
+smatch(char *s, char *p)
 {
-	register int scc;
+	int scc;
 	int ok, lc, c, cc;
 
 	for (;;) {
@@ -571,10 +571,10 @@
 }
 
 static void
-Cat(register char *s1, register char *s2)
+Cat(char *s1, char *s2)
 {
 	int len;
-	register char *s;
+	char *s;
 
 	len = strlen(s1) + strlen(s2) + 1;
 	nleft -= len;
@@ -609,9 +609,9 @@
  * part corresponding to `file'.
  */
 char *
-exptilde(char buf[], register char *file, int maxlen)
+exptilde(char buf[], char *file, int maxlen)
 {
-	register char *s1, *s2, *s3;
+	char *s1, *s2, *s3;
 	extern char homedir[];
 
 	if (strlen(file) >= maxlen)
Index: usr.bin/rdist/gram.y
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/gram.y,v
retrieving revision 1.4
diff -u -r1.4 gram.y
--- usr.bin/rdist/gram.y	24 Jul 2004 19:45:10 -0000	1.4
+++ usr.bin/rdist/gram.y	24 Aug 2008 18:26:59 -0000
@@ -141,7 +141,7 @@
 		;
 
 cmd:		  INSTALL options opt_namelist SM = {
-			register struct namelist *nl;
+			struct namelist *nl;
 
 			$1->sc_options = $2 | options;
 			if ($3 != NULL) {
@@ -214,11 +214,11 @@
 extern	FILE *fin;
 
 int
-yylex()
+yylex(void)
 {
 	static char yytext[INMAX];
-	register int c;
-	register char *cp1, *cp2;
+	int c;
+	char *cp1, *cp2;
 	static char quotechars[] = "[]{}*?$";
 	
 again:
@@ -365,7 +365,7 @@
 }
 
 int
-any(register int c, register char *str)
+any(int c, char *str)
 {
 	while (*str)
 		if (c == *str++)
@@ -379,8 +379,8 @@
 void
 insert(char *label, struct namelist *files, struct namelist *hosts, struct subcmd *subcmds)
 {
-	register struct cmd *c, *prev, *nc;
-	register struct namelist *h, *next_h;
+	struct cmd *c, *prev, *nc;
+	struct namelist *h, *next_h;
 
 	files = expand(files, E_VARS|E_SHELL);
 	hosts = expand(hosts, E_ALL);
@@ -427,7 +427,7 @@
 void
 append(char *label, struct namelist *files, char *stamp, struct subcmd *subcmds)
 {
-	register struct cmd *c;
+	struct cmd *c;
 
 	c = ALLOC(cmd);
 	if (c == NULL)
@@ -450,8 +450,7 @@
  * Error printing routine in parser.
  */
 void
-yyerror(s)
-	char *s;
+yyerror(char *s)
 {
 	++nerrs;
 	fflush(stdout);
@@ -464,7 +463,7 @@
 static char *
 makestr(char *str)
 {
-	register char *cp, *s;
+	char *cp, *s;
 
 	str = cp = malloc(strlen(s = str) + 1);
 	if (cp == NULL)
@@ -480,7 +479,7 @@
 struct namelist *
 makenl(char *name)
 {
-	register struct namelist *nl;
+	struct namelist *nl;
 
 	nl = ALLOC(namelist);
 	if (nl == NULL)
@@ -496,7 +495,7 @@
 struct subcmd *
 makesubcmd(int type)
 {
-	register struct subcmd *sc;
+	struct subcmd *sc;
 
 	sc = ALLOC(subcmd);
 	if (sc == NULL)
Index: usr.bin/rdist/lookup.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/lookup.c,v
retrieving revision 1.3
diff -u -r1.3 lookup.c
--- usr.bin/rdist/lookup.c	24 Jul 2004 19:45:10 -0000	1.3
+++ usr.bin/rdist/lookup.c	24 Aug 2008 09:52:16 -0000
@@ -56,8 +56,8 @@
 void
 define(char *name)
 {
-	register char *cp, *s;
-	register struct namelist *nl;
+	char *cp, *s;
+	struct namelist *nl;
 	struct namelist *value;
 
 	value = NULL;
@@ -120,9 +120,9 @@
 struct namelist *
 lookup(char *name, int action, struct namelist *value)
 {
-	register unsigned n;
-	register char *cp;
-	register struct syment *s;
+	unsigned n;
+	char *cp;
+	struct syment *s;
 	char buf[BUFSIZ];
 
 	if (debug)
Index: usr.bin/rdist/main.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/main.c,v
retrieving revision 1.4
diff -u -r1.4 main.c
--- usr.bin/rdist/main.c	24 Jul 2004 19:45:10 -0000	1.4
+++ usr.bin/rdist/main.c	24 Aug 2008 09:52:29 -0000
@@ -75,7 +75,7 @@
 int
 main(int argc, char **argv)
 {
-	register char *arg;
+	char *arg;
 	int cmdargs;
 	char *dhosts[NHOSTS], **hp = dhosts;
 
@@ -238,8 +238,8 @@
 static void
 docmdargs(int nargs, char **args)
 {
-	register struct namelist *nl, *prev;
-	register char *cp;
+	struct namelist *nl, *prev;
+	char *cp;
 	struct namelist *files, *hosts;
 	struct subcmd *cmds;
 	char *dest;
@@ -292,7 +292,7 @@
  * Print a list of NAME blocks (mostly for debugging).
  */
 void
-prnames(register struct namelist *nl)
+prnames(struct namelist *nl)
 {
 	printf("( ");
 	while (nl != NULL) {
Index: usr.bin/rdist/server.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rdist/server.c,v
retrieving revision 1.6
diff -u -r1.6 server.c
--- usr.bin/rdist/server.c	3 Aug 2006 16:40:48 -0000	1.6
+++ usr.bin/rdist/server.c	24 Aug 2008 18:27:11 -0000
@@ -82,10 +82,10 @@
  *	Qname	- Query if file exists. Return mtime & size if it does.
  */
 void
-server()
+server(void)
 {
 	char cmdbuf[BUFSIZ];
-	register char *cp;
+	char *cp;
 
 	signal(SIGHUP, cleanup);
 	signal(SIGINT, cleanup);
@@ -346,7 +346,7 @@
 static void
 sendf(char *rname, int opts)
 {
-	register struct subcmd *sc;
+	struct subcmd *sc;
 	struct stat stb;
 	int sizerr, f, u, len;
 	off_t i;
@@ -580,9 +580,9 @@
 static int
 update(char *rname, int opts, struct stat *stp)
 {
-	register char *cp, *s;
-	register off_t size;
-	register time_t mtime;
+	char *cp, *s;
+	off_t size;
+	time_t mtime;
 
 	if (debug)
 		printf("update(%s, %x, %p)\n", rname, opts, stp);
@@ -714,7 +714,7 @@
 static void
 recvf(char *cmd, int type)
 {
-	register char *cp;
+	char *cp;
 	int f, mode, opts, wrerr, olderrno;
 	off_t i, size;
 	time_t mtime;
@@ -970,7 +970,7 @@
 static void
 hardlink(char *cmd)
 {
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	char *oldname;
 	int opts, exists;
@@ -1028,7 +1028,7 @@
 static int
 chkparent(char *name)
 {
-	register char *cp;
+	char *cp;
 	struct stat stb;
 
 	cp = rindex(name, '/');
@@ -1055,7 +1055,7 @@
 static int
 fchog(int fd, char *file, char *owner, char *group, int mode)
 {
-	register int i;
+	int i;
 	int uid, gid;
 	extern char user[];
 	extern int userid;
@@ -1116,7 +1116,7 @@
 static void
 rmchk(int opts)
 {
-	register char *cp, *s;
+	char *cp, *s;
 	struct stat stb;
 
 	if (debug)
@@ -1195,10 +1195,10 @@
  * for extraneous files and remove them.
  */
 static void
-clean(register char *cp)
+clean(char *cp)
 {
 	DIR *d;
-	register struct dirent *dp;
+	struct dirent *dp;
 	struct stat stb;
 	char *otp;
 	int len, opts;
@@ -1271,7 +1271,7 @@
 {
 	DIR *d;
 	struct dirent *dp;
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	char *otp;
 	int len;
@@ -1338,7 +1338,7 @@
 dospecial(char *cmd)
 {
 	int fd[2], status, pid, i;
-	register char *cp, *s;
+	char *cp, *s;
 	char sbuf[BUFSIZ];
 	extern int userid, groupid;
 
Index: usr.bin/renice/renice.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/renice/renice.c,v
retrieving revision 1.4
diff -u -r1.4 renice.c
--- usr.bin/renice/renice.c	10 Feb 2005 21:06:36 -0000	1.4
+++ usr.bin/renice/renice.c	24 Aug 2008 18:27:25 -0000
@@ -166,7 +166,7 @@
 }
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "%s\n%s\n",
 "usage: renice [priority | [-n incr]] [[-p] pid ...] [[-g] pgrp ...]",
Index: usr.bin/rev/rev.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rev/rev.c,v
retrieving revision 1.7
diff -u -r1.7 rev.c
--- usr.bin/rev/rev.c	30 Jul 2006 06:49:39 -0000	1.7
+++ usr.bin/rev/rev.c	24 Aug 2008 18:27:44 -0000
@@ -80,7 +80,7 @@
 }
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "usage: rev [file ...]\n");
 	exit(1);
Index: usr.bin/rpcgen/rpc_cout.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rpcgen/rpc_cout.c,v
retrieving revision 1.4
diff -u -r1.4 rpc_cout.c
--- usr.bin/rpcgen/rpc_cout.c	19 Jun 2004 16:40:36 -0000	1.4
+++ usr.bin/rpcgen/rpc_cout.c	24 Aug 2008 18:28:21 -0000
@@ -531,8 +531,7 @@
 }
 
 static void
-emit_struct(def)
-	definition *def;
+emit_struct(definition *def)
 {
 	decl_list *dl;
 	int j, size, flag;
Index: usr.bin/rpcgen/rpc_main.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rpcgen/rpc_main.c,v
retrieving revision 1.11
diff -u -r1.11 rpc_main.c
--- usr.bin/rpcgen/rpc_main.c	25 Aug 2007 08:55:26 -0000	1.11
+++ usr.bin/rpcgen/rpc_main.c	24 Aug 2008 18:43:54 -0000
@@ -352,9 +352,8 @@
 	NULL
 };
 
-static int check_nettype(name, list_to_check)
-char* name;
-char* list_to_check[];
+static int
+check_nettype(char *name, char *list_to_check[])
 {
 	int i;
 	for (i = 0; list_to_check[i] != NULL; i++) {
@@ -425,7 +424,8 @@
 	unsigned	len_res; \n\
 }; \n";
 
-char *generate_guard(char *pathname)
+char *
+generate_guard(char *pathname)
 {
 	char* filename, *guard, *tmp;
 
@@ -760,8 +760,8 @@
 }
 
 
-static void mkfile_output(cmd)
-struct commandline *cmd;
+static void
+mkfile_output(struct commandline *cmd)
 {
 	char *mkfilename, *clientname, *clntname, *xdrname, *hdrname;
 	char *servername, *svcname, *servprogname, *clntprogname;
@@ -898,9 +898,7 @@
 }
 
 static void
-putarg(where, cp)
-	char *cp;
-	int where;
+putarg(int where, char *cp)
 {
 	if (where >= ARGLISTLEN) {
 		warnx("arglist coding error");
Index: usr.bin/rpcgen/rpc_scan.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rpcgen/rpc_scan.c,v
retrieving revision 1.4
diff -u -r1.4 rpc_scan.c
--- usr.bin/rpcgen/rpc_scan.c	19 Jun 2004 16:40:36 -0000	1.4
+++ usr.bin/rpcgen/rpc_scan.c	24 Aug 2008 18:30:55 -0000
@@ -353,9 +353,7 @@
 }
 
 static void
-findconst(str, val)
-	char **str;
-	char **val;
+findconst(char **str, char **val)
 {
 	char *p;
 	int size;
Index: usr.bin/rpcgen/rpc_svcout.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rpcgen/rpc_svcout.c,v
retrieving revision 1.4
diff -u -r1.4 rpc_svcout.c
--- usr.bin/rpcgen/rpc_svcout.c	19 Jun 2004 16:40:36 -0000	1.4
+++ usr.bin/rpcgen/rpc_svcout.c	24 Aug 2008 18:31:11 -0000
@@ -645,8 +645,7 @@
 }
 
 static void
-print_return(space)
-	char *space;
+print_return(char *space)
 {
 	if (exitnow)
 		f_print(fout, "%sexit(0);\n", space);
Index: usr.bin/rpcinfo/rpcinfo.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rpcinfo/rpcinfo.c,v
retrieving revision 1.3
diff -u -r1.3 rpcinfo.c
--- usr.bin/rpcinfo/rpcinfo.c	25 Nov 2007 01:28:23 -0000	1.3
+++ usr.bin/rpcinfo/rpcinfo.c	24 Aug 2008 09:53:40 -0000
@@ -88,7 +88,7 @@
 	int argc;
 	char **argv;
 {
-	register int c;
+	int c;
 	int errflg;
 	int function;
 	u_short portnum;
@@ -452,7 +452,7 @@
  */
 static int
 pstatus(client, prognum, vers)
-	register CLIENT *client;
+	CLIENT *client;
 	u_long prognum;
 	u_long vers;
 {
@@ -477,11 +477,11 @@
 	char **argv;
 {
 	struct sockaddr_in server_addr;
-	register struct hostent *hp;
+	struct hostent *hp;
 	struct pmaplist *head = NULL;
 	int socket = RPC_ANYSOCK;
 	struct timeval minutetimeout;
-	register CLIENT *client;
+	CLIENT *client;
 	struct rpcent *rpc;
 
 	if (argc > 1) {
@@ -549,7 +549,7 @@
 	void *res;		/* Nothing comes back */
 	struct sockaddr_in *who; /* Who sent us the reply */
 {
-	register struct hostent *hp;
+	struct hostent *hp;
 
 	hp = gethostbyaddr((char *) &who->sin_addr, sizeof who->sin_addr,
 	    AF_INET);
@@ -616,8 +616,8 @@
 getprognum(arg)
 	char *arg;
 {
-	register struct rpcent *rpc;
-	register u_long prognum;
+	struct rpcent *rpc;
+	u_long prognum;
 
 	if (isalpha(*arg)) {
 		rpc = getrpcbyname(arg);
@@ -635,7 +635,7 @@
 getvers(arg)
 	char *arg;
 {
-	register u_long vers;
+	u_long vers;
 
 	vers = (int) atoi(arg);
 	return (vers);
@@ -646,7 +646,7 @@
 	struct sockaddr_in *addr;
 	char *host;
 {
-	register struct hostent *hp;
+	struct hostent *hp;
 
 	bzero((char *)addr, sizeof *addr);
 	addr->sin_addr.s_addr = (u_long) inet_addr(host);
Index: usr.bin/rwho/rwho.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/rwho/rwho.c,v
retrieving revision 1.4
diff -u -r1.4 rwho.c
--- usr.bin/rwho/rwho.c	9 Jan 2005 16:20:54 -0000	1.4
+++ usr.bin/rwho/rwho.c	26 Aug 2008 19:58:30 -0000
@@ -184,7 +184,7 @@
 
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "usage: rwho [-a]\n");
 	exit(1);
Index: usr.bin/symorder/symorder.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/symorder/symorder.c,v
retrieving revision 1.3
diff -u -r1.3 symorder.c
--- usr.bin/symorder/symorder.c	4 Oct 2003 20:36:51 -0000	1.3
+++ usr.bin/symorder/symorder.c	24 Aug 2008 09:54:15 -0000
@@ -78,10 +78,10 @@
 int
 main(int argc, char **argv)
 {
-	register struct nlist *p, *symp;
-	register FILE *f, *xfile;
-	register int i;
-	register char *start, *t, *xfilename;
+	struct nlist *p, *symp;
+	FILE *f, *xfile;
+	int i;
+	char *start, *t, *xfilename;
 	int ch, n, o;
 
 	xfilename = NULL;
@@ -254,7 +254,7 @@
 }
 
 int
-savesymb(register struct nlist *s)
+savesymb(struct nlist *s)
 {
 	if ((s->n_type & N_EXT) != N_EXT)
 		return 0;
@@ -268,10 +268,10 @@
 }
 
 void
-reorder(register struct nlist *st1, register struct nlist *st2, int entries)
+reorder(struct nlist *st1, struct nlist *st2, int entries)
 {
-	register struct nlist *p;
-	register int i, n;
+	struct nlist *p;
+	int i, n;
 
 	for (p = st1, n = entries; --n >= 0; ++p)
 		if (inlist(p) != -1)
@@ -289,10 +289,10 @@
 }
 
 int
-inlist(register struct nlist *p)
+inlist(struct nlist *p)
 {
-	register char *nam;
-	register struct nlist *op;
+	char *nam;
+	struct nlist *op;
 
 	if (p->n_type & N_STAB || p->n_un.n_strx == 0)
 		return (-1);
@@ -309,10 +309,10 @@
 }
 
 int
-excluded(register struct nlist *p)
+excluded(struct nlist *p)
 {
-	register char *nam;
-	register int x;
+	char *nam;
+	int x;
 
 	if (p->n_type & N_STAB || p->n_un.n_strx == 0)
 		return (0);
Index: usr.bin/systat/cmds.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/cmds.c,v
retrieving revision 1.4
diff -u -r1.4 cmds.c
--- usr.bin/systat/cmds.c	4 Oct 2003 20:36:51 -0000	1.4
+++ usr.bin/systat/cmds.c	24 Aug 2008 09:54:47 -0000
@@ -46,8 +46,8 @@
 void
 command(char *cmd)
 {
-        register struct cmdtab *p;
-        register char *cp;
+        struct cmdtab *p;
+        char *cp;
 	int omask;
 	double interval;
 
@@ -142,11 +142,11 @@
 }
 
 struct cmdtab *
-lookup(register char *name)
+lookup(char *name)
 {
-	register char *p, *q;
-	register struct cmdtab *c, *found;
-	register int nmatches, longest;
+	char *p, *q;
+	struct cmdtab *c, *found;
+	int nmatches, longest;
 
 	longest = 0;
 	nmatches = 0;
@@ -178,7 +178,7 @@
 }
 
 int
-prefix(register char *s1, register char *s2)
+prefix(char *s1, char *s2)
 {
 
         while (*s1 == *s2) {
Index: usr.bin/systat/devs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/devs.c,v
retrieving revision 1.6
diff -u -r1.6 devs.c
--- usr.bin/systat/devs.c	22 Dec 2004 11:01:49 -0000	1.6
+++ usr.bin/systat/devs.c	24 Aug 2008 09:55:01 -0000
@@ -176,7 +176,7 @@
 			return(2);
 	}
 	if (prefix(cmd, "drives")) {
-		register int i;
+		int i;
 		move(CMDLINE, 0);
 		clrtoeol();
 		for (i = 0; i < num_devices; i++) {
@@ -195,7 +195,7 @@
 	char **tempstr;
 	char *tstr[100];
 	int num_args = 0;
-	register int i;
+	int i;
 	int retval = 0;
 
 	/*
@@ -251,8 +251,8 @@
 dsselect(char *args, devstat_select_mode select_mode, int maxshowdevs,
 	 struct statinfo *s1)
 {
-	register char *cp;
-	register int i;
+	char *cp;
+	int i;
 	int retval = 0;
 
 	/*
Index: usr.bin/systat/icmp6.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/icmp6.c,v
retrieving revision 1.2
diff -u -r1.2 icmp6.c
--- usr.bin/systat/icmp6.c	20 Apr 2008 13:44:26 -0000	1.2
+++ usr.bin/systat/icmp6.c	26 Aug 2008 19:57:23 -0000
@@ -88,8 +88,7 @@
 }
 
 void
-closeicmp6(w)
-	WINDOW *w;
+closeicmp6(WINDOW *w)
 {
 	if (w == NULL)
 		return;
Index: usr.bin/systat/iostat.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/iostat.c,v
retrieving revision 1.5
diff -u -r1.5 iostat.c
--- usr.bin/systat/iostat.c	13 Jan 2005 12:45:39 -0000	1.5
+++ usr.bin/systat/iostat.c	24 Aug 2008 09:55:24 -0000
@@ -251,8 +251,8 @@
 void
 showiostat(void)
 {
-	register long t;
-	register int i, row, col;
+	long t;
+	int i, row, col;
 	struct kinfo_cputime diff_cp_time;
 	uint64_t cp_total;
 
@@ -342,7 +342,7 @@
 static void
 stat1(int row, uint64_t difference, uint64_t total)
 {
-	register int i;
+	int i;
 	double time;
 
 	if (total > 0)
@@ -358,8 +358,8 @@
 histogram(long double val, int colwidth, double scale)
 {
 	char buf[10];
-	register int k;
-	register int v = (int)(val * scale) + 0.5;
+	int k;
+	int v = (int)(val * scale) + 0.5;
 
 	if (val <= 0)
 		v = 0;
Index: usr.bin/systat/ip6.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/ip6.c,v
retrieving revision 1.1
diff -u -r1.1 ip6.c
--- usr.bin/systat/ip6.c	31 May 2007 11:38:36 -0000	1.1
+++ usr.bin/systat/ip6.c	26 Aug 2008 19:57:47 -0000
@@ -92,8 +92,7 @@
 }
 
 void
-closeip6(w)
-	WINDOW *w;
+closeip6(WINDOW *w)
 {
 	if (w == NULL)
 		return;
Index: usr.bin/systat/main.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/main.c,v
retrieving revision 1.5
diff -u -r1.5 main.c
--- usr.bin/systat/main.c	8 Nov 2003 09:30:32 -0000	1.5
+++ usr.bin/systat/main.c	24 Aug 2008 09:55:34 -0000
@@ -172,7 +172,7 @@
 void
 display(int signo)
 {
-	register int i, j;
+	int i, j;
 	struct itimerval ctv;
 
 	/* Get the load average over the last minute. */
Index: usr.bin/systat/mbufs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/mbufs.c,v
retrieving revision 1.6
diff -u -r1.6 mbufs.c
--- usr.bin/systat/mbufs.c	21 May 2006 03:43:47 -0000	1.6
+++ usr.bin/systat/mbufs.c	24 Aug 2008 09:55:43 -0000
@@ -92,7 +92,7 @@
 void
 showmbufs(void)
 {
-	register int i, j, max, index;
+	int i, j, max, index;
 	char buf[10];
 	char *mtname;
 
Index: usr.bin/systat/netcmds.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/netcmds.c,v
retrieving revision 1.5
diff -u -r1.5 netcmds.c
--- usr.bin/systat/netcmds.c	3 Sep 2004 20:38:01 -0000	1.5
+++ usr.bin/systat/netcmds.c	24 Aug 2008 09:55:59 -0000
@@ -124,7 +124,7 @@
 static void
 changeitems(char *args, int onoff)
 {
-	register char *cp;
+	char *cp;
 	struct servent *sp;
 	struct hostent *hp;
 	struct in_addr in;
@@ -197,7 +197,7 @@
 static int
 selectport(long port, int onoff)
 {
-	register struct pitem *p;
+	struct pitem *p;
 
 	if (port == -1) {
 		if (ports == 0)
@@ -222,9 +222,9 @@
 }
 
 int
-checkport(register struct inpcb *inp)
+checkport(struct inpcb *inp)
 {
-	register struct pitem *p;
+	struct pitem *p;
 
 	if (ports)
 	for (p = ports; p < ports+nports; p++)
@@ -236,7 +236,7 @@
 static void
 showports(void)
 {
-	register struct pitem *p;
+	struct pitem *p;
 	struct servent *sp;
 
 	for (p = ports; p < ports+nports; p++) {
@@ -254,7 +254,7 @@
 static int
 selecthost(struct in_addr *in, int onoff)
 {
-	register struct hitem *p;
+	struct hitem *p;
 
 	if (in == 0) {
 		if (hosts == 0)
@@ -279,9 +279,9 @@
 }
 
 int
-checkhost(register struct inpcb *inp)
+checkhost(struct inpcb *inp)
 {
-	register struct hitem *p;
+	struct hitem *p;
 
 	if (hosts)
 	for (p = hosts; p < hosts+nhosts; p++)
@@ -294,7 +294,7 @@
 static void
 showhosts(void)
 {
-	register struct hitem *p;
+	struct hitem *p;
 	struct hostent *hp;
 
 	for (p = hosts; p < hosts+nhosts; p++) {
Index: usr.bin/systat/netstat.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/netstat.c,v
retrieving revision 1.9
diff -u -r1.9 netstat.c
--- usr.bin/systat/netstat.c	31 May 2007 11:38:36 -0000	1.9
+++ usr.bin/systat/netstat.c	24 Aug 2008 09:56:15 -0000
@@ -121,7 +121,7 @@
 void
 closenetstat(WINDOW *w)
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	endhostent();
 	endnetent();
@@ -224,7 +224,7 @@
 void
 fetchnetstat(void)
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	for (p = netcb.ni_forw; p != (struct netinfo *)&netcb; p = p->ni_forw)
 		p->ni_seen = 0;
@@ -237,7 +237,7 @@
 static void
 enter(struct inpcb *inp, struct xsocket *so, int state, const char *proto)
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	if (!aflag && inet_lnaof(inp->inp_laddr) == INADDR_ANY)
 		return;
@@ -316,7 +316,7 @@
 void
 shownetstat(void)
 {
-	register struct netinfo *p, *q;
+	struct netinfo *p, *q;
 
 	/*
 	 * First, delete any connections that have gone
@@ -390,7 +390,7 @@
  * If the nflag was specified, use numbers instead of names.
  */
 static void
-inetprint(register struct in_addr *in, int port, const char *proto)
+inetprint(struct in_addr *in, int port, const char *proto)
 {
 	struct servent *sp = 0;
 	char line[80], *cp;
@@ -457,7 +457,7 @@
 int
 cmdnetstat(char *cmd, char *args)
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	if (prefix(cmd, "all")) {
 		aflag = !aflag;
Index: usr.bin/systat/pigs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/pigs.c,v
retrieving revision 1.14
diff -u -r1.14 pigs.c
--- usr.bin/systat/pigs.c	16 Feb 2007 23:11:40 -0000	1.14
+++ usr.bin/systat/pigs.c	24 Aug 2008 09:56:25 -0000
@@ -87,7 +87,7 @@
 void
 showpigs(void)
 {
-	register int i, j, y, k;
+	int i, j, y, k;
 	float total;
 	int factor;
 	char *uname, *pname, pidname[30];
Index: usr.bin/systat/swap.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/swap.c,v
retrieving revision 1.3
diff -u -r1.3 swap.c
--- usr.bin/systat/swap.c	4 Oct 2003 20:36:51 -0000	1.3
+++ usr.bin/systat/swap.c	26 Aug 2008 19:57:58 -0000
@@ -118,7 +118,7 @@
 }
 
 void
-labelswap()
+labelswap(void)
 {
 	char *header, *p;
 	int row, i;
Index: usr.bin/systat/vmstat.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.10
diff -u -r1.10 vmstat.c
--- usr.bin/systat/vmstat.c	28 Jun 2008 23:45:20 -0000	1.10
+++ usr.bin/systat/vmstat.c	24 Aug 2008 09:56:39 -0000
@@ -273,7 +273,7 @@
 void
 labelkre(void)
 {
-	register int i, j;
+	int i, j;
 
 	clear();
 	mvprintw(STATROW, STATCOL + 4, "users    Load");
@@ -646,7 +646,7 @@
 static int
 ucount(void)
 {
-	register int nusers = 0;
+	int nusers = 0;
 
 	if (ut < 0)
 		return (0);
@@ -810,7 +810,7 @@
 }
 
 static void
-copyinfo(register struct Info *from, register struct Info *to)
+copyinfo(struct Info *from, struct Info *to)
 {
 	long *intrcnt;
 
Index: usr.bin/talk/get_names.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/talk/get_names.c,v
retrieving revision 1.4
diff -u -r1.4 get_names.c
--- usr.bin/talk/get_names.c	30 Aug 2004 18:06:50 -0000	1.4
+++ usr.bin/talk/get_names.c	24 Aug 2008 09:56:55 -0000
@@ -61,7 +61,7 @@
 	char *his_name, *my_name;
 	char *my_machine_name, *his_machine_name;
 	char *my_tty, *his_tty;
-	register char *cp;
+	char *cp;
 
 	if (argc < 2 )
 		usage();
Index: usr.bin/talk/look_up.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/talk/look_up.c,v
retrieving revision 1.4
diff -u -r1.4 look_up.c
--- usr.bin/talk/look_up.c	19 Aug 2004 23:32:02 -0000	1.4
+++ usr.bin/talk/look_up.c	24 Aug 2008 09:57:04 -0000
@@ -49,7 +49,7 @@
 check_local(void)
 {
 	CTL_RESPONSE response;
-	register CTL_RESPONSE *rp = &response;
+	CTL_RESPONSE *rp = &response;
 
 	/* the rest of msg was set up in get_names */
 #ifdef MSG_EOR
Index: usr.bin/tcopy/tcopy.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tcopy/tcopy.c,v
retrieving revision 1.3
diff -u -r1.3 tcopy.c
--- usr.bin/tcopy/tcopy.c	4 Oct 2003 20:36:52 -0000	1.3
+++ usr.bin/tcopy/tcopy.c	24 Aug 2008 09:57:20 -0000
@@ -69,7 +69,7 @@
 int
 main(int argc, char **argv)
 {
-	register int lastnread, nread, nw, inp, outp;
+	int lastnread, nread, nw, inp, outp;
 	enum {READ, VERIFY, COPY, COPYVERIFY} op = READ;
 	sig_t oldsig;
 	int ch, needeof;
@@ -215,10 +215,10 @@
 }
 
 void
-verify(register int inp, register int outp, register char *outb)
+verify(int inp, int outp, char *outb)
 {
-	register int eot, inmaxblk, inn, outmaxblk, outn;
-	register char *inb;
+	int eot, inmaxblk, inn, outmaxblk, outn;
+	char *inb;
 
 	inb = getspace(maxblk);
 	inmaxblk = outmaxblk = maxblk;
Index: usr.bin/telnet/externs.h
===================================================================
RCS file: /home/dcvs/src/usr.bin/telnet/externs.h,v
retrieving revision 1.2
diff -u -r1.2 externs.h
--- usr.bin/telnet/externs.h	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/telnet/externs.h	28 Aug 2008 17:04:21 -0000
@@ -93,14 +93,6 @@
 
 #define	SUBBUFSIZE	256
 
-#if	!defined(P)
-# ifdef	__STDC__
-#  define	P(x)	x
-# else
-#  define	P(x)	()
-# endif
-#endif
-
 extern int
     autologin,		/* Autologin enabled */
     skiprc,		/* Don't process the ~/.telnetrc file */
Index: usr.bin/telnet/ring.h
===================================================================
RCS file: /home/dcvs/src/usr.bin/telnet/ring.h,v
retrieving revision 1.2
diff -u -r1.2 ring.h
--- usr.bin/telnet/ring.h	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/telnet/ring.h	28 Aug 2008 17:04:32 -0000
@@ -35,16 +35,6 @@
  * $DragonFly: src/usr.bin/telnet/ring.h,v 1.2 2003/06/17 04:29:32 dillon Exp $
  */
 
-#if defined(P)
-# undef P
-#endif
-
-#if defined(__STDC__) || defined(LINT_ARGS)
-# define	P(x)	x
-#else
-# define	P(x)	()
-#endif
-
 /*
  * This defines a structure for a ring buffer.
  *
Index: usr.bin/tftp/main.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tftp/main.c,v
retrieving revision 1.5
diff -u -r1.5 main.c
--- usr.bin/tftp/main.c	30 Aug 2004 18:06:50 -0000	1.5
+++ usr.bin/tftp/main.c	24 Aug 2008 09:58:23 -0000
@@ -266,7 +266,7 @@
 void
 modecmd(int argc, char **argv)
 {
-	register struct modes *p;
+	struct modes *p;
 	char *sep;
 
 	if (argc < 2) {
@@ -326,8 +326,8 @@
 put(int argc, char **argv)
 {
 	int fd;
-	register int n;
-	register char *cp, *targ;
+	int n;
+	char *cp, *targ;
 
 	if (argc < 2) {
 		strcpy(line, "send ");
@@ -408,8 +408,8 @@
 get(int argc, char **argv)
 {
 	int fd;
-	register int n;
-	register char *cp;
+	int n;
+	char *cp;
 	char *src;
 
 	if (argc < 2) {
@@ -557,7 +557,7 @@
 char *
 tail(char *filename)
 {
-	register char *s;
+	char *s;
 
 	while (*filename) {
 		s = strrchr(filename, '/');
@@ -576,7 +576,7 @@
 static void
 command(void)
 {
-	register struct cmd *c;
+	struct cmd *c;
 	char *cp;
 
 	for (;;) {
@@ -609,11 +609,11 @@
 }
 
 struct cmd *
-getcmd(register char *name)
+getcmd(char *name)
 {
-	register char *p, *q;
-	register struct cmd *c, *found;
-	register int nmatches, longest;
+	char *p, *q;
+	struct cmd *c, *found;
+	int nmatches, longest;
 
 	longest = 0;
 	nmatches = 0;
@@ -642,8 +642,8 @@
 static void
 makeargv(void)
 {
-	register char *cp;
-	register char **argp = margv;
+	char *cp;
+	char **argp = margv;
 
 	margc = 0;
 	if ((cp = strchr(line, '\n')))
@@ -677,7 +677,7 @@
 void
 help(int argc, char **argv)
 {
-	register struct cmd *c;
+	struct cmd *c;
 
 	if (argc == 1) {
 		printf("Commands may be abbreviated.  Commands are:\n\n");
@@ -686,7 +686,7 @@
 		return;
 	}
 	while (--argc > 0) {
-		register char *arg;
+		char *arg;
 		arg = *++argv;
 		c = getcmd(arg);
 		if (c == (struct cmd *)-1)
Index: usr.bin/tftp/tftp.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tftp/tftp.c,v
retrieving revision 1.5
diff -u -r1.5 tftp.c
--- usr.bin/tftp/tftp.c	3 Sep 2004 20:38:01 -0000	1.5
+++ usr.bin/tftp/tftp.c	24 Aug 2008 09:57:59 -0000
@@ -89,9 +89,9 @@
 void
 xmitfile(int fd, char *name, char *mode)
 {
-	register struct tftphdr *ap;	   /* data and ack packets */
+	struct tftphdr *ap;	   	/* data and ack packets */
 	struct tftphdr *r_init(), *dp;
-	register int n;
+	int n;
 	volatile unsigned short block;
 	volatile int size, convert;
 	volatile unsigned long amount;
@@ -204,9 +204,9 @@
 void
 recvfile(int fd, char *name, char *mode)
 {
-	register struct tftphdr *ap;
+	struct tftphdr *ap;
 	struct tftphdr *dp, *w_init();
-	register int n;
+	int n;
 	volatile unsigned short block;
 	volatile int size, firsttrip;
 	volatile unsigned long amount;
@@ -323,7 +323,7 @@
 static int
 makerequest(int request, const char *name, struct tftphdr *tp, const char *mode)
 {
-	register char *cp;
+	char *cp;
 
 	tp->th_opcode = htons((u_short)request);
 	cp = tp->th_stuff;
@@ -360,8 +360,8 @@
 static void
 nak(int error, struct sockaddr *peer)
 {
-	register struct errmsg *pe;
-	register struct tftphdr *tp;
+	struct errmsg *pe;
+	struct tftphdr *tp;
 	int length;
 	char *strerror();
 
@@ -388,7 +388,7 @@
 {
 	static char *opcodes[] =
 	   { "#0", "RRQ", "WRQ", "DATA", "ACK", "ERROR" };
-	register char *cp, *file;
+	char *cp, *file;
 	u_short op = ntohs(tp->th_opcode);
 
 	if (op < RRQ || op > ERROR)
Index: usr.bin/tftp/tftpsubs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tftp/tftpsubs.c,v
retrieving revision 1.3
diff -u -r1.3 tftpsubs.c
--- usr.bin/tftp/tftpsubs.c	4 Oct 2003 20:36:52 -0000	1.3
+++ usr.bin/tftp/tftpsubs.c	26 Aug 2008 19:58:16 -0000
@@ -78,8 +78,8 @@
 
 static struct tftphdr *rw_init();
 
-struct tftphdr *w_init() { return rw_init(0); }         /* write-behind */
-struct tftphdr *r_init() { return rw_init(1); }         /* read-ahead */
+struct tftphdr *w_init(void) { return rw_init(0); }         /* write-behind */
+struct tftphdr *r_init(void) { return rw_init(1); }         /* read-ahead */
 
 static struct tftphdr *
 rw_init(int x		/* zero for write-behind, one for read-head */
@@ -124,9 +124,9 @@
 void
 read_ahead(FILE *file, int convert)
 {
-	register int i;
-	register char *p;
-	register int c;
+	int i;
+	char *p;
+	int c;
 	struct bf *b;
 	struct tftphdr *dp;
 
@@ -191,9 +191,9 @@
 {
 	char *buf;
 	int count;
-	register int ct;
-	register char *p;
-	register int c;                 /* current character */
+	int ct;
+	char *p;
+	int c;                          /* current character */
 	struct bf *b;
 	struct tftphdr *dp;
 
Index: usr.bin/tip/libacu/acucommon.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/acucommon.c,v
retrieving revision 1.2
diff -u -r1.2 acucommon.c
--- usr.bin/tip/libacu/acucommon.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/libacu/acucommon.c	24 Aug 2008 09:59:13 -0000
@@ -83,7 +83,7 @@
 {
 				int omask;
         struct itimerval itv, oitv;
-        register struct itimerval *itp = &itv;
+        struct itimerval *itp = &itv;
         struct sigvec vec, ovec;
 
         timerclear(&itp->it_interval);
Index: usr.bin/tip/libacu/biz22.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/biz22.c,v
retrieving revision 1.3
diff -u -r1.3 biz22.c
--- usr.bin/tip/libacu/biz22.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/biz22.c	24 Aug 2008 09:59:27 -0000
@@ -54,7 +54,7 @@
 biz_dialer(num, mod)
 	char *num, *mod;
 {
-	register int connected = 0;
+	int connected = 0;
 	char cbuf[40];
 
 	if (boolean(value(VERBOSE)))
@@ -142,7 +142,7 @@
 
 static int
 cmd(s)
-	register char *s;
+	char *s;
 {
 	sig_t f;
 	char c;
@@ -164,7 +164,7 @@
 
 static int
 detect(s)
-	register char *s;
+	char *s;
 {
 	sig_t f;
 	char c;
Index: usr.bin/tip/libacu/biz31.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/biz31.c,v
retrieving revision 1.2
diff -u -r1.2 biz31.c
--- usr.bin/tip/libacu/biz31.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/libacu/biz31.c	24 Aug 2008 09:59:42 -0000
@@ -52,7 +52,7 @@
 biz_dialer(num, mod)
 	char *num, *mod;
 {
-	register int connected = 0;
+	int connected = 0;
 
 	if (!bizsync(FD)) {
 		logent(value(HOST), "", "biz", "out of sync");
@@ -128,7 +128,7 @@
 
 static int
 echo(s)
-	register char *s;
+	char *s;
 {
 	char c;
 
@@ -160,7 +160,7 @@
 
 static int
 detect(s)
-	register char *s;
+	char *s;
 {
 	sig_t f;
 	char c;
@@ -185,7 +185,7 @@
 
 static int
 flush(s)
-	register char *s;
+	char *s;
 {
 	sig_t f;
 	char c;
@@ -220,7 +220,7 @@
 #	define chars(b)	(b)
 #	define IOCTL	FIONREAD
 #endif
-	register int already = 0;
+	int already = 0;
 	char buf[10];
 
 retry:
Index: usr.bin/tip/libacu/courier.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/courier.c,v
retrieving revision 1.3
diff -u -r1.3 courier.c
--- usr.bin/tip/libacu/courier.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/courier.c	24 Aug 2008 09:59:56 -0000
@@ -54,10 +54,10 @@
 static	int coursync();
 
 cour_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
-	register char *cp;
+	char *cp;
 #if ACULOG
 	char line[80];
 #endif
@@ -134,7 +134,7 @@
 
 static int
 cour_swallow(match)
-  register char *match;
+  char *match;
   {
 	sig_t f;
 	char c;
Index: usr.bin/tip/libacu/df.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/df.c,v
retrieving revision 1.2
diff -u -r1.2 df.c
--- usr.bin/tip/libacu/df.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/libacu/df.c	24 Aug 2008 10:00:09 -0000
@@ -61,7 +61,7 @@
 	char *num, *acu;
 	int df03;
 {
-	register int f = FD;
+	int f = FD;
 	int speed = 0, rw = 2;
 	char c = '\0';
 
Index: usr.bin/tip/libacu/dn11.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/dn11.c,v
retrieving revision 1.2
diff -u -r1.2 dn11.c
--- usr.bin/tip/libacu/dn11.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/libacu/dn11.c	24 Aug 2008 10:00:16 -0000
@@ -53,7 +53,7 @@
 {
 	char *p, *q, phone[40];
 	int lt, nw, connected = 1;
-	register int timelim;
+	int timelim;
 
 	if (boolean(value(VERBOSE)))
 		printf("\nstarting call...");
Index: usr.bin/tip/libacu/hayes.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/hayes.c,v
retrieving revision 1.2
diff -u -r1.2 hayes.c
--- usr.bin/tip/libacu/hayes.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/libacu/hayes.c	24 Aug 2008 10:00:27 -0000
@@ -75,11 +75,11 @@
 static	int state = IDLE;
 
 hay_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
-	register char *cp;
-	register int connected = 0;
+	char *cp;
+	int connected = 0;
 	char dummy;
 #if ACULOG
 	char line[80];
@@ -160,7 +160,7 @@
 
 static char
 gobble(match)
-	register char *match;
+	char *match;
 {
 	char c;
 	sig_t f;
@@ -195,7 +195,7 @@
 }
 
 error_rep(c)
-	register char c;
+	char c;
 {
 	printf("\n\r");
 	switch (c) {
Index: usr.bin/tip/libacu/multitech.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/multitech.c,v
retrieving revision 1.3
diff -u -r1.3 multitech.c
--- usr.bin/tip/libacu/multitech.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/multitech.c	24 Aug 2008 10:00:39 -0000
@@ -70,7 +70,7 @@
 void acu_nap (unsigned int how_long);
 static void sigALRM ();
 static int multitechsync ();
-static int multitech_swallow (register char *match);
+static int multitech_swallow (char *match);
 static int multitech_connect(void);
 
 /*
@@ -80,9 +80,9 @@
 static int connected = 0;
 static jmp_buf timeoutbuf, intbuf;
 
-int multitech_dialer (register char *num, char *acu)
+int multitech_dialer (char *num, char *acu)
 {
-	register char *cp;
+	char *cp;
 #if ACULOG
 	char line [80];
 #endif
@@ -200,7 +200,7 @@
 	longjmp(timeoutbuf, 1);
 }
 
-static int multitech_swallow (register char *match)
+static int multitech_swallow (char *match)
   {
 	sig_t f;
 	char c;
Index: usr.bin/tip/libacu/t3000.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/t3000.c,v
retrieving revision 1.3
diff -u -r1.3 t3000.c
--- usr.bin/tip/libacu/t3000.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/t3000.c	24 Aug 2008 10:00:52 -0000
@@ -54,10 +54,10 @@
 static	int t3000_swallow(char *);
 
 t3000_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
-	register char *cp;
+	char *cp;
 #if ACULOG
 	char line[80];
 #endif
@@ -133,7 +133,7 @@
 
 static int
 t3000_swallow(match)
-  register char *match;
+  char *match;
   {
 	sig_t f;
 	char c;
Index: usr.bin/tip/libacu/unidialer.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/unidialer.c,v
retrieving revision 1.4
diff -u -r1.4 unidialer.c
--- usr.bin/tip/libacu/unidialer.c	7 May 2005 23:20:43 -0000	1.4
+++ usr.bin/tip/libacu/unidialer.c	24 Aug 2008 10:01:03 -0000
@@ -91,7 +91,7 @@
 static unsigned int escape_guard_time;
 static unsigned int reset_delay;
 
-static int unidialer_dialer (register char *num, char *acu);
+static int unidialer_dialer (char *num, char *acu);
 static void unidialer_disconnect ();
 static void unidialer_abort ();
 static int unidialer_connect(void);
@@ -134,7 +134,7 @@
 static void unidialer_disconnect ();
 static void sigALRM ();
 static int unidialersync ();
-static int unidialer_swallow (register char *match);
+static int unidialer_swallow (char *match);
 
 /*
 	Global vars
@@ -404,9 +404,9 @@
 	return okay;
 }
 
-static int unidialer_dialer (register char *num, char *acu)
+static int unidialer_dialer (char *num, char *acu)
 {
-	register char *cp;
+	char *cp;
 	char dial_string [80];
 #if ACULOG
 	char line [80];
@@ -561,7 +561,7 @@
 	longjmp(timeoutbuf, 1);
 }
 
-static int unidialer_swallow (register char *match)
+static int unidialer_swallow (char *match)
 {
 	sig_t f;
 	char c;
Index: usr.bin/tip/libacu/v3451.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/v3451.c,v
retrieving revision 1.3
diff -u -r1.3 v3451.c
--- usr.bin/tip/libacu/v3451.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/v3451.c	24 Aug 2008 10:01:17 -0000
@@ -49,7 +49,7 @@
 static	jmp_buf Sjbuf;
 
 v3451_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
 	sig_t func;
@@ -138,7 +138,7 @@
 
 static void
 vawrite(cp, delay)
-	register char *cp;
+	char *cp;
 	int delay;
 {
 
@@ -148,10 +148,10 @@
 
 static
 expect(cp)
-	register char *cp;
+	char *cp;
 {
 	char buf[300];
-	register char *rp = buf;
+	char *rp = buf;
 	int timeout = 30, online = 0;
 
 	if (strcmp(cp, "\"\"") == 0)
@@ -203,9 +203,9 @@
 
 static
 prefix(s1, s2)
-	register char *s1, *s2;
+	char *s1, *s2;
 {
-	register char c;
+	char c;
 
 	while ((c = *s1++) == *s2++)
 		if (c == '\0')
Index: usr.bin/tip/libacu/v831.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/v831.c,v
retrieving revision 1.3
diff -u -r1.3 v831.c
--- usr.bin/tip/libacu/v831.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/v831.c	24 Aug 2008 10:01:31 -0000
@@ -55,7 +55,7 @@
         char *num, *acu;
 {
         int status, pid, connected = 1;
-        register int timelim;
+        int timelim;
 
         if (boolean(value(VERBOSE)))
                 printf("\nstarting call...");
@@ -180,10 +180,10 @@
 
 static int
 dialit(phonenum, acu)
-	register char *phonenum;
+	char *phonenum;
 	char *acu;
 {
-        register struct vaconfig *vp;
+        struct vaconfig *vp;
         char c;
         int i, two = 2;
 
@@ -256,10 +256,10 @@
 
 static char *
 sanitize(s)
-	register char *s;
+	char *s;
 {
         static char buf[128];
-        register char *cp;
+        char *cp;
 
         for (cp = buf; *s; s++) {
 		if (!isdigit(*s) && *s == '<' && *s != '_')
Index: usr.bin/tip/libacu/ventel.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/libacu/ventel.c,v
retrieving revision 1.3
diff -u -r1.3 ventel.c
--- usr.bin/tip/libacu/ventel.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/tip/libacu/ventel.c	24 Aug 2008 10:01:46 -0000
@@ -59,15 +59,15 @@
  */
 #define delay(num,denom) busyloop(CPUSPEED*num/denom)
 #define CPUSPEED 1000000	/* VAX 780 is 1MIPS */
-#define	DELAY(n)	{ register long N = (n); while (--N > 0); }
+#define	DELAY(n)	{ long N = (n); while (--N > 0); }
 busyloop(n) { DELAY(n); }
 
 ven_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
-	register char *cp;
-	register int connected = 0;
+	char *cp;
+	int connected = 0;
 	char *msg, *index(), line[80];
 
 	/*
@@ -142,7 +142,7 @@
 
 static void
 echo(s)
-	register char *s;
+	char *s;
 {
 	char c;
 
@@ -174,10 +174,10 @@
 
 static int
 gobble(match, response)
-	register char match;
+	char match;
 	char response[];
 {
-	register char *cp = response;
+	char *cp = response;
 	sig_t f;
 	char c;
 
Index: usr.bin/tip/tip/acu.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/acu.c,v
retrieving revision 1.3
diff -u -r1.3 acu.c
--- usr.bin/tip/tip/acu.c	19 Apr 2005 05:32:02 -0000	1.3
+++ usr.bin/tip/tip/acu.c	24 Aug 2008 10:02:08 -0000
@@ -66,7 +66,7 @@
 char *
 connect()
 {
-	register char *cp = PN;
+	char *cp = PN;
 	char *phnum, string[256];
 	FILE *fd;
 	int tried = 0;
@@ -190,9 +190,9 @@
 
 static acu_t *
 acutype(s)
-	register char *s;
+	char *s;
 {
-	register acu_t *p;
+	acu_t *p;
 	extern acu_t acutable[];
 
 	for (p = acutable; p->acu_name != '\0'; p++)
Index: usr.bin/tip/tip/cmds.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/cmds.c,v
retrieving revision 1.5
diff -u -r1.5 cmds.c
--- usr.bin/tip/tip/cmds.c	19 Apr 2005 05:32:02 -0000	1.5
+++ usr.bin/tip/tip/cmds.c	24 Aug 2008 10:02:41 -0000
@@ -238,7 +238,7 @@
 		if (c == '\r')
 			continue;
 		if (c != *match && match > eofchars) {
-			register char *p = eofchars;
+			char *p = eofchars;
 			while (p < match) {
 				if (*p == '\n'&& v)
 					(void)printf("\r%d", ++ct);
@@ -270,9 +270,9 @@
 static void
 transfer(char *buf, int fd, char *eofchars)
 {
-	register int ct;
+	int ct;
 	char c;
-	register int cnt, eof, v;
+	int cnt, eof, v;
 	time_t start;
 	sig_t f;
 	char r;
@@ -366,7 +366,7 @@
 				;
 		}
 	} else {
-		register int f;
+		int f;
 
 		dup2(pdes[0], 0);
 		close(pdes[0]);
@@ -633,7 +633,7 @@
 		while ((p = wait(&status)) > 0 && p != cpid)
 			;
 	} else {
-		register int i;
+		int i;
 
 		dup2(FD, 1);
 		for (i = 3; i < 20; i++)
@@ -679,7 +679,7 @@
 		while ((p = wait(&status)) > 0 && p != cpid)
 			;
 	} else {
-		register int fd;
+		int fd;
 
 		dup2(FD, 0);
 		dup2(3, 1);
@@ -788,7 +788,7 @@
 chdirectory(void)
 {
 	char dirname[PATH_MAX];
-	register char *cp = dirname;
+	char *cp = dirname;
 
 	if (prompt("[cd] ", dirname, sizeof(dirname))) {
 		if (stoprompt)
@@ -842,7 +842,7 @@
 static void
 execute(char *s)
 {
-	register char *cp;
+	char *cp;
 
 	if ((cp = rindex(value(SHELL), '/')) == NULL)
 		cp = value(SHELL);
@@ -855,9 +855,9 @@
 static int
 args(char *buf, char **a, int num)
 {
-	register char *p = buf, *start;
-	register char **parg = a;
-	register int n = 0;
+	char *p = buf, *start;
+	char **parg = a;
+	int n = 0;
 
 	while (*p && n < num) {
 		while (*p && (*p == ' ' || *p == '\t'))
@@ -878,7 +878,7 @@
 static void
 prtime(char *s, time_t a)
 {
-	register i;
+	int i;
 	int nums[3];
 
 	for (i = 0; i < 3; i++) {
@@ -1005,8 +1005,8 @@
 {
 	static char xname[BUFSIZ];
 	char cmdbuf[BUFSIZ];
-	register int pid, l;
-	register char *cp, *Shell;
+	int pid, l;
+	char *cp, *Shell;
 	int s, pivec[2] /*, (*sigint)()*/;
 
 	if (!anyof(name, "~{[*?$`'\"\\"))
@@ -1071,9 +1071,9 @@
  */
 
 static int
-anyof(register char *s1, register char *s2)
+anyof(char *s1, char *s2)
 {
-	register int c;
+	int c;
 
 	while ((c = *s1++))
 		if (any(c, s2))
Index: usr.bin/tip/tip/cu.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/cu.c,v
retrieving revision 1.3
diff -u -r1.3 cu.c
--- usr.bin/tip/tip/cu.c	19 Apr 2005 05:32:02 -0000	1.3
+++ usr.bin/tip/tip/cu.c	24 Aug 2008 10:02:50 -0000
@@ -48,7 +48,7 @@
 cumain(argc, argv)
 	char *argv[];
 {
-	register int i;
+	int i;
 	static char sbuf[12];
 
 	if (argc < 2) {
Index: usr.bin/tip/tip/hunt.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/hunt.c,v
retrieving revision 1.3
diff -u -r1.3 hunt.c
--- usr.bin/tip/tip/hunt.c	26 Oct 2004 22:10:13 -0000	1.3
+++ usr.bin/tip/tip/hunt.c	24 Aug 2008 10:02:58 -0000
@@ -58,7 +58,7 @@
 hunt(name)
 	char *name;
 {
-	register char *cp;
+	char *cp;
 	sig_t f;
 	int res;
 
Index: usr.bin/tip/tip/remcap.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/remcap.c,v
retrieving revision 1.2
diff -u -r1.2 remcap.c
--- usr.bin/tip/tip/remcap.c	17 Jun 2003 04:29:32 -0000	1.2
+++ usr.bin/tip/tip/remcap.c	24 Aug 2008 10:03:24 -0000
@@ -123,8 +123,8 @@
 getent(bp, name, cp)
 	char *bp, *name, *cp;
 {
-	register int c;
-	register int i = 0, cnt = 0;
+	int c;
+	int i = 0, cnt = 0;
 	char ibuf[BUFSIZ], *cp2;
 	int tf;
 
@@ -198,7 +198,7 @@
  */
 tnchktc()
 {
-	register char *p, *q;
+	char *p, *q;
 	char tcname[16];	/* name of similar terminal */
 	char tcbuf[BUFSIZ];
 	char *holdtbuf = tbuf;
@@ -251,7 +251,7 @@
 tnamatch(np)
 	char *np;
 {
-	register char *Np, *Bp;
+	char *Np, *Bp;
 
 	Bp = tbuf;
 	if (*Bp == '#')
@@ -276,7 +276,7 @@
  */
 static char *
 tskip(bp)
-	register char *bp;
+	char *bp;
 {
 
 	while (*bp && *bp != ':')
@@ -297,8 +297,8 @@
 tgetnum(id)
 	char *id;
 {
-	register int i, base;
-	register char *bp = tbuf;
+	int i, base;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -330,7 +330,7 @@
 tgetflag(id)
 	char *id;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -357,7 +357,7 @@
 tgetstr(id, area)
 	char *id, **area;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -380,12 +380,12 @@
  */
 static char *
 tdecode(str, area)
-	register char *str;
+	char *str;
 	char **area;
 {
-	register char *cp;
-	register int c;
-	register char *dp;
+	char *cp;
+	int c;
+	char *dp;
 	int i;
 
 	cp = *area;
Index: usr.bin/tip/tip/remote.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/remote.c,v
retrieving revision 1.4
diff -u -r1.4 remote.c
--- usr.bin/tip/tip/remote.c	19 Apr 2005 05:32:02 -0000	1.4
+++ usr.bin/tip/tip/remote.c	24 Aug 2008 10:03:39 -0000
@@ -102,9 +102,9 @@
 
 static void
 getremcap(host)
-	register char *host;
+	char *host;
 {
-	register char **p, ***q;
+	char **p, ***q;
 	char *bp;
 	char *rempath;
 	int   stat;
@@ -252,7 +252,7 @@
 getremote(host)
 	char *host;
 {
-	register char *cp;
+	char *cp;
 	static char *next;
 	static int lookedup = 0;
 
Index: usr.bin/tip/tip/tip.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/tip.c,v
retrieving revision 1.6
diff -u -r1.6 tip.c
--- usr.bin/tip/tip/tip.c	19 Apr 2005 05:32:02 -0000	1.6
+++ usr.bin/tip/tip/tip.c	24 Aug 2008 10:04:06 -0000
@@ -95,8 +95,8 @@
 	char *argv[];
 {
 	char *system = NULL;
-	register int i;
-	register char *p;
+	int i;
+	char *p;
 	char sbuf[12];
 
 	gid = getgid();
@@ -384,10 +384,10 @@
 int
 prompt(s, p, sz)
 	char *s;
-	register char *p;
+	char *p;
 	size_t sz;
 {
-	register char *b = p;
+	char *b = p;
 	sig_t oint, oquit;
 
 	stoprompt = 0;
@@ -483,8 +483,8 @@
 char
 escape()
 {
-	register char gch;
-	register esctable_t *p;
+	char gch;
+	esctable_t *p;
 	char c = character(value(ESCAPE));
 	int i;
 
@@ -513,7 +513,7 @@
 #if HAVE_TERMIOS
 	return (n);
 #else
-	register CONST int *p;
+	CONST int *p;
 
 	for (p = bauds; *p != -1;  p++)
 		if (*p == n)
@@ -524,7 +524,7 @@
 
 int
 any(c, p)
-	register char c, *p;
+	char c, *p;
 {
 	while (p && *p)
 		if (*p++ == c)
@@ -534,9 +534,9 @@
 
 int
 size(s)
-	register char	*s;
+	char	*s;
 {
-	register int i = 0;
+	int i = 0;
 
 	while (s && *s++)
 		i++;
@@ -545,10 +545,10 @@
 
 char *
 interp(s)
-	register char *s;
+	char *s;
 {
 	static char buf[256];
-	register char *p = buf, c, *q;
+	char *p = buf, c, *q;
 
 	while ((c = *s++)) {
 		for (q = "\nn\rr\tt\ff\033E\bb"; *q; q++)
@@ -593,7 +593,7 @@
 help(c)
 	char c;
 {
-	register esctable_t *p;
+	esctable_t *p;
 
 	printf("%c\r\n", c);
 	for (p = etable; p->e_char; p++) {
@@ -644,9 +644,9 @@
  */
 char *
 sname(s)
-	register char *s;
+	char *s;
 {
-	register char *p = s;
+	char *p = s;
 
 	while (*s)
 		if (*s++ == '/')
@@ -666,10 +666,10 @@
 xpwrite(fd, buf, n)
 	int fd;
 	char *buf;
-	register int n;
+	int n;
 {
-	register int i;
-	register char *bp;
+	int i;
+	char *bp;
 
 	bp = buf;
 	if (bits8 == 0)
@@ -693,7 +693,7 @@
 setparity(defparity)
 	char *defparity;
 {
-	register int i, flip, clr, set;
+	int i, flip, clr, set;
 	char *parity;
 	extern char evenpartab[];
 
Index: usr.bin/tip/tip/tipout.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/tipout.c,v
retrieving revision 1.2
diff -u -r1.2 tipout.c
--- usr.bin/tip/tip/tipout.c	17 Jun 2003 04:29:33 -0000	1.2
+++ usr.bin/tip/tip/tipout.c	24 Aug 2008 10:04:22 -0000
@@ -67,7 +67,7 @@
 intEMT()
 {
 	char c, line[256];
-	register char *pline = line;
+	char *pline = line;
 	char reply;
 
 	read(fildes[0], &c, 1);
@@ -117,8 +117,8 @@
 tipout()
 {
 	char buf[BUFSIZ];
-	register char *cp;
-	register int cnt;
+	char *cp;
+	int cnt;
 	int omask;
 
 	signal(SIGINT, SIG_IGN);
Index: usr.bin/tip/tip/value.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tip/tip/value.c,v
retrieving revision 1.5
diff -u -r1.5 value.c
--- usr.bin/tip/tip/value.c	7 May 2005 23:20:43 -0000	1.5
+++ usr.bin/tip/tip/value.c	24 Aug 2008 10:04:52 -0000
@@ -52,8 +52,8 @@
 void
 vinit()
 {
-	register value_t *p;
-	register char *cp;
+	value_t *p;
+	char *cp;
 	FILE *f;
 	char file[256];
 
@@ -74,7 +74,7 @@
 	strcpy(file, value(HOME));
 	strcat(file, "/.tiprc");
 	if ((f = fopen(file, "r")) != NULL) {
-		register char *tp;
+		char *tp;
 
 		while (fgets(file, sizeof(file)-1, f) != NULL) {
 			if (vflag)
@@ -96,7 +96,7 @@
 /*VARARGS1*/
 void
 vassign(p, v)
-	register value_t *p;
+	value_t *p;
 	char *v;
 {
 
@@ -144,16 +144,16 @@
 
 void
 vlex(s)
-	register char *s;
+	char *s;
 {
-	register value_t *p;
+	value_t *p;
 
 	if (equal(s, "all")) {
 		for (p = vtable; p->v_name; p++)
 			if (vaccess(p->v_access, READ))
 				vprint(p);
 	} else {
-		register char *cp;
+		char *cp;
 
 		do {
 			if ((cp = vinterp(s, ' ')))
@@ -170,10 +170,10 @@
 
 static void
 vtoken(s)
-	register char *s;
+	char *s;
 {
-	register value_t *p;
-	register char *cp;
+	value_t *p;
+	char *cp;
 	char *expand();
 
 	if ((cp = index(s, '='))) {
@@ -210,9 +210,9 @@
 
 static void
 vprint(p)
-	register value_t *p;
+	value_t *p;
 {
-	register char *cp;
+	char *cp;
 	extern char *interp(), *ctrl();
 
 	if (col > 0 && col < MIDDLE)
@@ -264,7 +264,7 @@
 
 static int
 vaccess(mode, rw)
-	register unsigned mode, rw;
+	unsigned mode, rw;
 {
 	if (mode & (rw<<PUBLIC))
 		return (1);
@@ -275,9 +275,9 @@
 
 static value_t *
 vlookup(s)
-	register char *s;
+	char *s;
 {
-	register value_t *p;
+	value_t *p;
 
 	for (p = vtable; p->v_name; p++)
 		if (equal(p->v_name, s) || (p->v_abrev && equal(p->v_abrev, s)))
@@ -287,10 +287,10 @@
 
 char *
 vinterp(s, stop)
-	register char *s;
+	char *s;
 	char stop;
 {
-	register char *p = s, c;
+	char *p = s, c;
 	int num;
 
 	while ((c = *s++) && c != stop)
@@ -309,7 +309,7 @@
 			if (c >= '0' && c <= '7')
 				num = (num<<3)+(c-'0');
 			else {
-				register char *q = "n\nr\rt\tb\bf\f";
+				char *q = "n\nr\rt\tb\bf\f";
 
 				for (; *q; q++)
 					if (c == *q++) {
@@ -344,10 +344,10 @@
 
 int
 vstring(s,v)
-	register char *s;
-	register char *v;
+	char *s;
+	char *v;
 {
-	register value_t *p;
+	value_t *p;
 	char *expand();
 
 	p = vlookup(s);
Index: usr.bin/top/machine.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/top/machine.c,v
retrieving revision 1.25
diff -u -r1.25 machine.c
--- usr.bin/top/machine.c	1 Mar 2008 18:49:00 -0000	1.25
+++ usr.bin/top/machine.c	24 Aug 2008 10:08:19 -0000
@@ -229,8 +229,8 @@
 int
 machine_init(struct statics *statics)
 {
-    register int i = 0;
-    register int pagesize;
+    int i = 0;
+    int pagesize;
     size_t modelen;
     struct passwd *pw;
 
@@ -295,9 +295,9 @@
     return(0);
 }
 
-char *format_header(register char *uname_field)
+char *format_header(char *uname_field)
 {
-    register char *ptr;
+    char *ptr;
     static char Header[128];
 
     snprintf(Header, sizeof(Header), smpmode ? smp_header : up_header,
@@ -447,11 +447,11 @@
 caddr_t get_process_info(struct system_info *si, struct process_select *sel,
                          int (*compare)())
 {
-    register int i;
-    register int total_procs;
-    register int active_procs;
-    register struct kinfo_proc **prefp;
-    register struct kinfo_proc *pp;
+    int i;
+    int total_procs;
+    int active_procs;
+    struct kinfo_proc **prefp;
+    struct kinfo_proc *pp;
 
     /* these are copied out of sel for speed */
     int show_idle;
@@ -661,9 +661,9 @@
  *		number of symbols NOT found.
  */
 
-static int check_nlist(register struct nlist *nlst)
+static int check_nlist(struct nlist *nlst)
 {
-    register int i;
+    int i;
 
     /* check to see if we got ALL the symbols we requested */
     /* this will write one line to stderr for every symbol not found */
@@ -747,10 +747,10 @@
 proc_compare(struct proc **pp1, struct proc **pp2)
 #endif
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
 
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -786,10 +786,10 @@
 int
 compare_size(struct proc **pp1, struct proc **pp2)
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
 
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -811,10 +811,10 @@
 int
 compare_res(struct proc **pp1, struct proc **pp2)
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
 
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -836,10 +836,10 @@
 int
 compare_time(struct proc **pp1, struct proc **pp2)
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
   
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -863,10 +863,10 @@
 int
 compare_prio(struct proc **pp1, struct proc **pp2)
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
 
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -888,10 +888,10 @@
 int
 compare_thr(struct proc **pp1, struct proc **pp2)
 {
-    register struct kinfo_proc *p1;
-    register struct kinfo_proc *p2;
-    register int result;
-    register pctcpu lresult;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
 
     /* remove one level of indirection */
     p1 = *(struct kinfo_proc **) pp1;
@@ -924,9 +924,9 @@
 
 int proc_owner(int pid)
 {
-    register int cnt;
-    register struct kinfo_proc **prefp;
-    register struct kinfo_proc *pp;
+    int cnt;
+    struct kinfo_proc **prefp;
+    struct kinfo_proc *pp;
 
     prefp = pref;
     cnt = pref_len;
Index: usr.bin/tset/misc.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tset/misc.c,v
retrieving revision 1.3
diff -u -r1.3 misc.c
--- usr.bin/tset/misc.c	4 Oct 2003 20:36:53 -0000	1.3
+++ usr.bin/tset/misc.c	24 Aug 2008 10:09:01 -0000
@@ -46,7 +46,7 @@
 void
 cat(char *file)
 {
-	register int fd, nr, nw;
+	int fd, nr, nw;
 	char buf[1024];
 
 	if ((fd = open(file, O_RDONLY, 0)) < 0)
Index: usr.bin/tset/wrterm.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/tset/wrterm.c,v
retrieving revision 1.4
diff -u -r1.4 wrterm.c
--- usr.bin/tset/wrterm.c	30 Aug 2004 18:06:50 -0000	1.4
+++ usr.bin/tset/wrterm.c	24 Aug 2008 10:09:10 -0000
@@ -49,8 +49,8 @@
 void
 wrtermcap(char *bp)
 {
-	register int ch;
-	register char *p;
+	int ch;
+	char *p;
 	char *t, *sep;
 
 	/* Find the end of the terminal names. */
Index: usr.bin/uniq/uniq.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.4
diff -u -r1.4 uniq.c
--- usr.bin/uniq/uniq.c	12 Jan 2005 01:36:50 -0000	1.4
+++ usr.bin/uniq/uniq.c	24 Aug 2008 10:09:25 -0000
@@ -64,7 +64,7 @@
 int
 main(int argc, char **argv)
 {
-	register char *t1, *t2;
+	char *t1, *t2;
 	FILE *ifp, *ofp;
 	int ch;
 	char *prevline, *thisline, *p;
@@ -192,9 +192,9 @@
 }
 
 char *
-skip(register char *str)
+skip(char *str)
 {
-	register int nchars, nfields;
+	int nchars, nfields;
 
 	for (nfields = 0; *str != '\0' && nfields++ != numfields; ) {
 		while (isblank((unsigned char)*str))
Index: usr.bin/vgrind/regexp.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/vgrind/regexp.c,v
retrieving revision 1.3
diff -u -r1.3 regexp.c
--- usr.bin/vgrind/regexp.c	4 Oct 2003 20:36:54 -0000	1.3
+++ usr.bin/vgrind/regexp.c	24 Aug 2008 10:10:40 -0000
@@ -60,7 +60,7 @@
  */
 
 int
-STRNCMP(register char *s1, register char *s2, register int len)
+STRNCMP(char *s1, char *s2, int len)
 {
 	if (l_onecase) {
 	    do
@@ -143,7 +143,7 @@
 char *
 convexp(char *re)
 {
-    register char *cre;		/* pointer to converted regular expression */
+    char *cre;			/* pointer to converted regular expression */
 
     /* allocate room for the converted expression */
     if (re == NIL)
@@ -168,10 +168,10 @@
 static void
 expconv(void)
 {
-    register char *cs;		/* pointer to current symbol in converted exp */
-    register char c;		/* character being processed */
-    register char *acs;		/* pinter to last alternate */
-    register int temp;
+    char *cs;			/* pointer to current symbol in converted exp */
+    char c;			/* character being processed */
+    char *acs;			/* pinter to last alternate */
+    int temp;
 
     /* let the conversion begin */
     acs = NIL;
@@ -342,10 +342,10 @@
 mstring: where to put whatever matches a \p
 */
 char *
-expmatch(register char *s, register char *re, register char *mstring)
+expmatch(char *s, char *re, char *mstring)
 {
-    register char *cs;		/* the current symbol */
-    register char *ptr,*s1;	/* temporary pointer */
+    char *cs;			/* the current symbol */
+    char *ptr,*s1;		/* temporary pointer */
     boolean matched;		/* a temporary boolean */
 
     /* initial conditions */
Index: usr.bin/vgrind/vfontedpr.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/vgrind/vfontedpr.c,v
retrieving revision 1.3
diff -u -r1.3 vfontedpr.c
--- usr.bin/vgrind/vfontedpr.c	4 Oct 2003 20:36:54 -0000	1.3
+++ usr.bin/vgrind/vfontedpr.c	24 Aug 2008 10:11:15 -0000
@@ -344,7 +344,7 @@
 static void
 putScp(char *os)
 {
-    register char *s = os;		/* pointer to unmatched string */
+    char *s = os;			/* pointer to unmatched string */
     char dummy[BUFSIZ];			/* dummy to be used by expmatch */
     char *comptr;			/* end of a comment delimiter */
     char *acmptr;			/* end of a comment delimiter */
@@ -590,9 +590,9 @@
 }
 
 static int
-width(register char *s, register char *os)
+width(char *s, char *os)
 {
-	register int i = 0;
+	int i = 0;
 
 	while (s < os) {
 		if (*s == '\t') {
@@ -610,7 +610,7 @@
 }
 
 static void
-putcp(register int c)
+putcp(int c)
 {
 
 	switch(c) {
@@ -692,11 +692,11 @@
  */
 
 static int
-iskw(register char *s)
+iskw(char *s)
 {
-	register char **ss = l_keywds;
-	register int i = 1;
-	register char *cp = s;
+	char **ss = l_keywds;
+	int i = 1;
+	char *cp = s;
 
 	while (++cp, isidchr(*cp))
 		i++;
Index: usr.bin/vgrind/vgrindefs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/vgrind/vgrindefs.c,v
retrieving revision 1.4
diff -u -r1.4 vgrindefs.c
--- usr.bin/vgrind/vgrindefs.c	3 Sep 2004 20:38:01 -0000	1.4
+++ usr.bin/vgrind/vgrindefs.c	24 Aug 2008 10:12:05 -0000
@@ -69,9 +69,9 @@
 int
 tgetent(char *bp, char *name, char *file)
 {
-	register char *cp;
-	register int c;
-	register int i = 0, cnt = 0;
+	char *cp;
+	int c;
+	int i = 0, cnt = 0;
 	char ibuf[BUFSIZ];
 	char *cp2;
 	int tf;
@@ -129,7 +129,7 @@
 int
 tnchktc(void)
 {
-	register char *p, *q;
+	char *p, *q;
 	char tcname[16];	/* name of similar terminal */
 	char tcbuf[BUFSIZ];
 	char *holdtbuf = tbuf;
@@ -177,7 +177,7 @@
 int
 tnamatch(char *np)
 {
-	register char *Np, *Bp;
+	char *Np, *Bp;
 
 	Bp = tbuf;
 	if (*Bp == '#')
@@ -201,7 +201,7 @@
  * into the termcap file in octal.
  */
 static char *
-tskip(register char *bp)
+tskip(char *bp)
 {
 
 	while (*bp && *bp != ':')
@@ -222,8 +222,8 @@
 int
 tgetnum(char *id)
 {
-	register int i, base;
-	register char *bp = tbuf;
+	int i, base;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -255,7 +255,7 @@
 int
 tgetflag(char *id)
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -281,7 +281,7 @@
 char *
 tgetstr(char *id, char **area)
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -303,10 +303,10 @@
  * string capability escapes.
  */
 static char *
-tdecode(register char *str, char **area)
+tdecode(char *str, char **area)
 {
-	register char *cp;
-	register int c;
+	char *cp;
+	int c;
 	int i;
 
 	cp = *area;
Index: usr.bin/vis/foldit.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/vis/foldit.c,v
retrieving revision 1.3
diff -u -r1.3 foldit.c
--- usr.bin/vis/foldit.c	4 Oct 2003 20:36:54 -0000	1.3
+++ usr.bin/vis/foldit.c	24 Aug 2008 10:12:25 -0000
@@ -40,7 +40,7 @@
 int
 foldit(char *chunk, int col, int max)
 {
-	register char *cp;
+	char *cp;
 
 	/*
 	 * Keep track of column position. Insert hidden newline
Index: usr.bin/vis/vis.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/vis/vis.c,v
retrieving revision 1.3
diff -u -r1.3 vis.c
--- usr.bin/vis/vis.c	4 Oct 2003 20:36:54 -0000	1.3
+++ usr.bin/vis/vis.c	24 Aug 2008 10:12:53 -0000
@@ -131,8 +131,8 @@
 process(FILE *fp, char *filename)
 {
 	static int col = 0;
-	register char *cp = "\0"+1;	/* so *(cp-1) starts out != '\n' */
-	register int c, rachar;
+	char *cp = "\0"+1;		/* so *(cp-1) starts out != '\n' */
+	int c, rachar;
 	char buff[5];
 
 	c = getc(fp);
Index: usr.bin/window/cmd.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/cmd.c,v
retrieving revision 1.3
diff -u -r1.3 cmd.c
--- usr.bin/window/cmd.c	15 Apr 2005 17:55:29 -0000	1.3
+++ usr.bin/window/cmd.c	28 Aug 2008 17:56:57 -0000
@@ -41,9 +41,9 @@
 #include "defs.h"
 #include "char.h"
 
-docmd()
+docmd(void)
 {
-	register c;
+	int c;
 	struct ww *w;
 	char out = 0;
 
@@ -213,7 +213,7 @@
 }
 
 struct ww *
-getwin()
+getwin(void)
 {
 	int c;
 	struct ww *w = 0;
@@ -242,8 +242,8 @@
 	return w;
 }
 
-checkproc(w)
-struct ww *w;
+int
+checkproc(struct ww *w)
 {
 	if (w->ww_state != WWS_HASPROC) {
 		error("No process in window.");
@@ -252,8 +252,8 @@
 	return 0;
 }
 
-setcmd(new)
-char new;
+void
+setcmd(char new)
 {
 	if (new && !incmd) {
 		if (!terse)
@@ -273,8 +273,8 @@
 	incmd = new;
 }
 
-setterse(new)
-char new;
+void
+setterse(char *new)
 {
 	if (incmd)
 		if (new && !terse) {
@@ -288,8 +288,8 @@
 /*
  * Set the current window.
  */
-setselwin(w)
-struct ww *w;
+void
+setselwin(struct ww *w)
 {
 	if (selwin == w)
 		return;
Index: usr.bin/window/cmd1.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/cmd1.c,v
retrieving revision 1.3
diff -u -r1.3 cmd1.c
--- usr.bin/window/cmd1.c	15 Apr 2005 17:55:29 -0000	1.3
+++ usr.bin/window/cmd1.c	26 Aug 2008 20:00:33 -0000
@@ -41,7 +41,7 @@
 #include "defs.h"
 #include "char.h"
 
-c_window()
+c_window(void)
 {
 	int col, row, xcol, xrow;
 	int id;
@@ -108,10 +108,7 @@
 		(char *) 0, 1, 1, default_shellfile, default_shell);
 }
 
-getpos(row, col, minrow, mincol, maxrow, maxcol)
-int *row, *col;
-int minrow, mincol;
-int maxrow, maxcol;
+getpos(int *row, int *col, int minrow, int mincol, int maxrow, int maxcol)
 {
 	static int scount;
 	int count;
Index: usr.bin/window/cmd5.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/cmd5.c,v
retrieving revision 1.3
diff -u -r1.3 cmd5.c
--- usr.bin/window/cmd5.c	15 Apr 2005 17:55:29 -0000	1.3
+++ usr.bin/window/cmd5.c	24 Aug 2008 10:13:25 -0000
@@ -105,7 +105,7 @@
  * Weird stufff, don't ask.
  */
 getminmax(x, n, a, b, curx, minx, maxx)
-register x, n, a, b;
+int x, n, a, b;
 int *curx, *minx, *maxx;
 {
 	if (x < 0)
Index: usr.bin/window/compress.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/compress.c,v
retrieving revision 1.2
diff -u -r1.2 compress.c
--- usr.bin/window/compress.c	17 Jun 2003 04:29:33 -0000	1.2
+++ usr.bin/window/compress.c	24 Aug 2008 10:15:39 -0000
@@ -124,8 +124,8 @@
 
 #define qinsert(p1, p2) \
 	do { \
-		register struct cc *forw = (p1)->qforw; \
-		register struct cc *back = (p1)->qback; \
+		struct cc *forw = (p1)->qforw; \
+		struct cc *back = (p1)->qback; \
 		back->qforw = forw; \
 		forw->qback = back; \
 		forw = (p2)->qforw; \
@@ -165,8 +165,8 @@
 
 ccinit()
 {
-	register i, j;
-	register struct cc *p;
+	int i, j;
+	struct cc *p;
 
 	if (tt.tt_token_max > cc_token_max)
 		tt.tt_token_max = cc_token_max;
@@ -303,7 +303,7 @@
 
 ccreset()
 {
-	register struct cc *p;
+	struct cc *p;
 
 	bzero((char *) cc_htab, HSIZE * sizeof *cc_htab);
 	for (p = cc_q0a.qforw; p != &cc_q0a; p = p->qforw)
@@ -361,8 +361,8 @@
 	char *buffer;
 	struct cc **tokens;
 {
-	register struct cc **pp = tokens;
-	register i, n;
+	struct cc **pp = tokens;
+	int i, n;
 #ifdef STATS
 	int nn, ii;
 #endif
@@ -417,11 +417,11 @@
 cc_sweep0(buffer, n, length)
 	char *buffer;
 {
-	register char *p;
-	register short *hc;
-	register i;
-	register short c;
-	register short pc = tt.tt_padc;
+	char *p;
+	short *hc;
+	int i;
+	short c;
+	short pc = tt.tt_padc;
 
 	/* n and length are at least 1 */
 	p = buffer++;
@@ -447,11 +447,11 @@
 cc_sweep(buffer, bufsize, tokens, length)
 	char *buffer;
 	struct cc **tokens;
-	register length;
+	int length;
 {
-	register struct cc *p;
-	register char *cp;
-	register i;
+	struct cc *p;
+	char *cp;
+	int i;
 	short *hc;
 	short *places = cc_places[length];
 	struct cc **pp = tokens;
@@ -472,9 +472,9 @@
 		struct cc **h;
 
 		{
-			register short *hc1 = hc;
-			register short c = *cp++;
-			register short hh;
+			short *hc1 = hc;
+			short c = *cp++;
+			short hh;
 			if ((hh = *hc1) < 0 || c == pc) {
 				*hc1++ = -1;
 				hc = hc1;
@@ -485,9 +485,9 @@
 		}
 		for (p = *h; p != 0; p = p->hforw)
 			if (p->length == (char) length) {
-				register char *p1 = p->string;
-				register char *p2 = cp - length;
-				register n = length;
+				char *p1 = p->string;
+				char *p2 = cp - length;
+				int n = length;
 				do
 					if (*p1++ != *p2++)
 						goto fail;
@@ -504,9 +504,9 @@
 				if ((*p->hback = p->hforw) != 0)
 					p->hforw->hback = p->hback;
 			{
-				register char *p1 = p->string;
-				register char *p2 = cp - length;
-				register n = length;
+				char *p1 = p->string;
+				char *p2 = cp - length;
+				int n = length;
 				do
 					*p1++ = *p2++;
 				while (--n);
@@ -621,11 +621,11 @@
 }
 
 cc_sweep_reverse(pp, places)
-	register struct cc **pp;
-	register short *places;
+	struct cc **pp;
+	short *places;
 {
-	register struct cc *p;
-	register short front, back, t;
+	struct cc *p;
+	short front, back, t;
 
 	while ((p = *pp++) != 0) {
 		back = -1;
@@ -644,7 +644,7 @@
 	struct cc **output;
 	struct cc **tokens;
 {
-	register i;
+	int i;
 
 	bzero((char *) output, bufsize * sizeof *output);
 	for (i = 0; i < cc_npass0; i++)
@@ -655,12 +655,12 @@
 }
 
 cc_compress_phase1(output, tokens, ntoken, flag)
-	register struct cc **output;
+	struct cc **output;
 	struct cc **tokens;
 {
-	register struct cc **pp;
+	struct cc **pp;
 #ifdef STATS
-	register int i = 0;
+	int i = 0;
 	int nt = 0, cc = 0, nc = 0;
 #endif
 
@@ -706,15 +706,15 @@
 }
 
 cc_compress_cleanup(output, bufsize)
-	register struct cc **output;
+	struct cc **output;
 {
-	register struct cc **end;
+	struct cc **end;
 
 	/* the previous output phase may have been interrupted */
 	qinsertq(&cc_q0b, &cc_q0a);
 	for (end = output + bufsize; output < end;) {
-		register struct cc *p;
-		register length;
+		struct cc *p;
+		int length;
 		if ((p = *output) == 0) {
 			output++;
 			continue;
@@ -746,7 +746,7 @@
 	char flag;
 {
 	struct cc **pp = tokens;
-	register struct cc *p = *pp++;
+	struct cc *p = *pp++;
 	int length = p->length;
 	int threshold = thresh(length);
 #ifndef cc_weight
@@ -758,7 +758,7 @@
 
 	do {
 		int score;
-		register struct cc_undo *undop;
+		struct cc_undo *undop;
 		int ccount;
 #ifdef STATS
 		int ncover;
@@ -783,10 +783,10 @@
 		ncover = 0;
 #endif
 		for (i = p->places; i >= 0; i = places[i]) {
-			register struct cc **jp;
-			register struct cc *x;
-			register struct cc **ip = output + i;
-			register score0 = initial_score0;
+			struct cc **jp;
+			struct cc *x;
+			struct cc **ip = output + i;
+			int score0 = initial_score0;
 			struct cc **iip = ip + length;
 			struct cc_undo *undop1 = undop;
 
@@ -841,9 +841,9 @@
 #endif
 			p->ccount = ccount;
 		} else {
-			register struct cc_undo *u = cc_undo;
+			struct cc_undo *u = cc_undo;
 			while (--undop >= u) {
-				register struct cc *x;
+				struct cc *x;
 				if (*undop->pos = x = undop->val)
 					x->ccount++;
 			}
@@ -853,12 +853,12 @@
 }
 
 cc_output_phase(buffer, output, bufsize)
-	register char *buffer;
-	register struct cc **output;
-	register bufsize;
+	char *buffer;
+	struct cc **output;
+	int bufsize;
 {
-	register i;
-	register struct cc *p, *p1;
+	int i;
+	struct cc *p, *p1;
 
 	for (i = 0; i < bufsize;) {
 		if ((p = output[i]) == 0) {
Index: usr.bin/window/lcmd2.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/lcmd2.c,v
retrieving revision 1.4
diff -u -r1.4 lcmd2.c
--- usr.bin/window/lcmd2.c	15 Apr 2005 17:55:29 -0000	1.4
+++ usr.bin/window/lcmd2.c	24 Aug 2008 10:16:11 -0000
@@ -183,7 +183,7 @@
 struct value *v, *a;
 {
 	struct ww *w, *wp;
-	register i;
+	int i;
 	int n;
 
 	for (n = 0, i = 0; i < NWINDOW; i++)
@@ -322,7 +322,7 @@
 			struct value *vp;
 			char *p, *q;
 			char *str;
-			register n;
+			int n;
 
 			for (n = 0, vp = a + 1; vp->v_type != V_ERR; vp++, n++)
 				for (p = vp->v_str; *p; p++, n++)
Index: usr.bin/window/main.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/main.c,v
retrieving revision 1.3
diff -u -r1.3 main.c
--- usr.bin/window/main.c	30 Aug 2004 18:06:50 -0000	1.3
+++ usr.bin/window/main.c	24 Aug 2008 10:16:23 -0000
@@ -54,7 +54,7 @@
 main(argc, argv)
 char **argv;
 {
-	register char *p;
+	char *p;
 	char fflag = 0;
 	char dflag = 0;
 	char xflag = 0;
Index: usr.bin/window/mloop.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/mloop.c,v
retrieving revision 1.2
diff -u -r1.2 mloop.c
--- usr.bin/window/mloop.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/mloop.c	24 Aug 2008 10:16:35 -0000
@@ -54,9 +54,9 @@
 				(void) wwgetc();
 			error("Process died.");
 		} else {
-			register struct ww *w = wwcurwin;
-			register char *p;
-			register n;
+			struct ww *w = wwcurwin;
+			char *p;
+			int n;
 
 			if (wwibp >= wwibq)
 				wwiomux();
Index: usr.bin/window/parser1.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/parser1.c,v
retrieving revision 1.2
diff -u -r1.2 parser1.c
--- usr.bin/window/parser1.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/parser1.c	24 Aug 2008 10:16:53 -0000
@@ -184,7 +184,7 @@
 }
 
 p_convstr(v)
-register struct value *v;
+struct value *v;
 {
 	if (v->v_type != V_NUM)
 		return 0;
Index: usr.bin/window/parser2.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/parser2.c,v
retrieving revision 1.2
diff -u -r1.2 parser2.c
--- usr.bin/window/parser2.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/parser2.c	24 Aug 2008 10:17:12 -0000
@@ -49,16 +49,16 @@
  */
 p_function(name, v, flag)
 char *name;
-register struct value *v;
+struct value *v;
 {
 	struct value t;
-	register struct lcmd_tab *c = 0;
-	register struct alias *a = 0;
-	register struct lcmd_arg *ap;		/* this arg */
+	struct lcmd_tab *c = 0;
+	struct alias *a = 0;
+	struct lcmd_arg *ap;		/* this arg */
 	struct lcmd_arg *lp = 0;		/* list arg */
-	register i;
+	int i;
 	struct value av[LCMD_NARG + 1];
-	register struct value *vp;
+	struct value *vp;
 
 	if (name != 0)
 		if (c = lcmd_lookup(name))
Index: usr.bin/window/parser3.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/parser3.c,v
retrieving revision 1.2
diff -u -r1.2 parser3.c
--- usr.bin/window/parser3.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/parser3.c	24 Aug 2008 10:17:24 -0000
@@ -56,7 +56,7 @@
  * unary - + ~ !
  */
 p_expr(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value t;
@@ -86,7 +86,7 @@
  * ? :
  */
 p_expr0(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value t;
@@ -125,7 +125,7 @@
  * ||
  */
 p_expr1(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	char true = 0;
@@ -159,7 +159,7 @@
  * &&
  */
 p_expr2(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	char true = 1;
Index: usr.bin/window/parser4.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/parser4.c,v
retrieving revision 1.2
diff -u -r1.2 parser4.c
--- usr.bin/window/parser4.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/parser4.c	24 Aug 2008 10:17:33 -0000
@@ -52,7 +52,7 @@
  * * / %	10
  */
 p_expr3_10(level, v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value l, r;
Index: usr.bin/window/parser5.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/parser5.c,v
retrieving revision 1.2
diff -u -r1.2 parser5.c
--- usr.bin/window/parser5.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/parser5.c	24 Aug 2008 10:17:43 -0000
@@ -45,7 +45,7 @@
  * unary $ $? + - ! ~
  */
 p_expr11(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	int op;
@@ -147,7 +147,7 @@
  * Always return v_type == V_ERR when flag == 0.
  */
 p_expr12(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	v->v_type = V_ERR;
Index: usr.bin/window/scanner.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/scanner.c,v
retrieving revision 1.2
diff -u -r1.2 scanner.c
--- usr.bin/window/scanner.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/scanner.c	24 Aug 2008 10:18:16 -0000
@@ -47,7 +47,7 @@
 
 s_getc()
 {
-	register c;
+	int c;
 
 	switch (cx.x_type) {
 	case X_FILE:
@@ -88,9 +88,9 @@
 s_gettok()
 {
 	char buf[100];
-	register char *p = buf;
-	register c;
-	register state = 0;
+	char *p = buf;
+	int c;
+	int state = 0;
 
 loop:
 	c = s_getc();
@@ -509,8 +509,8 @@
 
 s_gettok1()
 {
-	register c;
-	register n;
+	int c;
+	int n;
 
 	c = s_getc();			/* got \ */
 	switch (c) {
Index: usr.bin/window/startup.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/startup.c,v
retrieving revision 1.2
diff -u -r1.2 startup.c
--- usr.bin/window/startup.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/startup.c	24 Aug 2008 10:18:32 -0000
@@ -64,7 +64,7 @@
 dodefault()
 {
 	struct ww *w;
-	register r = wwnrow / 2 - 1;
+	int r = wwnrow / 2 - 1;
 
 	if (openwin(1, r + 2, 0, wwnrow - r - 2, wwncol, default_nline,
 		(char *) 0, 1, 1, default_shellfile, default_shell) == 0)
Index: usr.bin/window/string.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/string.c,v
retrieving revision 1.3
diff -u -r1.3 string.c
--- usr.bin/window/string.c	28 Feb 2005 13:57:05 -0000	1.3
+++ usr.bin/window/string.c	24 Aug 2008 10:19:02 -0000
@@ -43,10 +43,10 @@
 
 char *
 str_cpy(s)
-register char *s;
+char *s;
 {
 	char *str;
-	register char *p;
+	char *p;
 
 	str = p = str_alloc(strlen(s) + 1);
 	if (p == 0)
@@ -58,12 +58,12 @@
 
 char *
 str_ncpy(s, n)
-register char *s;
-register n;
+char *s;
+int n;
 {
 	int l = strlen(s);
 	char *str;
-	register char *p;
+	char *p;
 
 	if (n > l)
 		n = l;
@@ -91,7 +91,7 @@
 char *s1, *s2;
 {
 	char *str;
-	register char *p, *q;
+	char *p, *q;
 
 	str = p = str_alloc(strlen(s1) + strlen(s2) + 1);
 	if (p == 0)
@@ -108,8 +108,8 @@
  * s can be a prefix of p with at least min characters.
  */
 str_match(s, p, min)
-register char *s, *p;
-register min;
+char *s, *p;
+int min;
 {
 	for (; *s && *p && *s == *p; s++, p++, min--)
 		;
@@ -121,7 +121,7 @@
 str_alloc(l)
 int l;
 {
-	register struct mystring *s;
+	struct mystring *s;
 
 	s = (struct mystring *) malloc((unsigned)l + str_offset);
 	if (s == 0)
@@ -138,7 +138,7 @@
 str_free(str)
 char *str;
 {
-	register struct mystring *s;
+	struct mystring *s;
 
 	for (s = str_head.s_forw; s != &str_head && s->s_data != str;
 	     s = s->s_forw)
Index: usr.bin/window/ttgeneric.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/ttgeneric.c,v
retrieving revision 1.2
diff -u -r1.2 ttgeneric.c
--- usr.bin/window/ttgeneric.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/ttgeneric.c	24 Aug 2008 10:19:47 -0000
@@ -131,9 +131,9 @@
 }
 
 gen_setmodes(new)
-register new;
+int new;
 {
-	register diff;
+	int diff;
 
 	diff = new ^ tt.tt_modes;
 	if (diff & WWM_REV) {
@@ -194,7 +194,7 @@
 }
 
 gen_putc(c)
-register char c;
+char c;
 {
 	if (tt.tt_insert)
 		gen_setinsert(0);
@@ -211,8 +211,8 @@
 }
 
 gen_write(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	if (tt.tt_insert)
 		gen_setinsert(0);
@@ -230,7 +230,7 @@
 }
 
 gen_move(row, col)
-register int row, col;
+int row, col;
 {
 	if (tt.tt_row == row && tt.tt_col == col)
 		return;
@@ -322,7 +322,7 @@
 }
 
 gen_inschar(c)
-register char c;
+char c;
 {
 	if (!tt.tt_insert)
 		gen_setinsert(1);
Index: usr.bin/window/tth19.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/tth19.c,v
retrieving revision 1.2
diff -u -r1.2 tth19.c
--- usr.bin/window/tth19.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/tth19.c	24 Aug 2008 10:20:21 -0000
@@ -71,7 +71,7 @@
 int h19_msp10c;
 
 #define PAD(ms10) { \
-	register i; \
+	int i; \
 	for (i = ((ms10) + 5) / h19_msp10c; --i >= 0;) \
 		ttputc('\0'); \
 }
@@ -81,9 +81,9 @@
 #define H19_SETINSERT(m) ttesc((tt.tt_insert = (m)) ? '@' : 'O')
 
 h19_setmodes(new)
-register new;
+int new;
 {
-	register diff;
+	int diff;
 
 	diff = new ^ tt.tt_modes;
 	if (diff & WWM_REV)
@@ -110,7 +110,7 @@
 }
 
 h19_putc(c)
-register char c;
+char c;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
@@ -122,8 +122,8 @@
 }
 
 h19_write(p, n)
-register char *p;
-register n;
+char *p;
+int n;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
@@ -136,7 +136,7 @@
 }
 
 h19_move(row, col)
-register char row, col;
+char row, col;
 {
 	if (tt.tt_row == row) {
 		if (tt.tt_col == col)
@@ -212,7 +212,7 @@
 }
 
 h19_inschar(c)
-register char c;
+char c;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
Index: usr.bin/window/tth29.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/tth29.c,v
retrieving revision 1.2
diff -u -r1.2 tth29.c
--- usr.bin/window/tth29.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/tth29.c	24 Aug 2008 10:20:46 -0000
@@ -59,9 +59,9 @@
  */
 
 h29_setmodes(new)
-register new;
+int new;
 {
-	register modes = '0';
+	int modes = '0';
 
 	if (new & WWM_REV)
 		modes += 0x01;
Index: usr.bin/window/ttinit.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/ttinit.c,v
retrieving revision 1.2
diff -u -r1.2 ttinit.c
--- usr.bin/window/ttinit.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/ttinit.c	24 Aug 2008 10:21:00 -0000
@@ -68,9 +68,9 @@
 ttinit()
 {
 	int i;
-	register struct tt_tab *tp;
-	register char *p, *q;
-	register char *t;
+	struct tt_tab *tp;
+	char *p, *q;
+	char *t;
 
 	tt_strp = tt_strings;
 
Index: usr.bin/window/ttoutput.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/ttoutput.c,v
retrieving revision 1.2
diff -u -r1.2 ttoutput.c
--- usr.bin/window/ttoutput.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/ttoutput.c	24 Aug 2008 10:21:24 -0000
@@ -49,8 +49,8 @@
 
 ttflush()
 {
-	register char *p;
-	register n = tt_obp - tt_ob;
+	char *p;
+	int n = tt_obp - tt_ob;
 
 	if (n == 0)
 		return;
@@ -82,15 +82,15 @@
 }
 
 ttputs(s)
-register char *s;
+char *s;
 {
 	while (*s)
 		ttputc(*s++);
 }
 
 ttwrite(s, n)
-	register char *s;
-	register n;
+	char *s;
+	int n;
 {
 	switch (n) {
 	case 0:
@@ -130,7 +130,7 @@
 		break;
 	default:
 		while (n > 0) {
-			register m;
+			int m;
 
 			while ((m = tt_obe - tt_obp) == 0)
 				ttflush();
Index: usr.bin/window/tttermcap.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/tttermcap.c,v
retrieving revision 1.3
diff -u -r1.3 tttermcap.c
--- usr.bin/window/tttermcap.c	28 Feb 2005 13:57:05 -0000	1.3
+++ usr.bin/window/tttermcap.c	24 Aug 2008 10:21:38 -0000
@@ -57,7 +57,7 @@
 tttgetstr(str)
 	char *str;
 {
-	register struct tt_str *s;
+	struct tt_str *s;
 
 	if ((str = tgetstr(str, &tt_strp)) == 0)
 		return 0;
@@ -72,7 +72,7 @@
 ttxgetstr(str)
 	char *str;
 {
-	register struct tt_str *s;
+	struct tt_str *s;
 	char buf[100];
 	char *bufp = buf;
 
@@ -90,7 +90,7 @@
 tttgoto(s, col, row)
 	struct tt_str *s;
 {
-	register char *p = s->ts_str;
+	char *p = s->ts_str;
 
 	ttputs(tgoto(p, col, row));
 	for (p += s->ts_n; *--p == 0;)
@@ -105,7 +105,7 @@
 }
 
 ttstrcmp(a, b)
-	register struct tt_str *a, *b;
+	struct tt_str *a, *b;
 {
 	int n, r;
 
Index: usr.bin/window/ttzapple.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/ttzapple.c,v
retrieving revision 1.2
diff -u -r1.2 ttzapple.c
--- usr.bin/window/ttzapple.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/ttzapple.c	24 Aug 2008 10:22:11 -0000
@@ -109,8 +109,8 @@
 }
 
 zz_write(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		zz_setmodes(tt.tt_nmodes);
@@ -121,9 +121,9 @@
 }
 
 zz_move(row, col)
-	register row, col;
+	int row, col;
 {
-	register x;
+	int x;
 
 	if (tt.tt_row == row) {
 same_row:
@@ -357,13 +357,13 @@
 zz_rint(p, n)
 	char *p;
 {
-	register i;
-	register char *q;
+	int i;
+	char *q;
 
 	if (!zz_ecc)
 		return n;
 	for (i = n, q = p; --i >= 0;) {
-		register c = (unsigned char) *p++;
+		int c = (unsigned char) *p++;
 
 		if (zz_lastc == 0) {
 			switch (c) {
@@ -411,11 +411,11 @@
 }
 
 zz_checksum(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	while (--n >= 0) {
-		register c = *p++ & 0x7f;
+		int c = *p++ & 0x7f;
 		c ^= zz_sum;
 		zz_sum = c << 1 | c >> 11 & 1;
 	}
Index: usr.bin/window/var.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/var.c,v
retrieving revision 1.3
diff -u -r1.3 var.c
--- usr.bin/window/var.c	28 Feb 2005 13:57:05 -0000	1.3
+++ usr.bin/window/var.c	24 Aug 2008 10:22:35 -0000
@@ -48,8 +48,8 @@
 char *name;
 struct value *v;
 {
-	register struct var **p;
-	register struct var *r;
+	struct var **p;
+	struct var *r;
 	struct value val;
 
 	/* do this first, easier to recover */
@@ -108,8 +108,8 @@
 struct var **head;
 char *name;
 {
-	register struct var **p;
-	register struct var *r;
+	struct var **p;
+	struct var *r;
 
 	if (*(p = var_lookup1(head, name)) == 0)
 		return -1;
@@ -126,10 +126,10 @@
 
 struct var **
 var_lookup1(p, name)
-register struct var **p;
-register char *name;
+struct var **p;
+char *name;
 {
-	register cmp;
+	int cmp;
 
 	while (*p != 0) {
 		if ((cmp = strcmp(name, (*p)->r_name)) < 0)
@@ -143,7 +143,7 @@
 }
 
 var_walk1(r, func, a)
-register struct var *r;
+struct var *r;
 int (*func)();
 long a;
 {
Index: usr.bin/window/win.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/win.c,v
retrieving revision 1.2
diff -u -r1.2 win.c
--- usr.bin/window/win.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/win.c	24 Aug 2008 10:23:15 -0000
@@ -66,7 +66,7 @@
 char haspty, hasframe;
 char *shf, **sh;
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if (id < 0 && (id = findid()) < 0)
 		return 0;
@@ -105,7 +105,7 @@
 
 findid()
 {
-	register i;
+	int i;
 
 	for (i = 0; i < NWINDOW && window[i] != 0; i++)
 		;
@@ -119,8 +119,8 @@
 struct ww *
 findselwin()
 {
-	register struct ww *w, *s = 0;
-	register i;
+	struct ww *w, *s = 0;
+	int i;
 
 	for (i = 0; i < NWINDOW; i++)
 		if ((w = window[i]) != 0 && w != selwin &&
@@ -134,10 +134,10 @@
  * Close a user window.  Close all if w == 0.
  */
 closewin(w)
-register struct ww *w;
+struct ww *w;
 {
 	char didit = 0;
-	register i;
+	int i;
 
 	if (w != 0) {
 		closewin1(w);
@@ -170,7 +170,7 @@
 openiwin(nrow, label)
 char *label;
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if ((w = wwopen(0, nrow, wwncol, 2, 0, 0)) == 0)
 		return 0;
@@ -198,7 +198,7 @@
 }
 
 closewin1(w)
-register struct ww *w;
+struct ww *w;
 {
 	if (w == selwin)
 		selwin = 0;
@@ -220,7 +220,7 @@
  * Always reframe() if doreframe is true.
  */
 front(w, doreframe)
-register struct ww *w;
+struct ww *w;
 char doreframe;
 {
 	if (w->ww_back != (isfg(w) ? framewin : fgwin) && !wwvisible(w)) {
@@ -237,7 +237,7 @@
  * For normal windows, we put it behind the current window.
  */
 addwin(w, fg)
-register struct ww *w;
+struct ww *w;
 char fg;
 {
 	if (fg) {
@@ -253,7 +253,7 @@
  * Delete a window.
  */
 deletewin(w)
-register struct ww *w;
+struct ww *w;
 {
 	if (fgwin == w)
 		fgwin = w->ww_back;
@@ -262,7 +262,7 @@
 
 reframe()
 {
-	register struct ww *w;
+	struct ww *w;
 
 	wwunframe(framewin);
 	for (w = wwhead.ww_back; w != &wwhead; w = w->ww_back)
@@ -273,7 +273,7 @@
 }
 
 labelwin(w)
-register struct ww *w;
+struct ww *w;
 {
 	int mode = w == selwin ? WWM_REV : 0;
 
@@ -299,7 +299,7 @@
 }
 
 stopwin(w)
-	register struct ww *w;
+	struct ww *w;
 {
 	if (w->ww_pty >= 0 && w->ww_ispty && wwstoptty(w->ww_pty) < 0)
 		error("Can't stop output: %s.", wwerror());
@@ -308,7 +308,7 @@
 }
 
 startwin(w)
-	register struct ww *w;
+	struct ww *w;
 {
 	if (w->ww_pty >= 0 && w->ww_ispty && wwstarttty(w->ww_pty) < 0)
 		error("Can't start output: %s.", wwerror());
@@ -317,7 +317,7 @@
 }
 
 sizewin(w, nrow, ncol)
-register struct ww *w;
+struct ww *w;
 {
 	struct ww *back = w->ww_back;
 
@@ -337,7 +337,7 @@
 }
 
 more(w, always)
-register struct ww *w;
+struct ww *w;
 char always;
 {
 	int c;
@@ -353,7 +353,7 @@
 }
 
 waitnl1(w, prompt)
-register struct ww *w;
+struct ww *w;
 char *prompt;
 {
 	char uc = w->ww_unctrl;
Index: usr.bin/window/wwadd.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwadd.c,v
retrieving revision 1.2
diff -u -r1.2 wwadd.c
--- usr.bin/window/wwadd.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwadd.c	24 Aug 2008 10:23:58 -0000
@@ -44,11 +44,11 @@
  * Stick w1 behind w2.
  */
 wwadd(w1, w2)
-register struct ww *w1;
+struct ww *w1;
 struct ww *w2;
 {
-	register i;
-	register struct ww *w;
+	int i;
+	struct ww *w;
 
 	w1->ww_order = w2->ww_order + 1;
 	w1->ww_back = w2;
@@ -59,9 +59,9 @@
 	for (w = w1->ww_forw; w != &wwhead; w = w->ww_forw)
 		w->ww_order++;
 	for (i = w1->ww_i.t; i < w1->ww_i.b; i++) {
-		register j;
-		register char *smap = wwsmap[i];
-		register char *win = w1->ww_win[i];
+		int j;
+		char *smap = wwsmap[i];
+		char *win = w1->ww_win[i];
 		union ww_char *ns = wwns[i];
 		union ww_char *buf = w1->ww_buf[i];
 		int nvis = 0;
Index: usr.bin/window/wwalloc.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwalloc.c,v
retrieving revision 1.2
diff -u -r1.2 wwalloc.c
--- usr.bin/window/wwalloc.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwalloc.c	24 Aug 2008 10:24:09 -0000
@@ -44,8 +44,8 @@
 char **
 wwalloc(row, col, nrow, ncol, size)
 {
-	register char *p, **pp;
-	register int i;
+	char *p, **pp;
+	int i;
 
 	/* fast, call malloc only once */
 	pp = (char **)
@@ -66,7 +66,7 @@
 }
 
 wwfree(p, row)
-register char **p;
+char **p;
 {
 	free((char *)(p + row));
 }
Index: usr.bin/window/wwbox.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwbox.c,v
retrieving revision 1.2
diff -u -r1.2 wwbox.c
--- usr.bin/window/wwbox.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwbox.c	24 Aug 2008 10:24:34 -0000
@@ -42,12 +42,12 @@
 #include "tt.h"
 
 wwbox(w, r, c, nr, nc)
-register struct ww *w;
-register r, c;
+struct ww *w;
+int r, c;
 int nr, nc;
 {
-	register r1, c1;
-	register i;
+	int r1, c1;
+	int i;
 
 	r1 = r + nr - 1;
 	c1 = c + nc - 1;
Index: usr.bin/window/wwchild.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwchild.c,v
retrieving revision 1.2
diff -u -r1.2 wwchild.c
--- usr.bin/window/wwchild.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwchild.c	24 Aug 2008 10:24:47 -0000
@@ -47,7 +47,7 @@
 wwchild()
 {
 	int olderrno;
-	register struct ww **wp;
+	struct ww **wp;
 	union wait w;
 	int pid;
 	char collected = 0;
Index: usr.bin/window/wwclose.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwclose.c,v
retrieving revision 1.2
diff -u -r1.2 wwclose.c
--- usr.bin/window/wwclose.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwclose.c	24 Aug 2008 10:24:57 -0000
@@ -41,7 +41,7 @@
 #include "ww.h"
 
 wwclose(w)
-register struct ww *w;
+struct ww *w;
 {
 	wwindex[w->ww_index] = 0;
 	if (w->ww_pty >= 0)
Index: usr.bin/window/wwclreol.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwclreol.c,v
retrieving revision 1.2
diff -u -r1.2 wwclreol.c
--- usr.bin/window/wwclreol.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwclreol.c	24 Aug 2008 10:25:21 -0000
@@ -46,17 +46,17 @@
  * If cleared is true, then the screen line has already been cleared.
  */
 wwclreol1(w, row, col, cleared)
-register struct ww *w;
+struct ww *w;
 int row, col;
 char cleared;
 {
-	register i;
+	int i;
 
 	/*
 	 * Clear the buffer right off
 	 */
 	{
-		register union ww_char *buf;
+		union ww_char *buf;
 
 		buf = &w->ww_buf[row][col];
 		for (i = w->ww_b.r - col; --i >= 0;)
@@ -77,8 +77,8 @@
 	 * Now fix wwns.
 	 */
 	{
-		register union ww_char *s;
-		register char *smap, *win;
+		union ww_char *s;
+		char *smap, *win;
 
 		i = col;
 		smap = &wwsmap[row][i];
Index: usr.bin/window/wwclreos.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwclreos.c,v
retrieving revision 1.2
diff -u -r1.2 wwclreos.c
--- usr.bin/window/wwclreos.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwclreos.c	24 Aug 2008 10:25:41 -0000
@@ -42,9 +42,9 @@
 #include "tt.h"
 
 wwclreos(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 
 	wwclreol(w, row, col);
 	for (i = row + 1; i < w->ww_b.b; i++)
Index: usr.bin/window/wwcursor.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwcursor.c,v
retrieving revision 1.2
diff -u -r1.2 wwcursor.c
--- usr.bin/window/wwcursor.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwcursor.c	24 Aug 2008 10:26:04 -0000
@@ -41,9 +41,9 @@
 #include "ww.h"
 
 wwcursor(w, on)
-register struct ww *w;
+struct ww *w;
 {
-	register char *win;
+	char *win;
 
 	if (on) {
 		if (w->ww_hascursor)
@@ -72,11 +72,11 @@
 }
 
 wwsetcursormodes(new)
-register new;
+int new;
 {
-	register i;
-	register struct ww *w;
-	register old = wwcursormodes;
+	int i;
+	struct ww *w;
+	int old = wwcursormodes;
 
 	new &= wwavailmodes;
 	if (new == wwcursormodes)
Index: usr.bin/window/wwdelchar.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwdelchar.c,v
retrieving revision 1.2
diff -u -r1.2 wwdelchar.c
--- usr.bin/window/wwdelchar.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwdelchar.c	24 Aug 2008 10:26:31 -0000
@@ -42,16 +42,16 @@
 #include "tt.h"
 
 wwdelchar(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 	int nvis;
 
 	/*
 	 * First, shift the line.
 	 */
 	{
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		p = &w->ww_buf[row][col];
 		q = p + 1;
@@ -74,10 +74,10 @@
 	 * Now find out how much is actually changed, and fix wwns.
 	 */
 	{
-		register union ww_char *buf;
-		register char *win;
-		register union ww_char *ns;
-		register char *smap;
+		union ww_char *buf;
+		char *win;
+		union ww_char *ns;
+		char *smap;
 		char touched;
 
 		nvis = 0;
@@ -111,7 +111,7 @@
 	 * Can/Should we use delete character?
 	 */
 	if (tt.tt_delchar != 0 && nvis > (wwncol - col) / 2) {
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		xxdelchar(row, col);
 		p = &wwos[row][col];
Index: usr.bin/window/wwdelete.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwdelete.c,v
retrieving revision 1.2
diff -u -r1.2 wwdelete.c
--- usr.bin/window/wwdelete.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwdelete.c	24 Aug 2008 10:27:06 -0000
@@ -44,15 +44,15 @@
  * Pull w free from the cover list.
  */
 wwdelete(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j;
-		register char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
-		register int nchanged = 0;
+		int j;
+		char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
+		int nchanged = 0;
 
 		for (j = w->ww_i.l; j < w->ww_i.r; j++)
 			if (smap[j] == w->ww_index) {
@@ -65,7 +65,7 @@
 	}
 
 	{
-		register struct ww *wp;
+		struct ww *wp;
 
 		for (wp = w->ww_forw; wp != &wwhead; wp = wp->ww_forw)
 			wp->ww_order--;
@@ -81,7 +81,7 @@
 }
 
 wwdelete1(w, t, b, l, r)
-register struct ww *w;
+struct ww *w;
 {
 	int i;
 	int tt, bb, ll, rr;
@@ -99,11 +99,11 @@
 		goto again;
 	}
 	for (i = tt; i < bb; i++) {
-		register j;
-		register char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
-		register char *win = w->ww_win[i];
-		register union ww_char *buf = w->ww_buf[i];
+		int j;
+		char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
+		char *win = w->ww_win[i];
+		union ww_char *buf = w->ww_buf[i];
 		int nvis = w->ww_nvis[i];
 		int nchanged = 0;
 
Index: usr.bin/window/wwdelline.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwdelline.c,v
retrieving revision 1.2
diff -u -r1.2 wwdelline.c
--- usr.bin/window/wwdelline.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwdelline.c	24 Aug 2008 10:27:26 -0000
@@ -41,12 +41,12 @@
 #include "ww.h"
 
 wwdelline(w, row)
-register struct ww *w;
+struct ww *w;
 int row;
 {
-	register i;
-	register union ww_char **cpp, **cqq;
-	register union ww_char *cp;
+	int i;
+	union ww_char **cpp, **cqq;
+	union ww_char *cp;
 	int row1, row2;
 	char deleted;
 	int visible;
Index: usr.bin/window/wwdump.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwdump.c,v
retrieving revision 1.2
diff -u -r1.2 wwdump.c
--- usr.bin/window/wwdump.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwdump.c	24 Aug 2008 10:27:48 -0000
@@ -45,9 +45,9 @@
 static char cmap[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 wwdumpwin(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i, j;
+	int i, j;
 
 	tt.tt_nmodes = 0;
 	(*tt.tt_clear)();
@@ -59,9 +59,9 @@
 }
 
 wwdumpnvis(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 	char buf[20];
 
 	tt.tt_nmodes = 0;
@@ -75,7 +75,7 @@
 
 wwdumpsmap()
 {
-	register i, j;
+	int i, j;
 
 	tt.tt_nmodes = 0;
 	(*tt.tt_clear)();
@@ -88,7 +88,7 @@
 
 wwdumpns()
 {
-	register i, j;
+	int i, j;
 
 	(*tt.tt_clear)();
 	for (i = 0; i < wwnrow; i++) {
@@ -102,7 +102,7 @@
 
 wwdumpos()
 {
-	register i, j;
+	int i, j;
 
 	(*tt.tt_clear)();
 	for (i = 0; i < wwnrow; i++) {
Index: usr.bin/window/wwenviron.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwenviron.c,v
retrieving revision 1.3
diff -u -r1.3 wwenviron.c
--- usr.bin/window/wwenviron.c	12 Jan 2006 13:43:11 -0000	1.3
+++ usr.bin/window/wwenviron.c	24 Aug 2008 10:28:06 -0000
@@ -48,9 +48,9 @@
  * Set up the environment of this process to run in window 'wp'.
  */
 wwenviron(wp)
-register struct ww *wp;
+struct ww *wp;
 {
-	register i;
+	int i;
 #ifndef TIOCSCTTY
 	int pgrp = getpid();
 #endif
Index: usr.bin/window/wwflush.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwflush.c,v
retrieving revision 1.2
diff -u -r1.2 wwflush.c
--- usr.bin/window/wwflush.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwflush.c	24 Aug 2008 10:28:26 -0000
@@ -44,7 +44,7 @@
 
 wwflush()
 {
-	register row, col;
+	int row, col;
 
 	if ((row = wwcursorrow) < 0)
 		row = 0;
@@ -92,10 +92,10 @@
 }
 
 wwcopyscreen(s1, s2)
-	register union ww_char **s1, **s2;
+	union ww_char **s1, **s2;
 {
-	register i;
-	register s = wwncol * sizeof **s1;
+	int i;
+	int s = wwncol * sizeof **s1;
 
 	for (i = wwnrow; --i >= 0;)
 		bcopy((char *) *s1++, (char *) *s2++, s);
Index: usr.bin/window/wwframe.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwframe.c,v
retrieving revision 1.2
diff -u -r1.2 wwframe.c
--- usr.bin/window/wwframe.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwframe.c	24 Aug 2008 10:28:51 -0000
@@ -45,15 +45,15 @@
 	w1->ww_fmap || w1->ww_order > (w)->ww_order)
 
 wwframe(w, wframe)
-register struct ww *w;
+struct ww *w;
 struct ww *wframe;
 {
-	register r, c;
+	int r, c;
 	char a1, a2, a3;
 	char b1, b2, b3;
-	register char *smap;
-	register code;
-	register struct ww *w1;
+	char *smap;
+	int code;
+	struct ww *w1;
 
 	if (w->ww_w.t > 0) {
 		r = w->ww_w.t - 1;
@@ -195,12 +195,12 @@
 }
 
 wwframec(f, r, c, code)
-register struct ww *f;
-register r, c;
+struct ww *f;
+int r, c;
 char code;
 {
 	char oldcode;
-	register char *smap;
+	char *smap;
 
 	if (r < f->ww_i.t || r >= f->ww_i.b || c < f->ww_i.l || c >= f->ww_i.r)
 		return;
@@ -208,7 +208,7 @@
 	smap = &wwsmap[r][c];
 
 	{
-		register struct ww *w;
+		struct ww *w;
 
 		w = wwindex[*smap];
 		if (w->ww_order > f->ww_order) {
@@ -219,7 +219,7 @@
 	}
 
 	if (f->ww_fmap != 0) {
-		register char *fmap;
+		char *fmap;
 
 		fmap = &f->ww_fmap[r][c];
 		oldcode = *fmap;
@@ -230,14 +230,14 @@
 	} else
 		oldcode = 0;
 	{
-		register char *win = &f->ww_win[r][c];
+		char *win = &f->ww_win[r][c];
 
 		if (*win == WWM_GLS && *smap == f->ww_index)
 			f->ww_nvis[r]++;
 		*win &= ~WWM_GLS;
 	}
 	if (oldcode != code && (code & WWF_LABEL) == 0) {
-		register short frame;
+		short frame;
 
 		frame = tt.tt_frame[code & WWF_MASK];
 		f->ww_buf[r][c].c_w = frame;
Index: usr.bin/window/wwgets.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwgets.c,v
retrieving revision 1.3
diff -u -r1.3 wwgets.c
--- usr.bin/window/wwgets.c	7 May 2005 23:20:43 -0000	1.3
+++ usr.bin/window/wwgets.c	24 Aug 2008 10:29:11 -0000
@@ -46,10 +46,10 @@
 wwgets(buf, n, w)
 char *buf;
 int n;
-register struct ww *w;
+struct ww *w;
 {
-	register char *p = buf;
-	register int c;
+	char *p = buf;
+	int c;
 	char uc = w->ww_unctrl;
 
 	w->ww_unctrl = 0;
@@ -106,7 +106,7 @@
 rub(c, w)
 struct ww *w;
 {
-	register i;
+	int i;
 
 	for (i = isctrl(c) ? strlen(unctrl(c)) : 1; --i >= 0;)
 		(void) wwwrite(w, "\b \b", 3);
Index: usr.bin/window/wwinit.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwinit.c,v
retrieving revision 1.3
diff -u -r1.3 wwinit.c
--- usr.bin/window/wwinit.c	12 Jan 2006 13:43:11 -0000	1.3
+++ usr.bin/window/wwinit.c	24 Aug 2008 10:29:34 -0000
@@ -47,7 +47,7 @@
 
 wwinit()
 {
-	register i, j;
+	int i, j;
 	char *kp;
 	int s;
 
@@ -333,12 +333,12 @@
 }
 
 wwaddcap(cap, kp)
-	register char *cap;
-	register char **kp;
+	char *cap;
+	char **kp;
 {
 	char tbuf[512];
 	char *tp = tbuf;
-	register char *str, *p;
+	char *str, *p;
 
 	if ((str = tgetstr(cap, &tp)) != 0) {
 		while (*(*kp)++ = *cap++)
@@ -355,8 +355,8 @@
 }
 
 wwaddcap1(cap, kp)
-	register char *cap;
-	register char **kp;
+	char *cap;
+	char **kp;
 {
 	while (*(*kp)++ = *cap++)
 		;
@@ -364,12 +364,12 @@
 }
 
 wwaddcap2(cap, kp)
-	register char *cap;
-	register char **kp;
+	char *cap;
+	char **kp;
 {
 	char tbuf[512];
 	char *tp = tbuf;
-	register char *str, *p;
+	char *str, *p;
 
 	if ((str = tgetstr(cap, &tp)) != 0) {
 		/* we don't support vt100's application key mode, remap */
@@ -390,7 +390,7 @@
 
 wwstart()
 {
-	register i;
+	int i;
 
 	(void) wwsettty(0, &wwnewtty);
 	signal(SIGIO, wwrint);
@@ -401,7 +401,7 @@
 
 wwstart1()
 {
-	register i, j;
+	int i, j;
 
 	for (i = 0; i < wwnrow; i++)
 		for (j = 0; j < wwncol; j++) {
@@ -420,7 +420,7 @@
  */
 wwreset()
 {
-	register i;
+	int i;
 
 	xxreset();
 	for (i = 0; i < wwnrow; i++)
Index: usr.bin/window/wwinschar.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwinschar.c,v
retrieving revision 1.2
diff -u -r1.2 wwinschar.c
--- usr.bin/window/wwinschar.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwinschar.c	24 Aug 2008 10:29:55 -0000
@@ -42,10 +42,10 @@
 #include "tt.h"
 
 wwinschar(w, row, col, c, m)
-register struct ww *w;
+struct ww *w;
 unsigned char c, m;
 {
-	register i;
+	int i;
 	int nvis;
 	short x = c | m << WWC_MSHIFT;
 
@@ -53,7 +53,7 @@
 	 * First, shift the line.
 	 */
 	{
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		p = &w->ww_buf[row][w->ww_b.r];
 		q = p - 1;
@@ -76,10 +76,10 @@
 	 * Now find out how much is actually changed, and fix wwns.
 	 */
 	{
-		register union ww_char *buf;
-		register char *win;
-		register union ww_char *ns;
-		register char *smap;
+		union ww_char *buf;
+		char *win;
+		union ww_char *ns;
+		char *smap;
 		char touched;
 
 		nvis = 0;
@@ -113,7 +113,7 @@
 	 * Can/Should we use delete character?
 	 */
 	if ((tt.tt_inschar || tt.tt_insspace) && nvis > (wwncol - col) / 2) {
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		if (tt.tt_inschar)
 			xxinschar(row, col, c, m);
Index: usr.bin/window/wwinsline.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwinsline.c,v
retrieving revision 1.2
diff -u -r1.2 wwinsline.c
--- usr.bin/window/wwinsline.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwinsline.c	24 Aug 2008 10:30:11 -0000
@@ -41,12 +41,12 @@
 #include "ww.h"
 
 wwinsline(w, row)
-register struct ww *w;
+struct ww *w;
 int row;
 {
-	register i;
-	register union ww_char **cpp, **cqq;
-	register union ww_char *cp;
+	int i;
+	union ww_char **cpp, **cqq;
+	union ww_char *cp;
 	int row1, row2;
 	char deleted;
 	int visible;
Index: usr.bin/window/wwiomux.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwiomux.c,v
retrieving revision 1.3
diff -u -r1.3 wwiomux.c
--- usr.bin/window/wwiomux.c	19 May 2008 10:19:49 -0000	1.3
+++ usr.bin/window/wwiomux.c	24 Aug 2008 10:30:29 -0000
@@ -61,10 +61,10 @@
  */
 wwiomux()
 {
-	register struct ww *w;
+	struct ww *w;
 	fd_set imask;
-	register n;
-	register char *p;
+	int n;
+	char *p;
 	char c;
 	struct timeval tv;
 	char noblock = 0;
Index: usr.bin/window/wwlabel.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwlabel.c,v
retrieving revision 1.2
diff -u -r1.2 wwlabel.c
--- usr.bin/window/wwlabel.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwlabel.c	24 Aug 2008 10:30:45 -0000
@@ -52,13 +52,13 @@
 char *l;
 {
 	int row;
-	register j;
+	int j;
 	int jj;
-	register char *win;
-	register union ww_char *buf;
-	register union ww_char *ns;
-	register char *fmap;
-	register char *smap;
+	char *win;
+	union ww_char *buf;
+	union ww_char *ns;
+	char *fmap;
+	char *smap;
 	char touched;
 	unsigned char *p;
 	static unsigned char cbuf[2];
Index: usr.bin/window/wwmisc.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwmisc.c,v
retrieving revision 1.2
diff -u -r1.2 wwmisc.c
--- usr.bin/window/wwmisc.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwmisc.c	24 Aug 2008 10:31:02 -0000
@@ -46,10 +46,10 @@
  * Sufficient but not necessary test for total visibility.
  */
 wwvisible(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
-	register nvis = 0;
+	int i;
+	int nvis = 0;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++)
 		nvis += w->ww_nvis[i];
Index: usr.bin/window/wwmove.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwmove.c,v
retrieving revision 1.2
diff -u -r1.2 wwmove.c
--- usr.bin/window/wwmove.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwmove.c	24 Aug 2008 10:31:20 -0000
@@ -44,10 +44,10 @@
  * Move a window.  Should be unattached.
  */
 wwmove(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register dr, dc;
-	register i;
+	int dr, dc;
+	int i;
 
 	dr = row - w->ww_w.t;
 	dc = col - w->ww_w.l;
@@ -82,9 +82,9 @@
 	}
 	w->ww_nvis -= dr;
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j = w->ww_i.l;
-		register char *win = &w->ww_win[i][j];
-		register char *smap = &wwsmap[i][j];
+		int j = w->ww_i.l;
+		char *win = &w->ww_win[i][j];
+		char *smap = &wwsmap[i][j];
 		int nvis = 0;
 
 		for (; j < w->ww_i.r; j++, win++, smap++)
Index: usr.bin/window/wwopen.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwopen.c,v
retrieving revision 1.2
diff -u -r1.2 wwopen.c
--- usr.bin/window/wwopen.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwopen.c	24 Aug 2008 10:31:44 -0000
@@ -47,8 +47,8 @@
 struct ww *
 wwopen(flags, nrow, ncol, row, col, nline)
 {
-	register struct ww *w;
-	register i, j;
+	struct ww *w;
+	int i, j;
 	char m;
 	short nvis;
 
Index: usr.bin/window/wwpty.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwpty.c,v
retrieving revision 1.2
diff -u -r1.2 wwpty.c
--- usr.bin/window/wwpty.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwpty.c	24 Aug 2008 10:31:54 -0000
@@ -45,9 +45,9 @@
 #endif
 
 wwgetpty(w)
-register struct ww *w;
+struct ww *w;
 {
-	register char c, *p;
+	char c, *p;
 	int tty;
 	int on = 1;
 #define PTY "/dev/XtyXX"
Index: usr.bin/window/wwputs.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwputs.c,v
retrieving revision 1.2
diff -u -r1.2 wwputs.c
--- usr.bin/window/wwputs.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwputs.c	24 Aug 2008 10:32:05 -0000
@@ -41,10 +41,10 @@
 #include "ww.h"
 
 wwputs(s, w)
-register char *s;
+char *s;
 struct ww *w;
 {
-	register char *p = s;
+	char *p = s;
 
 	while (*p++)
 		;
Index: usr.bin/window/wwredraw.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwredraw.c,v
retrieving revision 1.2
diff -u -r1.2 wwredraw.c
--- usr.bin/window/wwredraw.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwredraw.c	24 Aug 2008 10:32:23 -0000
@@ -43,8 +43,8 @@
 
 wwredraw()
 {
-	register i, j;
-	register union ww_char *os;
+	int i, j;
+	union ww_char *os;
 
 	xxclear();
 	for (i = 0; i < wwnrow; i++) {
Index: usr.bin/window/wwredrawwin.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwredrawwin.c,v
retrieving revision 1.2
diff -u -r1.2 wwredrawwin.c
--- usr.bin/window/wwredrawwin.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwredrawwin.c	24 Aug 2008 10:32:41 -0000
@@ -41,15 +41,15 @@
 #include "ww.h"
 
 wwredrawwin1(w, row1, row2, offset)
-register struct ww *w;
+struct ww *w;
 int row1, row2, offset;
 {
 	int row;
-	register col;
-	register char *smap;
-	register union ww_char *buf;
-	register char *win;
-	register union ww_char *ns;
+	int col;
+	char *smap;
+	union ww_char *buf;
+	char *win;
+	union ww_char *ns;
 	int x;
 	int nchanged;
 
Index: usr.bin/window/wwrint.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwrint.c,v
retrieving revision 1.2
diff -u -r1.2 wwrint.c
--- usr.bin/window/wwrint.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwrint.c	24 Aug 2008 10:32:54 -0000
@@ -57,7 +57,7 @@
 void
 wwrint()
 {
-	register n;
+	int n;
 
 	if (wwibp == wwibq)
 		wwibp = wwibq = wwib;
Index: usr.bin/window/wwscroll.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwscroll.c,v
retrieving revision 1.2
diff -u -r1.2 wwscroll.c
--- usr.bin/window/wwscroll.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwscroll.c	24 Aug 2008 10:33:19 -0000
@@ -42,11 +42,11 @@
 #include "tt.h"
 
 wwscroll(w, n)
-register struct ww *w;
+struct ww *w;
 int n;
 {
-	register dir;
-	register top;
+	int dir;
+	int top;
 
 	if (n == 0)
 		return;
@@ -78,11 +78,11 @@
  * And don't redraw 'leaveit' lines.
  */
 wwscroll1(w, row1, row2, dir, leaveit)
-register struct ww *w;
+struct ww *w;
 int row1, row2, dir;
 int leaveit;
 {
-	register i;
+	int i;
 	int row1x, row2x;
 	int nvis;
 	int nvismax;
@@ -127,8 +127,8 @@
 	 * Fix up the old screen.
 	 */
 	{
-		register union ww_char *tmp;
-		register union ww_char **cpp, **cqq;
+		union ww_char *tmp;
+		union ww_char **cpp, **cqq;
 
 		if (dir > 0) {
 			cpp = &wwos[row1x];
@@ -159,8 +159,8 @@
 		 */
 		if (dir > 0) {
 			{
-				register union ww_char *tmp;
-				register union ww_char **cpp, **cqq;
+				union ww_char *tmp;
+				union ww_char **cpp, **cqq;
 
 				cpp = &wwns[row1x];
 				cqq = cpp + 1;
@@ -170,7 +170,7 @@
 				*cpp = tmp;
 			}
 			if (scrolled) {
-				register char *p, *q;
+				char *p, *q;
 
 				p = &wwtouched[row1x];
 				q = p + 1;
@@ -178,7 +178,7 @@
 					*p++ = *q++;
 				*p |= WWU_TOUCHED;
 			} else {
-				register char *p;
+				char *p;
 
 				p = &wwtouched[row1x];
 				for (i = row2x - row1x; --i >= 0;)
@@ -188,8 +188,8 @@
 			wwredrawwin1(w, row2x - 1, row2 - leaveit, dir);
 		} else {
 			{
-				register union ww_char *tmp;
-				register union ww_char **cpp, **cqq;
+				union ww_char *tmp;
+				union ww_char **cpp, **cqq;
 
 				cpp = &wwns[row2x];
 				cqq = cpp - 1;
@@ -199,7 +199,7 @@
 				*cqq = tmp;
 			}
 			if (scrolled) {
-				register char *p, *q;
+				char *p, *q;
 
 				p = &wwtouched[row2x];
 				q = p - 1;
@@ -207,7 +207,7 @@
 					*--p = *--q;
 				*q |= WWU_TOUCHED;
 			} else {
-				register char *p;
+				char *p;
 
 				p = &wwtouched[row1x];
 				for (i = row2x - row1x; --i >= 0;)
@@ -218,7 +218,7 @@
 		}
 	} else {
 		if (scrolled) {
-			register char *p;
+			char *p;
 
 			p = &wwtouched[row1x];
 			for (i = row2x - row1x; --i >= 0;)
Index: usr.bin/window/wwsize.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwsize.c,v
retrieving revision 1.2
diff -u -r1.2 wwsize.c
--- usr.bin/window/wwsize.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwsize.c	24 Aug 2008 10:33:39 -0000
@@ -45,9 +45,9 @@
  * Resize a window.  Should be unattached.
  */
 wwsize(w, nrow, ncol)
-register struct ww *w;
+struct ww *w;
 {
-	register i, j;
+	int i, j;
 	int nline;
 	union ww_char **buf = 0;
 	char **win = 0;
Index: usr.bin/window/wwspawn.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwspawn.c,v
retrieving revision 1.2
diff -u -r1.2 wwspawn.c
--- usr.bin/window/wwspawn.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwspawn.c	24 Aug 2008 10:33:47 -0000
@@ -46,7 +46,7 @@
  * So we have to be sneaky about error reporting.
  */
 wwspawn(wp, file, argv)
-register struct ww *wp;
+struct ww *wp;
 char *file;
 char **argv;
 {
Index: usr.bin/window/wwtty.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwtty.c,v
retrieving revision 1.2
diff -u -r1.2 wwtty.c
--- usr.bin/window/wwtty.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwtty.c	24 Aug 2008 10:33:57 -0000
@@ -46,7 +46,7 @@
 #endif
 
 wwgettty(d, t)
-register struct ww_tty *t;
+struct ww_tty *t;
 {
 #ifdef OLD_TTY
 	if (ioctl(d, TIOCGETP, (char *)&t->ww_sgttyb) < 0)
@@ -77,7 +77,7 @@
  * it changes, to avoid unnecessary flushing of typeahead.
  */
 wwsettty(d, t)
-register struct ww_tty *t;
+struct ww_tty *t;
 {
 #ifdef OLD_TTY
 	int i;
Index: usr.bin/window/wwunframe.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwunframe.c,v
retrieving revision 1.2
diff -u -r1.2 wwunframe.c
--- usr.bin/window/wwunframe.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwunframe.c	24 Aug 2008 10:34:28 -0000
@@ -41,16 +41,16 @@
 #include "ww.h"
 
 wwunframe(w)
-register struct ww *w;
+struct ww *w;
 {
 	int i;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j;
-		register char *win = w->ww_win[i];
-		register char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
-		register char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
+		int j;
+		char *win = w->ww_win[i];
+		char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
+		char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
 		int nchanged = 0;
 
 		for (j = w->ww_i.l; j < w->ww_i.r; j++) {
Index: usr.bin/window/wwupdate.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwupdate.c,v
retrieving revision 1.2
diff -u -r1.2 wwupdate.c
--- usr.bin/window/wwupdate.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwupdate.c	24 Aug 2008 10:35:11 -0000
@@ -44,7 +44,7 @@
 wwupdate1(top, bot)
 {
 	int i;
-	register j;
+	int j;
 	char *touched;
 	struct ww_update *upd;
 	char check_clreos = 0;
@@ -52,8 +52,8 @@
 
 	wwnupdate++;
 	{
-		register char *t1 = wwtouched + top, *t2 = wwtouched + bot;
-		register n;
+		char *t1 = wwtouched + top, *t2 = wwtouched + bot;
+		int n;
 
 		while (!*t1++)
 			if (t1 == t2)
@@ -88,10 +88,10 @@
 	for (i = scan_top, touched = &wwtouched[i], upd = &wwupd[i];
 	     i < scan_bot;
 	     i++, touched++, upd++) {
-		register gain = 0;
-		register best_gain = 0;
-		register best_col;
-		register union ww_char *ns, *os;
+		int gain = 0;
+		int best_gain = 0;
+		int best_col;
+		union ww_char *ns, *os;
 
 		if (wwinterrupt())
 			return;
@@ -127,11 +127,11 @@
 		upd->gain = gain;
 	}
 	if (check_clreos) {
-		register struct ww_update *u;
-		register gain = 0;
-		register best_gain = 0;
+		struct ww_update *u;
+		int gain = 0;
+		int best_gain = 0;
 		int best_row;
-		register simple_gain = 0;
+		int simple_gain = 0;
 		char didit = 0;
 
 		/*
@@ -143,7 +143,7 @@
 		 * undefined when u->best_gain is 0 so we can't use it.
 		 */
 		for (j = scan_bot - 1, u = wwupd + j; j >= top; j--, u--) {
-			register g = gain + u->best_gain;
+			int g = gain + u->best_gain;
 
 			if (g > best_gain) {
 				best_gain = g;
@@ -173,7 +173,7 @@
 			wwnupdclreosline += wwnrow - i;
 			u = wwupd + i;
 			while (i < scan_bot) {
-				register union ww_char *os = &wwos[i][j];
+				union ww_char *os = &wwos[i][j];
 
 				for (j = wwncol - j; --j >= 0;)
 					os++->c_w = ' ';
@@ -187,7 +187,7 @@
 simple:
 	for (i = top, touched = &wwtouched[i], upd = &wwupd[i]; i < bot;
 	     i++, touched++, upd++) {
-		register union ww_char *os, *ns;
+		union ww_char *os, *ns;
 		char didit;
 
 		if (!*touched)
@@ -205,10 +205,10 @@
 		ns = wwns[i];
 		os = wwos[i];
 		for (j = 0; j < wwncol;) {
-			register char *p, *q;
+			char *p, *q;
 			char m;
 			int c;
-			register n;
+			int n;
 			char buf[512];			/* > wwncol */
 			union ww_char lastc;
 
Index: usr.bin/window/wwwrite.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/wwwrite.c,v
retrieving revision 1.2
diff -u -r1.2 wwwrite.c
--- usr.bin/window/wwwrite.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/wwwrite.c	24 Aug 2008 10:35:35 -0000
@@ -57,8 +57,8 @@
  * to avoid recursion, which might be a better idea.
  */
 wwwrite(w, p, n)
-register struct ww *w;
-register unsigned char *p;
+struct ww *w;
+unsigned char *p;
 int n;
 {
 	char hascursor;
@@ -81,8 +81,8 @@
 		}
 		if (w->ww_wstate == 0 &&
 		    (isprt(*p) || w->ww_unctrl && isunctrl(*p))) {
-			register i;
-			register union ww_char *bp;
+			int i;
+			union ww_char *bp;
 			int col, col1;
 
 			if (w->ww_insert) {	/* this is very slow */
@@ -111,7 +111,7 @@
 					q = s;
 					r = 0;
 				} else if (*p == '\t') {
-					register tmp = 8 - (i - w->ww_w.l & 7);
+					int tmp = 8 - (i - w->ww_w.l & 7);
 					p++;
 					i += tmp;
 					bp += tmp;
@@ -131,9 +131,9 @@
 			w->ww_cur.c = i;
 			if (w->ww_cur.r >= w->ww_i.t
 			    && w->ww_cur.r < w->ww_i.b) {
-				register union ww_char *ns = wwns[w->ww_cur.r];
-				register char *smap = &wwsmap[w->ww_cur.r][col];
-				register char *win = w->ww_win[w->ww_cur.r];
+				union ww_char *ns = wwns[w->ww_cur.r];
+				char *smap = &wwsmap[w->ww_cur.r][col];
+				char *win = w->ww_win[w->ww_cur.r];
 				int nchanged = 0;
 
 				bp = w->ww_buf[w->ww_cur.r];
Index: usr.bin/window/xx.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/xx.c,v
retrieving revision 1.2
diff -u -r1.2 xx.c
--- usr.bin/window/xx.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/xx.c	24 Aug 2008 10:36:06 -0000
@@ -79,7 +79,7 @@
 
 xxreset1()
 {
-	register struct xx *xp, *xq;
+	struct xx *xp, *xq;
 
 	for (xp = xx_head; xp != 0; xp = xq) {
 		xq = xp->link;
@@ -108,7 +108,7 @@
 struct xx *
 xxalloc()
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	if (xxbufp > xxbufe)
 		abort();
@@ -127,7 +127,7 @@
 }
 
 xxfree(xp)
-	register struct xx *xp;
+	struct xx *xp;
 {
 	xp->link = xx_freelist;
 	xx_freelist = xp;
@@ -135,7 +135,7 @@
 
 xxmove(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp == 0 || xp->cmd != xc_move) {
 		xp = xxalloc();
@@ -147,7 +147,7 @@
 
 xxscroll(dir, top, bot)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_scroll &&
 	    xp->arg1 == top && xp->arg2 == bot &&
@@ -164,7 +164,7 @@
 
 xxinschar(row, col, c, m)
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	xp = xxalloc();
 	xp->cmd = xc_inschar;
@@ -176,7 +176,7 @@
 
 xxinsspace(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_insspace && xp->arg0 == row &&
 	    col >= xp->arg1 && col <= xp->arg1 + xp->arg2) {
@@ -192,7 +192,7 @@
 
 xxdelchar(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_delchar &&
 	    xp->arg0 == row && xp->arg1 == col) {
@@ -208,7 +208,7 @@
 
 xxclear()
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	xxreset1();
 	xp = xxalloc();
@@ -217,7 +217,7 @@
 
 xxclreos(row, col)
 {
-	register struct xx *xp = xxalloc();
+	struct xx *xp = xxalloc();
 
 	xp->cmd = xc_clreos;
 	xp->arg0 = row;
@@ -226,7 +226,7 @@
 
 xxclreol(row, col)
 {
-	register struct xx *xp = xxalloc();
+	struct xx *xp = xxalloc();
 
 	xp->cmd = xc_clreol;
 	xp->arg0 = row;
@@ -236,7 +236,7 @@
 xxwrite(row, col, p, n, m)
 	char *p;
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	if (xxbufp + n + 1 > xxbufe)
 		xxflush(0);
Index: usr.bin/window/xxflush.c
===================================================================
RCS file: /home/dcvs/src/usr.bin/window/xxflush.c,v
retrieving revision 1.2
diff -u -r1.2 xxflush.c
--- usr.bin/window/xxflush.c	17 Jun 2003 04:29:34 -0000	1.2
+++ usr.bin/window/xxflush.c	24 Aug 2008 10:36:26 -0000
@@ -43,9 +43,9 @@
 #include "tt.h"
 
 xxflush(intr)
-	register intr;
+	int intr;
 {
-	register struct xx *xp, *xq;
+	struct xx *xp, *xq;
 
 	for (xp = xx_head; xp != 0 && !(intr && wwinterrupt()); xp = xq) {
 		switch (xp->cmd) {
@@ -97,9 +97,9 @@
 }
 
 xxflush_scroll(xp)
-	register struct xx *xp;
+	struct xx *xp;
 {
-	register struct xx *xq;
+	struct xx *xq;
 
  top:
 	if (xp->arg0 == 0)
Index: usr.sbin/moused/moused.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/moused/moused.c,v
retrieving revision 1.6
diff -u -r1.6 moused.c
--- usr.sbin/moused/moused.c	8 Feb 2008 10:17:40 -0000	1.6
+++ usr.sbin/moused/moused.c	26 Aug 2008 20:02:16 -0000
@@ -3069,7 +3069,7 @@
 }
 
 static void
-mremote_serversetup()
+mremote_serversetup(void)
 {
     struct sockaddr_un ad;
 
Index: usr.sbin/mtest/mtest.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/mtest/mtest.c,v
retrieving revision 1.2
diff -u -r1.2 mtest.c
--- usr.sbin/mtest/mtest.c	17 Jun 2003 04:29:57 -0000	1.2
+++ usr.sbin/mtest/mtest.c	26 Aug 2008 20:02:46 -0000
@@ -20,9 +20,7 @@
 #include <netinet/in.h>
 
 int
-main( argc, argv )
-    int argc;
-    char **argv;
+main(int argc, char **argv)
   {
     int so;
     char line[80];
Index: usr.sbin/rpc.umntall/mounttab.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/rpc.umntall/mounttab.c,v
retrieving revision 1.3
diff -u -r1.3 mounttab.c
--- usr.sbin/rpc.umntall/mounttab.c	2 Apr 2005 20:49:56 -0000	1.3
+++ usr.sbin/rpc.umntall/mounttab.c	24 Aug 2008 22:43:52 -0000
@@ -68,7 +68,7 @@
  * Read mounttab line for line and return struct mtablist.
  */
 int
-read_mtab() {
+read_mtab(void) {
 	struct mtablist **mtabpp, *mtabp;
 	char *hostp, *dirp, *cp;
 	char str[STRSIZ];
@@ -204,7 +204,7 @@
  * Free struct mtablist mtab.
  */
 void
-free_mtab() {
+free_mtab(void) {
 	struct mtablist *mtabp;
 
 	while ((mtabp = mtabhead) != NULL) {
