OS-1840 fmdump shall emit JSON (copyright fixes)
OS-1840 fmdump shall emit JSON (use library)

          --- old/usr/src/cmd/fm/fmdump/common/nvlrender.c
          +++ new/usr/src/cmd/fm/fmdump/common/nvlrender.c

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *

  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  23   24   */
  24   25  
  25   26  /*
  26   27   * Rendering functions for nvlist_prt that are of use to all types
  27   28   * of log.
  28   29   */
  29   30  
  30   31  #include <fmdump.h>
  31   32  #include <stdio.h>
  32   33  #include <strings.h>

  33   34  
  34   35  extern topo_hdl_t *fmd_fmri_topo_hold(int);
  35   36  
  36   37  /*
  37   38   * Can be appointed to be called for dumping all nvlist members of
  38   39   * an nvlist we ask to print with nvlist_prt.  Return 0 if the
  39   40   * nvlist is not recognized as an fmri, and default formatting
  40   41   * will be applied; otherwise format as an fmri string and return 1.
  41   42   */
  42   43  
  43   44  /*ARGSUSED*/
  44   45  int
  45   46  fmdump_render_nvlist(nvlist_prtctl_t pctl, void *private, nvlist_t *nvl,
  46   47      const char *name, nvlist_t *fmri)
  47   48  {
  48   49          topo_hdl_t *thp = fmd_fmri_topo_hold(TOPO_VERSION);
  49   50          FILE *fp = nvlist_prtctl_getdest(pctl);
  50   51          char *class, *fmristr = NULL;
  51   52          uint8_t version;
  52   53          int err;
  53   54  
  54   55          if (nvlist_lookup_string(fmri, FM_FMRI_SCHEME, &class) != 0 ||
  55   56              nvlist_lookup_uint8(fmri, FM_VERSION, &version) != 0)
  56   57                  return (0);
  57   58  
  58   59          /*
  59   60           * Instead of hardcoding known FMRI classes here we'll try
  60   61           * topo_fmri_nvl2str which should fail gracefully for invalid
  61   62           * schemes (ie an nvlist that just happens to have the expected
  62   63           * class and version members but that isn't an FMRI).
  63   64           */

  64   65          if (topo_fmri_nvl2str(thp, fmri, &fmristr, &err) != 0 ||
  65   66              fmristr == NULL)
  66   67                  return (0);
  67   68  
  68   69          nvlist_prtctl_doindent(pctl, 1);
  69   70          nvlist_prtctl_dofmt(pctl, NVLIST_FMT_MEMBER_NAME, name);
  70   71          (void) fprintf(fp, "%s", fmristr);
  71   72          topo_hdl_strfree(thp, fmristr);
  72   73  
  73   74          return (1);
       75 +}
       76 +
       77 +/*
       78 + * Thin wrapper around libnvpair's inbuilt JSON routine.  Simply dumps the
       79 + * entire log record nvlist without any reformatting.
       80 + */
       81 +int
       82 +fmdump_print_json(fmd_log_t *lp, const fmd_log_record_t *rp, FILE *fp)
       83 +{
       84 +        nvlist_print_json(fp, rp->rec_nvl);
       85 +        fprintf(fp, "\n");
       86 +
       87 +        return (0);
  74   88  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX