stdio/FreeBSD/local.h.patch

   1 --- local.h.orig        2011-02-15 10:44:57.000000000 -0800
   2 +++ local.h     2011-02-15 11:16:59.000000000 -0800
   3 @@ -33,8 +33,11 @@
   4   * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
   5   */
   6
   7 +#include <sys/cdefs.h>
   8 +#include "xlocale_private.h"
   9  #include <sys/types.h> /* for off_t */
  10  #include <pthread.h>
  11 +#include <limits.h>
  12  #include <string.h>
  13  #include <wchar.h>
  14
  15 @@ -50,36 +53,69 @@
  16  extern int     _fseeko(FILE *, off_t, int, int);
  17  extern int     __fflush(FILE *fp);
  18  extern void    __fcloseall(void);
  19 -extern wint_t  __fgetwc(FILE *);
  20 -extern wint_t  __fputwc(wchar_t, FILE *);
  21 +extern wint_t  __fgetwc(FILE *, locale_t);
  22 +extern wint_t  __fputwc(wchar_t, FILE *, locale_t);
  23  extern int     __sflush(FILE *);
  24 -extern FILE    *__sfp(void);
  25 +extern FILE    *__sfp(int);
  26 +extern void    __sfprelease(FILE *);   /* mark free and update count as needed */
  27  extern int     __slbexpand(FILE *, size_t);
  28  extern int     __srefill(FILE *);
  29 +extern int     __srefill0(FILE *);
  30 +extern int     __srefill1(FILE *);
  31  extern int     __sread(void *, char *, int);
  32  extern int     __swrite(void *, char const *, int);
  33  extern fpos_t  __sseek(void *, fpos_t, int);
  34  extern int     __sclose(void *);
  35  extern void    __sinit(void);
  36  extern void    _cleanup(void);
  37 +extern void    (*__cleanup)(void);
  38  extern void    __smakebuf(FILE *);
  39  extern int     __swhatbuf(FILE *, size_t *, int *);
  40  extern int     _fwalk(int (*)(FILE *));
  41 -extern int     __svfscanf(FILE *, const char *, __va_list);
  42 +extern int     __svfscanf_l(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__svfscanf_l);
  43  extern int     __swsetup(FILE *);
  44  extern int     __sflags(const char *, int *);
  45  extern int     __ungetc(int, FILE *);
  46 -extern wint_t  __ungetwc(wint_t, FILE *);
  47 -extern int     __vfprintf(FILE *, const char *, __va_list);
  48 -extern int     __vfscanf(FILE *, const char *, __va_list);
  49 -extern int     __vfwprintf(FILE *, const wchar_t *, __va_list);
  50 -extern int     __vfwscanf(FILE * __restrict, const wchar_t * __restrict,
  51 -                   __va_list);
  52 +extern wint_t  __ungetwc(wint_t, FILE *, locale_t);
  53 +extern int     __vfprintf(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfprintf);
  54 +extern int     __vfscanf(FILE *, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfscanf);
  55 +extern int     __vfwprintf(FILE *, locale_t, const wchar_t *, __va_list) __DARWIN_LDBL_COMPAT(__vfwprintf);
  56 +extern int     __vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
  57 +                   __va_list) __DARWIN_LDBL_COMPAT(__vfwscanf);
  58  extern size_t  __fread(void * __restrict buf, size_t size, size_t count,
  59                 FILE * __restrict fp);
  60  extern int     __sdidinit;
  61
  62
  63 +/* hold a buncha junk that would grow the ABI */
  64 +struct __sFILEX {
  65 +       unsigned char   *up;    /* saved _p when _p is doing ungetc data */
  66 +       pthread_mutex_t fl_mutex;       /* used for MT-safety */
  67 +       pthread_t       fl_owner;       /* current owner */
  68 +       int             fl_count;       /* recursive lock count */
  69 +       int             orientation:2;  /* orientation for fwide() */
  70 +       int             counted:1;      /* stream counted against STREAM_MAX */
  71 +       mbstate_t       mbstate;        /* multibyte conversion state */
  72 +};
  73 +
  74 +#define _up            _extra->up
  75 +#define _fl_mutex      _extra->fl_mutex
  76 +#define _fl_owner      _extra->fl_owner
  77 +#define _fl_count      _extra->fl_count
  78 +#define _orientation   _extra->orientation
  79 +#define _mbstate       _extra->mbstate
  80 +#define _counted       _extra->counted
  81 +
  82 +#define        INITEXTRA(fp) do { \
  83 +       (fp)->_extra->up = NULL; \
  84 +       (fp)->_extra->fl_mutex = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER; \
  85 +       (fp)->_extra->fl_owner = NULL; \
  86 +       (fp)->_extra->fl_count = 0; \
  87 +       (fp)->_extra->orientation = 0; \
  88 +       memset(&(fp)->_extra->mbstate, 0, sizeof(mbstate_t)); \
  89 +       (fp)->_extra->counted = 0; \
  90 +} while(0);
  91 +
  92  /*
  93   * Prepare the given FILE for writing, and return 0 iff it
  94   * can be written now.  Otherwise, return EOF and set errno.