gen/FreeBSD/err.c.patch

   1 --- err.c.orig  2004-08-30 09:45:37.000000000 -0700
   2 +++ err.c       2004-08-30 09:58:06.000000000 -0700
   3 @@ -48,8 +48,15 @@
   4
   5  #include "libc_private.h"
   6
   7 -static FILE *err_file; /* file to use for error output */
   8 -static void (*err_exit)(int);
   9 +#ifdef BUILDING_VARIANT
  10 +
  11 +__private_extern__ FILE *_e_err_file; /* file to use for error output */
  12 +__private_extern__ void (*_e_err_exit)(int);
  13 +
  14 +#else /* !BUILDING_VARIANT */
  15 +
  16 +__private_extern__ FILE *_e_err_file = NULL; /* file to use for error output */
  17 +__private_extern__ void (*_e_err_exit)(int) = NULL;
  18
  19  /*
  20   * This is declared to take a `void *' so that the caller is not required
  21 @@ -60,16 +67,17 @@
  22  err_set_file(void *fp)
  23  {
  24         if (fp)
  25 -               err_file = fp;
  26 +               _e_err_file = fp;
  27         else
  28 -               err_file = stderr;
  29 +               _e_err_file = stderr;
  30  }
  31
  32  void
  33  err_set_exit(void (*ef)(int))
  34  {
  35 -       err_exit = ef;
  36 +       _e_err_exit = ef;
  37  }
  38 +#endif /* !BUILDING_VARIANT */
  39
  40  __weak_reference(_err, err);
  41
  42 @@ -107,16 +115,16 @@
  43         const char *fmt;
  44         va_list ap;
  45  {
  46 -       if (err_file == 0)
  47 +       if (_e_err_file == 0)
  48                 err_set_file((FILE *)0);
  49 -       fprintf(err_file, "%s: ", _getprogname());
  50 +       fprintf(_e_err_file, "%s: ", _getprogname());
  51         if (fmt != NULL) {
  52 -               vfprintf(err_file, fmt, ap);
  53 -               fprintf(err_file, ": ");
  54 +               vfprintf(_e_err_file, fmt, ap);
  55 +               fprintf(_e_err_file, ": ");
  56         }
  57 -       fprintf(err_file, "%s\n", strerror(code));
  58 -       if (err_exit)
  59 -               err_exit(eval);
  60 +       fprintf(_e_err_file, "%s\n", strerror(code));
  61 +       if (_e_err_exit)
  62 +               _e_err_exit(eval);
  63         exit(eval);
  64  }
  65
  66 @@ -135,14 +143,14 @@
  67         const char *fmt;
  68         va_list ap;
  69  {
  70 -       if (err_file == 0)
  71 +       if (_e_err_file == 0)
  72                 err_set_file((FILE *)0);
  73 -       fprintf(err_file, "%s: ", _getprogname());
  74 +       fprintf(_e_err_file, "%s: ", _getprogname());
  75         if (fmt != NULL)
  76 -               vfprintf(err_file, fmt, ap);
  77 -       fprintf(err_file, "\n");
  78 -       if (err_exit)
  79 -               err_exit(eval);
  80 +               vfprintf(_e_err_file, fmt, ap);
  81 +       fprintf(_e_err_file, "\n");
  82 +       if (_e_err_exit)
  83 +               _e_err_exit(eval);
  84         exit(eval);
  85  }
  86
  87 @@ -180,14 +188,14 @@
  88         const char *fmt;
  89         va_list ap;
  90  {
  91 -       if (err_file == 0)
  92 +       if (_e_err_file == 0)
  93                 err_set_file((FILE *)0);
  94 -       fprintf(err_file, "%s: ", _getprogname());
  95 +       fprintf(_e_err_file, "%s: ", _getprogname());
  96         if (fmt != NULL) {
  97 -               vfprintf(err_file, fmt, ap);
  98 -               fprintf(err_file, ": ");
  99 +               vfprintf(_e_err_file, fmt, ap);
 100 +               fprintf(_e_err_file, ": ");
 101         }
 102 -       fprintf(err_file, "%s\n", strerror(code));
 103 +       fprintf(_e_err_file, "%s\n", strerror(code));
 104  }
 105
 106  void
 107 @@ -204,10 +212,10 @@
 108         const char *fmt;
 109         va_list ap;
 110  {
 111 -       if (err_file == 0)
 112 +       if (_e_err_file == 0)
 113                 err_set_file((FILE *)0);
 114 -       fprintf(err_file, "%s: ", _getprogname());
 115 +       fprintf(_e_err_file, "%s: ", _getprogname());
 116         if (fmt != NULL)
 117 -               vfprintf(err_file, fmt, ap);
 118 -       fprintf(err_file, "\n");
 119 +               vfprintf(_e_err_file, fmt, ap);
 120 +       fprintf(_e_err_file, "\n");
 121  }