Print this page
4964 nl_langinfo(CRNCYSTR) returns wrong alignment character
4999 libc test suite enhancements
4939 desire wcsnrtombs() function
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: TBD

Split Close
Expand all
Collapse all
          --- old/usr/src/head/iso/wchar_iso.h
          +++ new/usr/src/head/iso/wchar_iso.h
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26   26  
  27   27  /*
       28 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
       29 + */
       30 +
       31 +/*
  28   32   * An application should not include this header directly.  Instead it
  29   33   * should be included only through the inclusion of other Sun headers.
  30   34   *
  31   35   * The contents of this header is limited to identifiers specified in the
  32   36   * C Standard.  Any new identifiers specified in future amendments to the
  33   37   * C Standard must be placed in this header.  If these new identifiers
  34   38   * are required to also be in the C++ Standard "std" namespace, then for
  35   39   * anything other than macro definitions, corresponding "using" directives
  36   40   * must also be added to <wchar.h>.
  37   41   */
  38   42  
  39   43  #ifndef _ISO_WCHAR_ISO_H
  40   44  #define _ISO_WCHAR_ISO_H
  41   45  
  42      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  43      -
  44   46  #include <sys/feature_tests.h>
  45   47  #include <stdio_tag.h>
  46   48  #include <wchar_impl.h>
  47   49  #include <iso/time_iso.h>
  48   50  
  49   51  #if (defined(__cplusplus) && (__cplusplus - 0 < 54321L)) || \
  50   52          (!defined(__cplusplus) && !defined(_STRICT_STDC)) || \
  51   53          defined(__EXTENSIONS__)
  52   54  #include <stdio.h>
  53   55  #endif  /*  (defined(__cplusplus) && (__cplusplus - 0 < 54321L)) ... */
↓ open down ↓ 265 lines elided ↑ open up ↑
 319  321                          const wchar_t *_RESTRICT_KYWD, ...);
 320  322  extern int      vfwprintf(__FILE *_RESTRICT_KYWD, const wchar_t *_RESTRICT_KYWD,
 321  323                          __va_list);
 322  324  extern int      vwprintf(const wchar_t *_RESTRICT_KYWD, __va_list);
 323  325  extern int      vswprintf(wchar_t *_RESTRICT_KYWD, size_t,
 324  326                          const wchar_t *_RESTRICT_KYWD, __va_list);
 325  327  extern size_t   wcrtomb(char *_RESTRICT_KYWD, wchar_t,
 326  328                          mbstate_t *_RESTRICT_KYWD);
 327  329  extern size_t   wcsrtombs(char *_RESTRICT_KYWD, const wchar_t **_RESTRICT_KYWD,
 328  330                          size_t, mbstate_t *_RESTRICT_KYWD);
      331 +#if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
      332 +extern size_t   wcsnrtombs(char *_RESTRICT_KYWD, const wchar_t **_RESTRICT_KYWD,
      333 +                        size_t, size_t, mbstate_t *_RESTRICT_KYWD);
      334 +#endif
 329  335  extern int      wctob(wint_t);
 330  336  extern int      wmemcmp(const wchar_t *, const wchar_t *, size_t);
 331  337  extern wchar_t  *wmemcpy(wchar_t *_RESTRICT_KYWD,
 332  338                          const wchar_t *_RESTRICT_KYWD, size_t);
 333  339  extern wchar_t  *wmemmove(wchar_t *, const wchar_t *, size_t);
 334  340  extern wchar_t  *wmemset(wchar_t *, wchar_t, size_t);
 335  341  extern int      wprintf(const wchar_t *_RESTRICT_KYWD, ...);
 336  342  extern int      wscanf(const wchar_t *_RESTRICT_KYWD, ...);
 337  343  #if __cplusplus >= 199711L
 338  344  extern const wchar_t *wcsstr(const wchar_t *, const wchar_t *);
↓ open down ↓ 74 lines elided ↑ open up ↑
 413  419  extern size_t   mbrlen();
 414  420  extern size_t   mbrtowc();
 415  421  extern size_t   mbsrtowcs();
 416  422  extern int      swprintf();
 417  423  extern int      swscanf();
 418  424  extern int      vfwprintf();
 419  425  extern int      vwprintf();
 420  426  extern int      vswprintf();
 421  427  extern size_t   wcrtomb();
 422  428  extern size_t   wcsrtombs();
      429 +#if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
      430 +extern size_t   wcsnrtombs();
      431 +#endif
      432 +
 423  433  extern wchar_t  *wcsstr();
 424  434  extern int      wctob();
 425  435  extern wchar_t  *wmemchr();
 426  436  extern int      wmemcmp();
 427  437  extern wchar_t  *wmemcpy();
 428  438  extern wchar_t  *wmemmove();
 429  439  extern wchar_t  *wmemset();
 430  440  extern int      wprintf();
 431  441  extern int      wscanf();
 432  442  #endif /* not XPG4 and not XPG4v2 */
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX