Some formatting updates (ran the code through indent)

 -Erik

1 files changed, 314 insertions, 350 deletions

diff --git a/loadacm.c b/loadacm.c
index 491bc5ce8..072562f6b 100644
--- a/loadacm.c
+++ b/loadacm.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Derived from
  * mapscrn.c - version 0.92
@@ -23,120 +24,115 @@
 typedef unsigned short unicode;
 
 static long int ctoi(unsigned char *s, int *is_unicode);
-int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]);
-int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int* is_unicode);
-unicode utf8_to_ucs2 (char* buf);
-int screen_map_load(int fd, FILE *fp);
+int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]);
+int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode);
+unicode utf8_to_ucs2(char *buf);
+int screen_map_load(int fd, FILE * fp);
 
 int loadacm_main(int argc, char **argv)
 {
-  int fd;
-  
-  fd = open("/dev/tty", O_RDWR);
-  if (fd < 0) {
-      fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno));
-      return 1;
-    }
-		    
-  if (screen_map_load(fd, stdin))
-    {
-      fprintf(stderr, "Error loading acm: %s\n", strerror(errno));
-      return 1;
-    }
-		  
-  write(fd, "\033(K", 3);
-			
-  return 0;
+	int fd;
+
+	fd = open("/dev/tty", O_RDWR);
+	if (fd < 0) {
+		fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno));
+		return 1;
+	}
+
+	if (screen_map_load(fd, stdin)) {
+		fprintf(stderr, "Error loading acm: %s\n", strerror(errno));
+		return 1;
+	}
+
+	write(fd, "\033(K", 3);
+
+	return 0;
 }
 
-int screen_map_load(int fd, FILE *fp) 
+int screen_map_load(int fd, FILE * fp)
 {
-  struct stat stbuf;
-  unicode wbuf[E_TABSZ];
-  unsigned char buf[E_TABSZ];
-  int parse_failed = 0;
-  int is_unicode;
-
-  if (fstat(fp->_fileno, &stbuf)) 
-    perror("Cannot stat map file"), exit(1);
-
-  /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */
-  if (!(parse_failed = (-1 == uni_screen_map_read_ascii(fp,wbuf,&is_unicode))) ||
-      (S_ISREG(stbuf.st_mode) && 
-       (stbuf.st_size == (sizeof(unicode) * E_TABSZ))))  /* test for binary UTF map by size */
-    {
-      if (parse_failed)
-	{
-	  if (-1 == fseek (fp, 0, SEEK_SET))
-	    {
-	      if (errno == ESPIPE)
-		fprintf (stderr, "16bit screen-map MUST be a regular file.\n"), exit (1);
-	      else
-		perror ("fseek failed reading binary 16bit screen-map"), exit (1);
-	    }
-	  
-	  if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) 
-	    perror("Cannot read [new] map from file"), exit(1);
+	struct stat stbuf;
+	unicode wbuf[E_TABSZ];
+	unsigned char buf[E_TABSZ];
+	int parse_failed = 0;
+	int is_unicode;
+
+	if (fstat(fp->_fileno, &stbuf))
+		perror("Cannot stat map file"), exit(1);
+
+	/* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */
+	if (!
+		(parse_failed =
+		 (-1 == uni_screen_map_read_ascii(fp, wbuf, &is_unicode)))
+|| (S_ISREG(stbuf.st_mode) && (stbuf.st_size == (sizeof(unicode) * E_TABSZ)))) {	/* test for binary UTF map by size */
+		if (parse_failed) {
+			if (-1 == fseek(fp, 0, SEEK_SET)) {
+				if (errno == ESPIPE)
+					fprintf(stderr,
+							"16bit screen-map MUST be a regular file.\n"),
+						exit(1);
+				else
+					perror("fseek failed reading binary 16bit screen-map"),
+						exit(1);
+			}
+
+			if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1)
+				perror("Cannot read [new] map from file"), exit(1);
 #if 0
-	  else
-	    fprintf(stderr, "Input screen-map is binary.\n");
+			else
+				fprintf(stderr, "Input screen-map is binary.\n");
 #endif
+		}
+
+		/* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */
+		/* same if it was binary, ie. if parse_failed */
+		if (parse_failed || is_unicode) {
+			if (ioctl(fd, PIO_UNISCRNMAP, wbuf))
+				perror("PIO_UNISCRNMAP ioctl"), exit(1);
+			else
+				return 0;
+		}
 	}
 
-      /* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */
-      /* same if it was binary, ie. if parse_failed */
-      if (parse_failed || is_unicode)
-	{
-	  if (ioctl(fd,PIO_UNISCRNMAP,wbuf))
-	    perror("PIO_UNISCRNMAP ioctl"), exit(1);
-	  else
-	    return 0;
+	/* rewind... */
+	if (-1 == fseek(fp, 0, SEEK_SET)) {
+		if (errno == ESPIPE)
+			fprintf(stderr,
+					"Assuming 8bit screen-map - MUST be a regular file.\n"),
+				exit(1);
+		else
+			perror("fseek failed assuming 8bit screen-map"), exit(1);
 	}
-    }
-
-  /* rewind... */
-  if (-1 == fseek (fp, 0, SEEK_SET))
-    {
-      if (errno == ESPIPE)
-	fprintf (stderr, "Assuming 8bit screen-map - MUST be a regular file.\n"), exit (1);
-      else
-	perror ("fseek failed assuming 8bit screen-map"), exit (1);
-    }
-  
-  /* ... and try an old 8-bit screen-map */
-  if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp,buf))) ||
-      (S_ISREG(stbuf.st_mode) && 
-       (stbuf.st_size == E_TABSZ)))  /* test for binary old 8-bit map by size */
-    {
-      if (parse_failed)
-	{
-	  if (-1 == fseek (fp, 0, SEEK_SET))
-	    {
-	      if (errno == ESPIPE)
-		/* should not - it succedeed above */
-		fprintf (stderr, "fseek() returned ESPIPE !\n"), exit (1);
-	      else
-		perror ("fseek for binary 8bit screen-map"), exit (1);
-	    }
-	  
-	  if (fread(buf,E_TABSZ,1,fp) != 1) 
-	    perror("Cannot read [old] map from file"), exit(1);
+
+	/* ... and try an old 8-bit screen-map */
+	if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp, buf))) ||
+		(S_ISREG(stbuf.st_mode) && (stbuf.st_size == E_TABSZ))) {	/* test for binary old 8-bit map by size */
+		if (parse_failed) {
+			if (-1 == fseek(fp, 0, SEEK_SET)) {
+				if (errno == ESPIPE)
+					/* should not - it succedeed above */
+					fprintf(stderr, "fseek() returned ESPIPE !\n"),
+						exit(1);
+				else
+					perror("fseek for binary 8bit screen-map"), exit(1);
+			}
+
+			if (fread(buf, E_TABSZ, 1, fp) != 1)
+				perror("Cannot read [old] map from file"), exit(1);
 #if 0
-	  else
-	    fprintf(stderr, "Input screen-map is binary.\n");
+			else
+				fprintf(stderr, "Input screen-map is binary.\n");
 #endif
+		}
+
+		if (ioctl(fd, PIO_SCRNMAP, buf))
+			perror("PIO_SCRNMAP ioctl"), exit(1);
+		else
+			return 0;
+	} else {
+		fprintf(stderr, "Error parsing symbolic map\n");
+		exit(1);
 	}
-      
-      if (ioctl(fd,PIO_SCRNMAP,buf))
-	perror("PIO_SCRNMAP ioctl"), exit(1);
-      else
-	return 0;
-    }
-  else
-    {
-      fprintf(stderr, "Error parsing symbolic map\n");
-      exit(1);
-    }
 }
 
 
@@ -149,116 +145,111 @@ int screen_map_load(int fd, FILE *fp)
  *
  * FIXME: ignores everything after second word
  */
-int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int *is_unicode)
+int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode)
 {
-  char buffer[256];				  /* line buffer reading file */
-  char *p, *q;					  /* 1st + 2nd words in line */
-  int in, on;					  /* the same, as numbers */
-  int tmp_is_unicode;				  /* tmp for is_unicode calculation */
-  int i;					  /* loop index - result holder */
-  int ret_code = 0;				  /* return code */
-  sigset_t sigset, old_sigset;
-  
-  assert (is_unicode);
-  
-  *is_unicode = 0;
-  
-  /* first 128 codes defaults to ASCII */ 
-  for (i=0; i<128; i++) buf[i] = i;
-  /* remaining defaults to replacement char (usually E_TABSZ = 256) */
-  for ( ; i<E_TABSZ; i++) buf[i] = 0xfffd;
-  
-  /* block SIGCHLD */
-  sigemptyset (&sigset);
-  sigaddset (&sigset, SIGCHLD);
-  sigprocmask (SIG_BLOCK, &sigset, &old_sigset);
-
-  do
-    {
-      if (NULL == fgets(buffer, sizeof(buffer),fp))
-	{
-	  if (feof (fp))
-	    break;
-	  else
-	    {
-	      perror ("uni_screen_map_read_ascii() can't read line");
-	      exit (2);
-	    }
-	}
-      
-      /* get "charset-relative charcode", stripping leading spaces */
-      p = strtok(buffer," \t\n");
-
-      /* skip empty lines and comments */
-      if (!p || *p == '#')
-	  continue;
-
-      /* get unicode mapping */
-      q = strtok(NULL," \t\n");
-      if (q) 
-	{
-	  in = ctoi(p, NULL);
-	  if (in < 0 || in > 255)
-	    {
-	      ret_code = -1;
-	      break;
-	    }
-	  
-	  on = ctoi(q, &tmp_is_unicode);
-	  if (in < 0 && on > 65535)
-	    {
-	      ret_code = -1;
-	      break;
-	    }
-	  
-	  *is_unicode |= tmp_is_unicode;
-	  buf[in] = on;
+	char buffer[256];			/* line buffer reading file */
+	char *p, *q;				/* 1st + 2nd words in line */
+	int in, on;					/* the same, as numbers */
+	int tmp_is_unicode;			/* tmp for is_unicode calculation */
+	int i;						/* loop index - result holder */
+	int ret_code = 0;			/* return code */
+	sigset_t sigset, old_sigset;
+
+	assert(is_unicode);
+
+	*is_unicode = 0;
+
+	/* first 128 codes defaults to ASCII */
+	for (i = 0; i < 128; i++)
+		buf[i] = i;
+	/* remaining defaults to replacement char (usually E_TABSZ = 256) */
+	for (; i < E_TABSZ; i++)
+		buf[i] = 0xfffd;
+
+	/* block SIGCHLD */
+	sigemptyset(&sigset);
+	sigaddset(&sigset, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &sigset, &old_sigset);
+
+	do {
+		if (NULL == fgets(buffer, sizeof(buffer), fp)) {
+			if (feof(fp))
+				break;
+			else {
+				perror("uni_screen_map_read_ascii() can't read line");
+				exit(2);
+			}
+		}
+
+		/* get "charset-relative charcode", stripping leading spaces */
+		p = strtok(buffer, " \t\n");
+
+		/* skip empty lines and comments */
+		if (!p || *p == '#')
+			continue;
+
+		/* get unicode mapping */
+		q = strtok(NULL, " \t\n");
+		if (q) {
+			in = ctoi(p, NULL);
+			if (in < 0 || in > 255) {
+				ret_code = -1;
+				break;
+			}
+
+			on = ctoi(q, &tmp_is_unicode);
+			if (in < 0 && on > 65535) {
+				ret_code = -1;
+				break;
+			}
+
+			*is_unicode |= tmp_is_unicode;
+			buf[in] = on;
+		} else {
+			ret_code = -1;
+			break;
+		}
 	}
-      else 
-	{
-	  ret_code = -1;
-	  break;
-	}
-    }
-  while (1); /* terminated by break on feof() */
+	while (1);					/* terminated by break on feof() */
 
-  /* restore sig mask */
-  sigprocmask (SIG_SETMASK, &old_sigset, NULL);
+	/* restore sig mask */
+	sigprocmask(SIG_SETMASK, &old_sigset, NULL);
 
-  return ret_code;
+	return ret_code;
 }
 
 
-int old_screen_map_read_ascii(FILE *fp, unsigned char buf[])
+int old_screen_map_read_ascii(FILE * fp, unsigned char buf[])
 {
-  char buffer[256];
-  int in, on;
-  char *p, *q;
-  
-  for (in=0; in<256; in++) buf[in]=in;
-  
-  while (fgets(buffer,sizeof(buffer)-1,fp)) 
-    {
-      p = strtok(buffer," \t\n");
-      
-      if (!p || *p == '#')
-	  continue;
-
-      q = strtok(NULL," \t\n#");
-      if (q) 
-	{
-	  in = ctoi(p, NULL);
-	  if (in < 0 || in > 255) return -1;
-	  
-	  on = ctoi(q, NULL);
-	  if (in < 0 && on > 255) return -1;
-	  
-	  buf[in] = on;
+	char buffer[256];
+	int in, on;
+	char *p, *q;
+
+	for (in = 0; in < 256; in++)
+		buf[in] = in;
+
+	while (fgets(buffer, sizeof(buffer) - 1, fp)) {
+		p = strtok(buffer, " \t\n");
+
+		if (!p || *p == '#')
+			continue;
+
+		q = strtok(NULL, " \t\n#");
+		if (q) {
+			in = ctoi(p, NULL);
+			if (in < 0 || in > 255)
+				return -1;
+
+			on = ctoi(q, NULL);
+			if (in < 0 && on > 255)
+				return -1;
+
+			buf[in] = on;
+		} else
+			return -1;
 	}
-      else return -1;
-    }
-  
-  return(0);
+
+	return (0);
 }
 
 
@@ -270,172 +261,145 @@ int old_screen_map_read_ascii(FILE *fp, unsigned char buf[])
  *
  * CAVEAT: will report valid UTF mappings using only 1 byte as 8-bit ones.
  */
-long int ctoi(unsigned char *s, int *is_unicode) 
+long int ctoi(unsigned char *s, int *is_unicode)
 {
-  int i;
-  size_t ls;
-  
-  ls = strlen(s);
-  if (is_unicode) *is_unicode = 0;
-  
-  /* hex-specified UCS2 */
-  if ((strncmp(s,"U+",2) == 0) &&
-      (strspn(s+2,"0123456789abcdefABCDEF") == ls-2))
-    {
-      sscanf(s+2,"%x",&i);
-      if (is_unicode) *is_unicode = 1;
-    }
-
-  /* hex-specified byte */
-  else if ((ls <= 4) && (strncmp(s,"0x",2) == 0) &&
-      (strspn(s+2,"0123456789abcdefABCDEF") == ls-2))
-      sscanf(s+2,"%x",&i);
-
-  /* oct-specified number (byte) */
-  else if ((*s == '0') &&
-	   (strspn(s,"01234567") == ls))
-      sscanf(s,"%o",&i);
-  
-  /* dec-specified number (byte) */
-  else if (strspn(s,"0123456789") == ls) 
-      sscanf(s,"%d",&i);
-  
-  /* single-byte quoted char */
-  else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\''))
-      i=s[1];
-  
-  /* multi-byte UTF8 quoted char */
-  else if ((s[0] == '\'') && (s[ls-1] == '\''))
-    {
-      s[ls-1] = 0;	/* ensure we'll not "parse UTF too far" */
-      i = utf8_to_ucs2(s+1);
-      if (is_unicode) *is_unicode = 1;
-    }
-  else 
-      return(-1);
-  
-  return(i);
+	int i;
+	size_t ls;
+
+	ls = strlen(s);
+	if (is_unicode)
+		*is_unicode = 0;
+
+	/* hex-specified UCS2 */
+	if ((strncmp(s, "U+", 2) == 0) &&
+		(strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2)) {
+		sscanf(s + 2, "%x", &i);
+		if (is_unicode)
+			*is_unicode = 1;
+	}
+
+	/* hex-specified byte */
+	else if ((ls <= 4) && (strncmp(s, "0x", 2) == 0) &&
+			 (strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2))
+		sscanf(s + 2, "%x", &i);
+
+	/* oct-specified number (byte) */
+	else if ((*s == '0') && (strspn(s, "01234567") == ls))
+		sscanf(s, "%o", &i);
+
+	/* dec-specified number (byte) */
+	else if (strspn(s, "0123456789") == ls)
+		sscanf(s, "%d", &i);
+
+	/* single-byte quoted char */
+	else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\''))
+		i = s[1];
+
+	/* multi-byte UTF8 quoted char */
+	else if ((s[0] == '\'') && (s[ls - 1] == '\'')) {
+		s[ls - 1] = 0;			/* ensure we'll not "parse UTF too far" */
+		i = utf8_to_ucs2(s + 1);
+		if (is_unicode)
+			*is_unicode = 1;
+	} else
+		return (-1);
+
+	return (i);
 }
 
 
