gen/FreeBSD/err.c.patch

   1 --- err.c.orig  2011-02-15 16:29:48.000000000 -0800
   2 +++ err.c       2011-02-15 18:01:51.000000000 -0800
   3 @@ -40,12 +40,107 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/err
   4  #include <stdio.h>
   5  #include <stdlib.h>
   6  #include <string.h>
   7 +#include <vis.h>
   8  #include "un-namespace.h"
   9
  10 +#ifdef __BLOCKS__
  11 +#include <Block.h>
  12 +#endif /* __BLOCKS__ */
  13  #include "libc_private.h"
  14
  15 -static FILE *err_file; /* file to use for error output */
  16 -static void (*err_exit)(int);
  17 +#define ERR_EXIT_UNDEF 0
  18 +#ifdef __BLOCKS__
  19 +#define ERR_EXIT_BLOCK 1
  20 +#endif /* __BLOCKS__ */
  21 +#define ERR_EXIT_FUNC  2
  22 +struct _e_err_exit {
  23 +       unsigned int type;
  24 +#ifdef __BLOCKS__
  25 +       union {
  26 +#endif /* __BLOCKS__ */
  27 +               void (*func)(int);
  28 +#ifdef __BLOCKS__
  29 +               void (^block)(int);
  30 +       };
  31 +#endif /* __BLOCKS__ */
  32 +};
  33 +
  34 +#ifdef BUILDING_VARIANT
  35 +
  36 +__private_extern__ FILE *_e_err_file; /* file to use for error output */
  37 +__private_extern__ struct _e_err_exit _e_err_exit;
  38 +__private_extern__ void _e_visprintf(FILE * __restrict, const char * __restrict, va_list);
  39 +
  40 +#else /* !BUILDING_VARIANT */
  41 +
  42 +__private_extern__ FILE *_e_err_file = NULL; /* file to use for error output */
  43 +__private_extern__ struct _e_err_exit _e_err_exit = {ERR_EXIT_UNDEF};
  44 +
  45 +/*
  46 + * zero means pass as is
  47 + * 255 means use \nnn (octal)
  48 + * otherwise use \x (x is value)
  49 + * (NUL isn't used)
  50 + */
  51 +static unsigned char escape[256] = {
  52 +     /* NUL */
  53 +        0, /* Unused: strings can't contain nulls */
  54 +     /*      SOH  STX  ETX  EOT  ENQ  ACK  BEL */
  55 +            255, 255, 255, 255, 255, 255, 'a',
  56 +     /* BS   HT   NL   VT   NP   CR   SO   SI  */
  57 +       'b',  0,   0,  'v', 'f', 'r', 255, 255,
  58 +     /* DLE  DC1  DC2  DC3  DC4  NAK  SYN  ETB */
  59 +       255, 255, 255, 255, 255, 255, 255, 255,
  60 +     /* CAN  EM   SUB  ESC  FS   GS   RS   US  */
  61 +       255, 255, 255, 255, 255, 255, 255, 255,
  62 +     /* the rest are zero */
  63 +};
  64 +
  65 +/*
  66 + * Make characters visible.  If we can't allocate enough
  67 + * memory, we fall back on vfprintf().
  68 + */
  69 +__private_extern__ void
  70 +_e_visprintf(FILE * __restrict stream, const char * __restrict format, va_list ap)
  71 +{
  72 +       int failed = 0;
  73 +       char *str, *visstr;
  74 +       va_list backup;
  75 +
  76 +       va_copy(backup, ap);
  77 +       vasprintf(&str, format, ap);
  78 +       if (str != NULL) {
  79 +               if ((visstr = malloc(4 * strlen(str) + 1)) != NULL) {
  80 +                       unsigned char *fp = (unsigned char *)str;
  81 +                       unsigned char *tp = (unsigned char *)visstr;
  82 +                       while(*fp) {
  83 +                               switch(escape[*fp]) {
  84 +                               case 0:
  85 +                                       *tp++ = *fp;
  86 +                                       break;
  87 +                               case 255:
  88 +                                       sprintf((char *)tp, "\\%03o", *fp);
  89 +                                       tp += 4;
  90 +                                       break;
  91 +                               default:
  92 +                                       *tp++ = '\\';
  93 +                                       *tp++ = escape[*fp];
  94 +                                       break;
  95 +                               }
  96 +                               fp++;
  97 +                       }
  98 +                       *tp = 0;
  99 +                       fputs(visstr, stream);
 100 +                       free(visstr);
 101 +               } else
 102 +                       failed = 1;
 103 +               free(str);
 104 +       } else
 105 +               failed = 1;
 106 +       if (failed)
 107 +               vfprintf(stream, format, backup);
 108 +       va_end(backup);
 109 +}
 110
 111  /*
 112   * This is declared to take a `void *' so that the caller is not required
 113 @@ -56,16 +151,27 @@ void
 114  err_set_file(void *fp)
 115  {
 116         if (fp)
 117 -               err_file = fp;
 118 +               _e_err_file = fp;
 119         else
 120 -               err_file = stderr;
 121 +               _e_err_file = stderr;
 122  }
 123
 124  void
 125  err_set_exit(void (*ef)(int))
 126  {
 127 -       err_exit = ef;
 128 +       _e_err_exit.type = ERR_EXIT_FUNC;
 129 +       _e_err_exit.func = ef;
 130 +}
 131 +
 132 +#ifdef __BLOCKS__
 133 +void
 134 +err_set_exit_b(void (^ef)(int))
 135 +{
 136 +       _e_err_exit.type = ERR_EXIT_BLOCK;
 137 +       _e_err_exit.block = Block_copy(ef);
 138  }
 139 +#endif /* __BLOCKS__ */
 140 +#endif /* !BUILDING_VARIANT */
 141
 142  __weak_reference(_err, err);
 143
 144 @@ -99,16 +205,21 @@ errc(int eval, int code, const char *fmt
 145  void
 146  verrc(int eval, int code, const char *fmt, va_list ap)
 147  {
 148 -       if (err_file == 0)
 149 +       if (_e_err_file == 0)
 150                 err_set_file((FILE *)0);
 151 -       fprintf(err_file, "%s: ", _getprogname());
 152 +       fprintf(_e_err_file, "%s: ", _getprogname());
 153         if (fmt != NULL) {
 154 -               vfprintf(err_file, fmt, ap);
 155 -               fprintf(err_file, ": ");
 156 +               _e_visprintf(_e_err_file, fmt, ap);
 157 +               fprintf(_e_err_file, ": ");
 158         }
 159 -       fprintf(err_file, "%s\n", strerror(code));
 160 -       if (err_exit)
 161 -               err_exit(eval);
 162 +       fprintf(_e_err_file, "%s\n", strerror(code));
 163 +       if (_e_err_exit.type)
 164 +#ifdef __BLOCKS__
 165 +               if (_e_err_exit.type == ERR_EXIT_BLOCK)
 166 +                       _e_err_exit.block(eval);
 167 +               else
 168 +#endif /* __BLOCKS__ */
 169 +                       _e_err_exit.func(eval);
 170         exit(eval);
 171  }
 172
 173 @@ -124,14 +235,19 @@ errx(int eval, const char *fmt, ...)
 174  void
 175  verrx(int eval, const char *fmt, va_list ap)
 176  {
 177 -       if (err_file == 0)
 178 +       if (_e_err_file == 0)
 179                 err_set_file((FILE *)0);
 180 -       fprintf(err_file, "%s: ", _getprogname());
 181 +       fprintf(_e_err_file, "%s: ", _getprogname());
 182         if (fmt != NULL)
 183 -               vfprintf(err_file, fmt, ap);
 184 -       fprintf(err_file, "\n");
 185 -       if (err_exit)
 186 -               err_exit(eval);
 187 +               _e_visprintf(_e_err_file, fmt, ap);
 188 +       fprintf(_e_err_file, "\n");
 189 +       if (_e_err_exit.type)
 190 +#ifdef __BLOCKS__
 191 +               if (_e_err_exit.type == ERR_EXIT_BLOCK)
 192 +                       _e_err_exit.block(eval);
 193 +               else
 194 +#endif /* __BLOCKS__ */
 195 +                       _e_err_exit.func(eval);
 196         exit(eval);
 197  }
 198
 199 @@ -164,14 +280,14 @@ warnc(int code, const char *fmt, ...)
 200  void
 201  vwarnc(int code, const char *fmt, va_list ap)
 202  {
 203 -       if (err_file == 0)
 204 +       if (_e_err_file == 0)
 205                 err_set_file((FILE *)0);
 206 -       fprintf(err_file, "%s: ", _getprogname());
 207 +       fprintf(_e_err_file, "%s: ", _getprogname());
 208         if (fmt != NULL) {
 209 -               vfprintf(err_file, fmt, ap);
 210 -               fprintf(err_file, ": ");
 211 +               _e_visprintf(_e_err_file, fmt, ap);
 212 +               fprintf(_e_err_file, ": ");
 213         }
 214 -       fprintf(err_file, "%s\n", strerror(code));
 215 +       fprintf(_e_err_file, "%s\n", strerror(code));
 216  }
 217
 218  void
 219 @@ -186,10 +302,10 @@ warnx(const char *fmt, ...)
 220  void
 221  vwarnx(const char *fmt, va_list ap)
 222  {
 223 -       if (err_file == 0)
 224 +       if (_e_err_file == 0)
 225                 err_set_file((FILE *)0);
 226 -       fprintf(err_file, "%s: ", _getprogname());
 227 +       fprintf(_e_err_file, "%s: ", _getprogname());
 228         if (fmt != NULL)
 229 -               vfprintf(err_file, fmt, ap);
 230 -       fprintf(err_file, "\n");
 231 +               _e_visprintf(_e_err_file, fmt, ap);
 232 +       fprintf(_e_err_file, "\n");
 233  }