o) Patch reverse compface part to faces 1.6.1 port

   - Missing uncompface -X option used in exmh
   - Missing filter programs to generate ikon file
   - I will try communicate the necessary add ons to the
     new developers of faces.

1 files changed, 315 insertions, 0 deletions

diff --git a/mail/faces/files/patch-cb b/mail/faces/files/patch-cb
new file mode 100644
index 0000000..02d6303
--- /dev/null
+++ b/mail/faces/files/patch-cb
@@ -0,0 +1,315 @@
+*** compface/cmain.c	Thu Feb 21 16:42:54 2002
+--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/cmain.c	Thu Oct 24 03:28:07 1991
+***************
+*** 1,9 ****
+  
+! /*  $Header: /cvs/faces/faces/compface/cmain.c,v 1.3 2002/02/21 15:42:54 devface Exp $
+   *
+   *  Compface - 48x48x1 image compression.
+   *
+!  *  Copyright (c) 1990-2002 James Ashton - Sydney University
+   *
+   *  Permission is given to distribute these sources, as long as the
+   *  copyright messages are not removed, and no monies are exchanged. 
+--- 1,11 ----
+  
+! /*  @(#)cmain.c 1.7 91/10/24
+   *
+   *  Compface - 48x48x1 image compression.
+   *
+!  *  Copyright (c) James Ashton - Sydney University - June 1990.
+!  *
+!  *  Written 11th November 1889.
+   *
+   *  Permission is given to distribute these sources, as long as the
+   *  copyright messages are not removed, and no monies are exchanged. 
+***************
+*** 13,89 ****
+   *  to me, then an attempt will be made to fix them.
+   */
+  
+- #include <stdlib.h>
+- #include <unistd.h>
+  #include <fcntl.h>
+  #include "compface.h"
+  
+! #define  STRCAT        (void) strcat
+! #define  STRCPY        (void) strcpy
+! #define  WRITE         (void) write
+! 
+! /* The buffer is longer than needed to handle sparse input formats */
+! 
+  #define FACEBUFLEN 2048
+  char fbuf[FACEBUFLEN];
+  
+  /* IO file descriptors and their names */
+- 
+  int infile    = 0;
+  char *inname  = "<stdin>";
+  int outfile   = 1;
+  char *outname = "<stdout>";
+  
+! char *cmdname;            /* Basename of executable */
+  
+! /* Error handling definitions follow */
+  
+  extern int errno, sys_nerr;
+  extern char *sys_errlist[];
+  
+  #define ERR         ((errno < sys_nerr) ? sys_errlist[errno] : "")
+! #define INITERR(s)  { \
+!                         STRCPY(fbuf, cmdname); \
+!                         STRCAT(fbuf, ": "); \
+!                         STRCAT(fbuf, (s));\
+!                     }
+! #define ADDERR(s)   STRCAT(fbuf, (s));
+! #define ERROR       { \
+!                         STRCAT(fbuf, "\n"); \
+!                         WRITE(2, fbuf, strlen(fbuf)); \
+!                         exit(1); \
+!                     }
+! #define INITWARN(s) { \
+!                         STRCPY(fbuf, cmdname); \
+!                         STRCAT(fbuf, ": (warning) "); \
+!                         STRCAT(fbuf, (s)); \
+!                     }
+! #define ADDWARN(s)  STRCAT(fbuf, (s));
+! #define WARN        { \
+!                         STRCAT(fbuf, "\n"); \
+!                         WRITE(2, fbuf, strlen(fbuf)); \
+!                     }
+  
+  int
+! main(int argc, char *argv[])
+  {
+      cmdname = *argv;
+!     while (**argv) {
+!         if (*((*argv)++) == '/') {
+!             cmdname = *argv;               /* Find the command's basename */
+!         }
+!     }
+  
+!     if (argc > 3) {
+          INITERR("usage: ")
+          ADDERR(cmdname)
+          ADDERR(" [infile [outfile]]")
+          ERROR
+      }
+  
+!     if ((argc > 1) && strcmp(*++argv, "-")) {
+          inname = *argv;
+!         if ((infile = open(inname, O_RDONLY)) == -1) {
+              INITERR(inname)
+              ADDERR(": ")
+              ADDERR(ERR)
+--- 15,78 ----
+   *  to me, then an attempt will be made to fix them.
+   */
+  
+  #include <fcntl.h>
+  #include "compface.h"
+  
+! /* the buffer is longer than needed to handle sparse input formats */
+  #define FACEBUFLEN 2048
+  char fbuf[FACEBUFLEN];
+  
+  /* IO file descriptors and their names */
+  int infile    = 0;
+  char *inname  = "<stdin>";
+  int outfile   = 1;
+  char *outname = "<stdout>";
+  
+! /* basename of executable */
+! char *cmdname;
+  
+! /* error handling definitions follow */
+  
+  extern int errno, sys_nerr;
+  extern char *sys_errlist[];
+  
++ extern void exit P((int)) ;
++ 
+  #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
+! #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
+! 					(void)strcat(fbuf, (s));}
+! #define ADDERR(s) (void)strcat(fbuf, (s));
+! #define ERROR {(void)strcat(fbuf, "\n");\
+! 				(void)write(2, fbuf, strlen(fbuf)); exit(1);}
+! #define INITWARN(s) {(void)strcpy(fbuf, cmdname);\
+! 					(void)strcat(fbuf, ": (warning) ");\
+! 					(void)strcat(fbuf, (s));}
+! #define ADDWARN(s) (void)strcat(fbuf, (s));
+! #define WARN {(void)strcat(fbuf, "\n"); (void)write(2, fbuf, strlen(fbuf));}
+  
+  int
+! main(argc, argv)
+! int argc;
+! char *argv[];
+  {
+    cmdname = *argv;
+!   while (**argv)
+!     if (*((*argv)++) == '/')
+!       cmdname = *argv;               /* find the command's basename */
+  
+!   if (argc > 3)
+!     {
+        INITERR("usage: ")
+        ADDERR(cmdname)
+        ADDERR(" [infile [outfile]]")
+        ERROR
+      }
+  
+!   if ((argc > 1) && strcmp(*++argv, "-"))
+!     {
+        inname = *argv;
+!       if ((infile = open(inname, O_RDONLY)) == -1)
+!         {
+            INITERR(inname)
+            ADDERR(": ")
+            ADDERR(ERR)
+***************
+*** 91,100 ****
+          }
+      }
+  
+!     if (argc > 2) {
+          outname = *++argv;
+!         if ((outfile = open(outname, O_WRONLY | O_CREAT | 
+!                                      O_TRUNC, 0644)) == -1) {
+              INITERR(outname)
+              ADDERR(": ")
+              ADDERR(ERR)
+--- 80,90 ----
+          }
+      }
+  
+!   if (argc > 2)
+!     {
+        outname = *++argv;
+!       if ((outfile = open(outname, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1)
+!         {
+            INITERR(outname)
+            ADDERR(": ")
+            ADDERR(ERR)
+***************
+*** 103,109 ****
+      }
+  
+      (void) ReadBuf();
+!     switch (compface(fbuf)) {
+          case -2 : INITERR("internal error")
+                    ERROR
+          case -1 : INITERR(inname)
+--- 93,100 ----
+      }
+  
+    (void) ReadBuf();
+!   switch (compface(fbuf))
+!     {
+        case -2 : INITERR("internal error")
+                  ERROR
+        case -1 : INITERR(inname)
+***************
+*** 123,135 ****
+  int
+  WriteBuf()
+  {
+!     char *s, *t;
+!     int len;
+  
+      s = fbuf;
+      t = s + strlen(s);
+!     while (s < t) {
+!         if ((len = write(outfile, s, t - s)) == -1) {
+              INITERR(outname)
+              ADDERR(": ")
+              ADDERR(ERR)
+--- 114,128 ----
+  int
+  WriteBuf()
+  {
+! 	register char *s, *t;
+! 	register int len;
+  
+  	s = fbuf;
+  	t = s + strlen(s);
+! 	while (s < t)
+! 	{
+! 		if ((len = write(outfile, s, t - s)) == -1)
+! 		{
+  			INITERR(outname)
+  			ADDERR(": ")
+  			ADDERR(ERR)
+***************
+*** 137,163 ****
+          }
+          s += len;
+      }
+!     return(0);
+  }
+  
+  
+  int
+  ReadBuf()
+  {
+!     int count, len;
+!     char *t;
+  
+      count = 0;
+      t = fbuf;
+!     while ((len = read(infile, t, FACEBUFLEN - count))) {
+!         if (len == -1) {
+              INITERR(inname)
+              ADDERR(": ")
+              ADDERR(ERR)
+              ERROR
+          }
+          t += len;
+!         if ((count += len) >= FACEBUFLEN) {
+              INITWARN(inname)
+              ADDWARN(" exceeds internal buffer size.  Data may be lost")
+              WARN
+--- 130,159 ----
+  		}
+  		s += len;
+  	}
+! 	return 0;
+  }
+  
+  
+  int
+  ReadBuf()
+  {
+! 	register int count, len;
+! 	register char *t;
+  
+  	count = 0;
+  	t = fbuf;
+! 	while (len = read(infile, t, FACEBUFLEN - count))
+! 	{
+! 		if (len == -1)
+! 		{
+  			INITERR(inname)
+  			ADDERR(": ")
+  			ADDERR(ERR)
+  			ERROR
+  		}
+  		t += len;
+! 		if ((count += len) >= FACEBUFLEN)
+! 		{
+  			INITWARN(inname)
+  			ADDWARN(" exceeds internal buffer size.  Data may be lost")
+  			WARN
+***************
+*** 165,169 ****
+          }
+      }
+      *t = '\0';
+!     return(count);
+  }
+--- 161,165 ----
+  		}
+  	}
+  	*t = '\0';
+! 	return count;
+  }