-void saveoldmap(int fd, char *omfil) 
+void saveoldmap(int fd, char *omfil)
 {
-  FILE *fp;
-  char buf[E_TABSZ];
+	FILE *fp;
+	char buf[E_TABSZ];
+
 #ifdef GIO_UNISCRNMAP
-  unicode xbuf[E_TABSZ];
-  int is_old_map = 0;
+	unicode xbuf[E_TABSZ];
+	int is_old_map = 0;
 
-  if (ioctl(fd,GIO_UNISCRNMAP,xbuf))
-    {
-      perror("GIO_UNISCRNMAP ioctl error");
+	if (ioctl(fd, GIO_UNISCRNMAP, xbuf)) {
+		perror("GIO_UNISCRNMAP ioctl error");
 #endif
-      if (ioctl(fd,GIO_SCRNMAP,buf))
-	{
-	  perror("GIO_SCRNMAP ioctl error");
-	  exit(1);
-	}
-      else 
-	  is_old_map = 1;
+		if (ioctl(fd, GIO_SCRNMAP, buf)) {
+			perror("GIO_SCRNMAP ioctl error");
+			exit(1);
+		} else
+			is_old_map = 1;
 #ifdef GIO_UNISCRNMAP
-    }
+	}
 #endif
-  
-  if ((fp = fopen(omfil, "w")) == NULL) 
-    {
-      perror(omfil);
-      exit(1);
-    }
 
+	if ((fp = fopen(omfil, "w")) == NULL) {
+		perror(omfil);
+		exit(1);
+	}
 #ifdef GIO_UNISCRNMAP
-  if (is_old_map)
-    {
+	if (is_old_map) {
 #endif
-      if (fwrite(buf,E_TABSZ,1,fp) != 1) 
-        {
-	  perror("Error writing map to file");
-	  exit(1);
-	}
+		if (fwrite(buf, E_TABSZ, 1, fp) != 1) {
+			perror("Error writing map to file");
+			exit(1);
+		}
 #ifdef GIO_UNISCRNMAP
-    }
-  else 
-      if (fwrite(xbuf, sizeof(unicode) * E_TABSZ,1,fp) != 1) 
-        {
-	  perror("Error writing map to file");
-	  exit(1);
+	} else if (fwrite(xbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) {
+		perror("Error writing map to file");
+		exit(1);
 	}
 #endif
-  
-  fclose(fp);
+
+	fclose(fp);
 }
 
-unicode utf8_to_ucs2 (char* buf)
+unicode utf8_to_ucs2(char *buf)
 {
-  int utf_count = 0;
-  long utf_char;
-  unicode tc;
-  unsigned char c;
-
-  do
-    {
-      c = *buf;
-      buf++;
-
-      /* if byte should be part of multi-byte sequence */
-      if(c & 0x80)
-        {
-          /* if we have already started to parse a UTF8 sequence */
-          if (utf_count > 0 && (c & 0xc0) == 0x80)
-            {
-              utf_char = (utf_char << 6) | (c & 0x3f);
-              utf_count--;
-              if (utf_count == 0)
-                  tc = utf_char;
-              else
-                  continue;
-            }
-          else  /* Possibly 1st char of a UTF8 sequence */
-            {
-              if ((c & 0xe0) == 0xc0)
-                {
-                  utf_count = 1;
-                  utf_char = (c & 0x1f);
-                }
-              else if ((c & 0xf0) == 0xe0)
-                {
-                  utf_count = 2;
-                  utf_char = (c & 0x0f);
-                }
-              else if ((c & 0xf8) == 0xf0)
-                {
-                  utf_count = 3;
-                  utf_char = (c & 0x07);
-                }
-              else if ((c & 0xfc) == 0xf8)
-                {
-                  utf_count = 4;
-                  utf_char = (c & 0x03);
-                }
-              else if ((c & 0xfe) == 0xfc)
-                {
-                  utf_count = 5;
-                  utf_char = (c & 0x01);
-                }
-              else
-                  utf_count = 0;
-              continue;
-            }
-        }
-      else /* not part of multi-byte sequence - treat as ASCII
-            * this makes incomplete sequences to be ignored
-            */
-        {
-          tc = c;
-          utf_count = 0;
-        }
-    }
-  while (utf_count);
-
-  return tc;
-}
+	int utf_count = 0;
+	long utf_char;
+	unicode tc;
+	unsigned char c;
+
+	do {
+		c = *buf;
+		buf++;
+
+		/* if byte should be part of multi-byte sequence */
+		if (c & 0x80) {
+			/* if we have already started to parse a UTF8 sequence */
+			if (utf_count > 0 && (c & 0xc0) == 0x80) {
+				utf_char = (utf_char << 6) | (c & 0x3f);
+				utf_count--;
+				if (utf_count == 0)
+					tc = utf_char;
+				else
+					continue;
+			} else {			/* Possibly 1st char of a UTF8 sequence */
+
+				if ((c & 0xe0) == 0xc0) {
+					utf_count = 1;
+					utf_char = (c & 0x1f);
+				} else if ((c & 0xf0) == 0xe0) {
+					utf_count = 2;
+					utf_char = (c & 0x0f);
+				} else if ((c & 0xf8) == 0xf0) {
+					utf_count = 3;
+					utf_char = (c & 0x07);
+				} else if ((c & 0xfc) == 0xf8) {
+					utf_count = 4;
+					utf_char = (c & 0x03);
+				} else if ((c & 0xfe) == 0xfc) {
+					utf_count = 5;
+					utf_char = (c & 0x01);
+				} else
+					utf_count = 0;
+				continue;
+			}
+		} else {				/* not part of multi-byte sequence - treat as ASCII
+								   * this makes incomplete sequences to be ignored
+								 */
+			tc = c;
+			utf_count = 0;
+		}
+	}
+	while (utf_count);
 
+	return tc;
+}