summaryrefslogtreecommitdiff
path: root/mail/faces/patches/patch-af
blob: 114d8cde58f765e0ec72cc0230064e5b2f04613c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
$NetBSD: patch-af,v 1.8 2012/06/23 22:27:11 dholland Exp $

- use strerror()
- ...?

--- compface/uncmain.c.orig	1991-10-24 02:28:07.000000000 +0000
+++ compface/uncmain.c
@@ -18,6 +18,8 @@
 #include <fcntl.h>
 #include "compface.h"
 
+extern int xbitmap;
+
 /* the buffer is longer than needed to handle sparse input formats */
 #define FACEBUFLEN 2048
 char fbuf[FACEBUFLEN];
@@ -33,12 +35,13 @@ char *cmdname;
 
 /* error handling definitions follow */
 
-extern int errno, sys_nerr;
-extern char *sys_errlist[];
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
 extern void exit P((int)) ;
 
-#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
+#define ERR strerror(errno)
 #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
 					(void)strcat(fbuf, (s));}
 #define ADDERR(s) (void)strcat(fbuf, (s));
@@ -60,6 +63,13 @@ char *argv[];
     if (*((*argv)++) == '/')
       cmdname = *argv;               /* find the command's basename */
 
+  if (argc > 1 && !strcmp(argv[1], "-X"))
+    {
+      xbitmap++;
+      argc--;
+      argv++;
+    }
+
   if (argc > 3)
     {
       INITERR("usage: ")