@@ -71,8 +71,7 @@ github.com/vbatts/tar-split                         620714a4c508c880ac1bdda9c837

 github.com/opencontainers/go-digest                 279bed98673dd5bef374d3b6e4b09e2af76183bf # v1.0.0-rc1

 # get go-zfs packages

-github.com/mistifyio/go-zfs                         22c9b32c84eb0d0c6f4043b6e90fc94073de92fa

-github.com/pborman/uuid                             a97ce2ca70fa5a848076093f05e639a89ca34d06 # v1.0

+github.com/mistifyio/go-zfs                         f784269be439d704d3dfa1906f45dd848fed2beb

 google.golang.org/grpc                              7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2

@@ -29,7 +29,7 @@ The tests have decent examples for most functions.

 ```go

 //assuming a zpool named test

-//error handling ommitted

+//error handling omitted

 f, err := zfs.CreateFilesystem("test/snapshot-test", nil)

@@ -11,7 +11,7 @@ import (

 	"strconv"

 	"strings"

-	"github.com/pborman/uuid"

+	"github.com/google/uuid"

 )

 type command struct {

@@ -38,7 +38,7 @@ func (c *command) Run(arg ...string) ([][]string, error) {

 	}

 	cmd.Stderr = &stderr

-	id := uuid.New()

+	id := uuid.New().String()

 	joinedArgs := strings.Join(cmd.Args, " ")

 	logger.Log([]string{"ID:" + id, "START", joinedArgs})

@@ -48,7 +48,7 @@ func (c *command) Run(arg ...string) ([][]string, error) {

 	if err != nil {

 		return nil, &Error{

 			Err:    err,

-			Debug:  strings.Join([]string{cmd.Path, joinedArgs}, " "),

+			Debug:  strings.Join([]string{cmd.Path, joinedArgs[1:]}, " "),

 			Stderr: stderr.String(),

 		}

 	}

@@ -118,20 +118,24 @@ func (ds *Dataset) parseLine(line []string) error {

 	if err = setUint(&ds.Quota, line[8]); err != nil {

 		return err

 	}

+	if err = setUint(&ds.Referenced, line[9]); err != nil {

+		return err

+	}

 	if runtime.GOOS == "solaris" {

 		return nil

 	}

-	if err = setUint(&ds.Written, line[9]); err != nil {

+	if err = setUint(&ds.Written, line[10]); err != nil {

 		return err

 	}

-	if err = setUint(&ds.Logicalused, line[10]); err != nil {

+	if err = setUint(&ds.Logicalused, line[11]); err != nil {

 		return err

 	}

-	if err = setUint(&ds.Usedbydataset, line[11]); err != nil {

+	if err = setUint(&ds.Usedbydataset, line[12]); err != nil {

 		return err

 	}

+

 	return nil

 }

@@ -337,7 +341,11 @@ func (z *Zpool) parseLine(line []string) error {

 		err = setUint(&z.Free, val)

 	case "fragmentation":

 		// Trim trailing "%" before parsing uint

-		err = setUint(&z.Fragmentation, val[:len(val)-1])

+		i := strings.Index(val, "%")

+		if i < 0 {

+			i = len(val)

+		}

+		err = setUint(&z.Fragmentation, val[:i])

 	case "readonly":

 		z.ReadOnly = val == "on"

 	case "freeing":

@@ -7,7 +7,7 @@ import (

 )

 // List of ZFS properties to retrieve from zfs list command on a non-Solaris platform

-var dsPropList = []string{"name", "origin", "used", "available", "mountpoint", "compression", "type", "volsize", "quota", "written", "logicalused", "usedbydataset"}

+var dsPropList = []string{"name", "origin", "used", "available", "mountpoint", "compression", "type", "volsize", "quota", "referenced", "written", "logicalused", "usedbydataset"}

 var dsPropListOptions = strings.Join(dsPropList, ",")

@@ -7,7 +7,7 @@ import (

 )

 // List of ZFS properties to retrieve from zfs list command on a Solaris platform

-var dsPropList = []string{"name", "origin", "used", "available", "mountpoint", "compression", "type", "volsize", "quota"}

+var dsPropList = []string{"name", "origin", "used", "available", "mountpoint", "compression", "type", "volsize", "quota", "referenced"}

 var dsPropListOptions = strings.Join(dsPropList, ",")

@@ -35,6 +35,7 @@ type Dataset struct {

 	Logicalused   uint64

 	Usedbydataset uint64

 	Quota         uint64

+	Referenced    uint64

 }

 // InodeType is the type of inode as reported by Diff

@@ -307,7 +308,7 @@ func (d *Dataset) SetProperty(key, val string) error {

 // A full list of available ZFS properties may be found here:

 // https://www.freebsd.org/cgi/man.cgi?zfs(8).

 func (d *Dataset) GetProperty(key string) (string, error) {

-	out, err := zfs("get", key, d.Name)

+	out, err := zfs("get", "-H", key, d.Name)

 	if err != nil {

 		return "", err

 	}

deleted file mode 100644

@@ -1,27 +0,0 @@

-Copyright (c) 2009,2014 Google Inc. All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are

-met:

-

-   * Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-   * Redistributions in binary form must reproduce the above

-copyright notice, this list of conditions and the following disclaimer

-in the documentation and/or other materials provided with the

-distribution.

-   * Neither the name of Google Inc. nor the names of its

-contributors may be used to endorse or promote products derived from

-this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

deleted file mode 100644

@@ -1,13 +0,0 @@

-This project was automatically exported from code.google.com/p/go-uuid

-

-# uuid ![build status](https://travis-ci.org/pborman/uuid.svg?branch=master)

-The uuid package generates and inspects UUIDs based on [RFC 412](http://tools.ietf.org/html/rfc4122) and DCE 1.1: Authentication and Security Services. 

-

-###### Install

-`go get github.com/pborman/uuid`

-

-###### Documentation 

-[![GoDoc](https://godoc.org/github.com/pborman/uuid?status.svg)](http://godoc.org/github.com/pborman/uuid)

-

-Full `go doc` style documentation for the package can be viewed online without installing this package by using the GoDoc site here: 

-http://godoc.org/github.com/pborman/uuid

deleted file mode 100755

@@ -1,84 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"encoding/binary"

-	"fmt"

-	"os"

-)

-

-// A Domain represents a Version 2 domain

-type Domain byte

-

-// Domain constants for DCE Security (Version 2) UUIDs.

-const (

-	Person = Domain(0)

-	Group  = Domain(1)

-	Org    = Domain(2)

-)

-

-// NewDCESecurity returns a DCE Security (Version 2) UUID.

-//

-// The domain should be one of Person, Group or Org.

-// On a POSIX system the id should be the users UID for the Person

-// domain and the users GID for the Group.  The meaning of id for

-// the domain Org or on non-POSIX systems is site defined.

-//

-// For a given domain/id pair the same token may be returned for up to

-// 7 minutes and 10 seconds.

-func NewDCESecurity(domain Domain, id uint32) UUID {

-	uuid := NewUUID()

-	if uuid != nil {

-		uuid[6] = (uuid[6] & 0x0f) | 0x20 // Version 2

-		uuid[9] = byte(domain)

-		binary.BigEndian.PutUint32(uuid[0:], id)

-	}

-	return uuid

-}

-

-// NewDCEPerson returns a DCE Security (Version 2) UUID in the person

-// domain with the id returned by os.Getuid.

-//

-//  NewDCEPerson(Person, uint32(os.Getuid()))

-func NewDCEPerson() UUID {

-	return NewDCESecurity(Person, uint32(os.Getuid()))

-}

-

-// NewDCEGroup returns a DCE Security (Version 2) UUID in the group

-// domain with the id returned by os.Getgid.

-//

-//  NewDCEGroup(Group, uint32(os.Getgid()))

-func NewDCEGroup() UUID {

-	return NewDCESecurity(Group, uint32(os.Getgid()))

-}

-

-// Domain returns the domain for a Version 2 UUID or false.

-func (uuid UUID) Domain() (Domain, bool) {

-	if v, _ := uuid.Version(); v != 2 {

-		return 0, false

-	}

-	return Domain(uuid[9]), true

-}

-

-// Id returns the id for a Version 2 UUID or false.

-func (uuid UUID) Id() (uint32, bool) {

-	if v, _ := uuid.Version(); v != 2 {

-		return 0, false

-	}

-	return binary.BigEndian.Uint32(uuid[0:4]), true

-}

-

-func (d Domain) String() string {

-	switch d {

-	case Person:

-		return "Person"

-	case Group:

-		return "Group"

-	case Org:

-		return "Org"

-	}

-	return fmt.Sprintf("Domain%d", int(d))

-}

deleted file mode 100755

@@ -1,8 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-// The uuid package generates and inspects UUIDs.

-//

-// UUIDs are based on RFC 4122 and DCE 1.1: Authentication and Security Services.

-package uuid

deleted file mode 100644

@@ -1,53 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"crypto/md5"

-	"crypto/sha1"

-	"hash"

-)

-

-// Well known Name Space IDs and UUIDs

-var (

-	NameSpace_DNS  = Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")

-	NameSpace_URL  = Parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")

-	NameSpace_OID  = Parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")

-	NameSpace_X500 = Parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")

-	NIL            = Parse("00000000-0000-0000-0000-000000000000")

-)

-

-// NewHash returns a new UUID derived from the hash of space concatenated with

-// data generated by h.  The hash should be at least 16 byte in length.  The

-// first 16 bytes of the hash are used to form the UUID.  The version of the

-// UUID will be the lower 4 bits of version.  NewHash is used to implement

-// NewMD5 and NewSHA1.

-func NewHash(h hash.Hash, space UUID, data []byte, version int) UUID {

-	h.Reset()

-	h.Write(space)

-	h.Write([]byte(data))

-	s := h.Sum(nil)

-	uuid := make([]byte, 16)

-	copy(uuid, s)

-	uuid[6] = (uuid[6] & 0x0f) | uint8((version&0xf)<<4)

-	uuid[8] = (uuid[8] & 0x3f) | 0x80 // RFC 4122 variant

-	return uuid

-}

-

-// NewMD5 returns a new MD5 (Version 3) UUID based on the

-// supplied name space and data.

-//

-//  NewHash(md5.New(), space, data, 3)

-func NewMD5(space UUID, data []byte) UUID {

-	return NewHash(md5.New(), space, data, 3)

-}

-

-// NewSHA1 returns a new SHA1 (Version 5) UUID based on the

-// supplied name space and data.

-//

-//  NewHash(sha1.New(), space, data, 5)

-func NewSHA1(space UUID, data []byte) UUID {

-	return NewHash(sha1.New(), space, data, 5)

-}

deleted file mode 100644

@@ -1,34 +0,0 @@

-// Copyright 2014 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import "errors"

-

-func (u UUID) MarshalJSON() ([]byte, error) {

-	if len(u) != 16 {

-		return []byte(`""`), nil

-	}

-	var js [38]byte

-	js[0] = '"'

-	encodeHex(js[1:], u)

-	js[37] = '"'

-	return js[:], nil

-}

-

-func (u *UUID) UnmarshalJSON(data []byte) error {

-	if string(data) == `""` {

-		return nil

-	}

-	if data[0] != '"' {

-		return errors.New("invalid UUID format")

-	}

-	data = data[1 : len(data)-1]

-	uu := Parse(string(data))

-	if uu == nil {

-		return errors.New("invalid UUID format")

-	}

-	*u = uu

-	return nil

-}

deleted file mode 100755

@@ -1,117 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"net"

-	"sync"

-)

-

-var (

-	nodeMu     sync.Mutex

-	interfaces []net.Interface // cached list of interfaces

-	ifname     string          // name of interface being used

-	nodeID     []byte          // hardware for version 1 UUIDs

-)

-

-// NodeInterface returns the name of the interface from which the NodeID was

-// derived.  The interface "user" is returned if the NodeID was set by

-// SetNodeID.

-func NodeInterface() string {

-	defer nodeMu.Unlock()

-	nodeMu.Lock()

-	return ifname

-}

-

-// SetNodeInterface selects the hardware address to be used for Version 1 UUIDs.

-// If name is "" then the first usable interface found will be used or a random

-// Node ID will be generated.  If a named interface cannot be found then false

-// is returned.

-//

-// SetNodeInterface never fails when name is "".

-func SetNodeInterface(name string) bool {

-	defer nodeMu.Unlock()

-	nodeMu.Lock()

-	return setNodeInterface(name)

-}

-

-func setNodeInterface(name string) bool {

-	if interfaces == nil {

-		var err error

-		interfaces, err = net.Interfaces()

-		if err != nil && name != "" {

-			return false

-		}

-	}

-

-	for _, ifs := range interfaces {

-		if len(ifs.HardwareAddr) >= 6 && (name == "" || name == ifs.Name) {

-			if setNodeID(ifs.HardwareAddr) {

-				ifname = ifs.Name

-				return true

-			}

-		}

-	}

-

-	// We found no interfaces with a valid hardware address.  If name

-	// does not specify a specific interface generate a random Node ID

-	// (section 4.1.6)

-	if name == "" {

-		if nodeID == nil {

-			nodeID = make([]byte, 6)

-		}

-		randomBits(nodeID)

-		return true

-	}

-	return false

-}

-

-// NodeID returns a slice of a copy of the current Node ID, setting the Node ID

-// if not already set.

-func NodeID() []byte {

-	defer nodeMu.Unlock()

-	nodeMu.Lock()

-	if nodeID == nil {

-		setNodeInterface("")

-	}

-	nid := make([]byte, 6)

-	copy(nid, nodeID)

-	return nid

-}

-

-// SetNodeID sets the Node ID to be used for Version 1 UUIDs.  The first 6 bytes

-// of id are used.  If id is less than 6 bytes then false is returned and the

-// Node ID is not set.

-func SetNodeID(id []byte) bool {

-	defer nodeMu.Unlock()

-	nodeMu.Lock()

-	if setNodeID(id) {

-		ifname = "user"

-		return true

-	}

-	return false

-}

-

-func setNodeID(id []byte) bool {

-	if len(id) < 6 {

-		return false

-	}

-	if nodeID == nil {

-		nodeID = make([]byte, 6)

-	}

-	copy(nodeID, id)

-	return true

-}

-

-// NodeID returns the 6 byte node id encoded in uuid.  It returns nil if uuid is

-// not valid.  The NodeID is only well defined for version 1 and 2 UUIDs.

-func (uuid UUID) NodeID() []byte {

-	if len(uuid) != 16 {

-		return nil

-	}

-	node := make([]byte, 6)

-	copy(node, uuid[10:])

-	return node

-}

deleted file mode 100644

@@ -1,58 +0,0 @@

-// Copyright 2015 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"errors"

-	"fmt"

-)

-

-// Scan implements sql.Scanner so UUIDs can be read from databases transparently

-// Currently, database types that map to string and []byte are supported. Please

-// consult database-specific driver documentation for matching types.

-func (uuid *UUID) Scan(src interface{}) error {

-	switch src.(type) {

-	case string:

-		// if an empty UUID comes from a table, we return a null UUID

-		if src.(string) == "" {

-			return nil

-		}

-

-		// see uuid.Parse for required string format

-		parsed := Parse(src.(string))

-

-		if parsed == nil {

-			return errors.New("Scan: invalid UUID format")

-		}

-

-		*uuid = parsed

-	case []byte:

-		b := src.([]byte)

-

-		// if an empty UUID comes from a table, we return a null UUID

-		if len(b) == 0 {

-			return nil

-		}

-

-		// assumes a simple slice of bytes if 16 bytes

-		// otherwise attempts to parse

-		if len(b) == 16 {

-			*uuid = UUID(b)

-		} else {

-			u := Parse(string(b))

-

-			if u == nil {

-				return errors.New("Scan: invalid UUID format")

-			}

-

-			*uuid = u

-		}

-

-	default:

-		return fmt.Errorf("Scan: unable to scan type %T into UUID", src)

-	}

-

-	return nil

-}

deleted file mode 100755

@@ -1,132 +0,0 @@

-// Copyright 2014 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"encoding/binary"

-	"sync"

-	"time"

-)

-

-// A Time represents a time as the number of 100's of nanoseconds since 15 Oct

-// 1582.

-type Time int64

-

-const (

-	lillian    = 2299160          // Julian day of 15 Oct 1582

-	unix       = 2440587          // Julian day of 1 Jan 1970

-	epoch      = unix - lillian   // Days between epochs

-	g1582      = epoch * 86400    // seconds between epochs

-	g1582ns100 = g1582 * 10000000 // 100s of a nanoseconds between epochs

-)

-

-var (

-	timeMu    sync.Mutex

-	lasttime  uint64 // last time we returned

-	clock_seq uint16 // clock sequence for this run

-

-	timeNow = time.Now // for testing

-)

-

-// UnixTime converts t the number of seconds and nanoseconds using the Unix

-// epoch of 1 Jan 1970.

-func (t Time) UnixTime() (sec, nsec int64) {

-	sec = int64(t - g1582ns100)

-	nsec = (sec % 10000000) * 100

-	sec /= 10000000

-	return sec, nsec

-}

-

-// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and

-// clock sequence as well as adjusting the clock sequence as needed.  An error

-// is returned if the current time cannot be determined.

-func GetTime() (Time, uint16, error) {

-	defer timeMu.Unlock()

-	timeMu.Lock()

-	return getTime()

-}

-

-func getTime() (Time, uint16, error) {

-	t := timeNow()

-

-	// If we don't have a clock sequence already, set one.

-	if clock_seq == 0 {

-		setClockSequence(-1)

-	}

-	now := uint64(t.UnixNano()/100) + g1582ns100

-

-	// If time has gone backwards with this clock sequence then we

-	// increment the clock sequence

-	if now <= lasttime {

-		clock_seq = ((clock_seq + 1) & 0x3fff) | 0x8000

-	}

-	lasttime = now

-	return Time(now), clock_seq, nil

-}

-

-// ClockSequence returns the current clock sequence, generating one if not

-// already set.  The clock sequence is only used for Version 1 UUIDs.

-//

-// The uuid package does not use global static storage for the clock sequence or

-// the last time a UUID was generated.  Unless SetClockSequence a new random

-// clock sequence is generated the first time a clock sequence is requested by

-// ClockSequence, GetTime, or NewUUID.  (section 4.2.1.1) sequence is generated

-// for

-func ClockSequence() int {

-	defer timeMu.Unlock()

-	timeMu.Lock()

-	return clockSequence()

-}

-

-func clockSequence() int {

-	if clock_seq == 0 {

-		setClockSequence(-1)

-	}

-	return int(clock_seq & 0x3fff)

-}

-

-// SetClockSeq sets the clock sequence to the lower 14 bits of seq.  Setting to

-// -1 causes a new sequence to be generated.

-func SetClockSequence(seq int) {

-	defer timeMu.Unlock()

-	timeMu.Lock()

-	setClockSequence(seq)

-}

-

-func setClockSequence(seq int) {

-	if seq == -1 {

-		var b [2]byte

-		randomBits(b[:]) // clock sequence

-		seq = int(b[0])<<8 | int(b[1])

-	}

-	old_seq := clock_seq

-	clock_seq = uint16(seq&0x3fff) | 0x8000 // Set our variant

-	if old_seq != clock_seq {

-		lasttime = 0

-	}

-}

-

-// Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in

-// uuid.  It returns false if uuid is not valid.  The time is only well defined

-// for version 1 and 2 UUIDs.

-func (uuid UUID) Time() (Time, bool) {

-	if len(uuid) != 16 {

-		return 0, false

-	}

-	time := int64(binary.BigEndian.Uint32(uuid[0:4]))

-	time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32

-	time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48

-	return Time(time), true

-}

-

-// ClockSequence returns the clock sequence encoded in uuid.  It returns false

-// if uuid is not valid.  The clock sequence is only well defined for version 1

-// and 2 UUIDs.

-func (uuid UUID) ClockSequence() (int, bool) {

-	if len(uuid) != 16 {

-		return 0, false

-	}

-	return int(binary.BigEndian.Uint16(uuid[8:10])) & 0x3fff, true

-}

deleted file mode 100644

@@ -1,43 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"io"

-)

-

-// randomBits completely fills slice b with random data.

-func randomBits(b []byte) {

-	if _, err := io.ReadFull(rander, b); err != nil {

-		panic(err.Error()) // rand should never fail

-	}

-}

-

-// xvalues returns the value of a byte as a hexadecimal digit or 255.

-var xvalues = [256]byte{

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 255, 255,

-	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

-}

-

-// xtob converts the the first two hex bytes of x into a byte.

-func xtob(x string) (byte, bool) {

-	b1 := xvalues[x[0]]

-	b2 := xvalues[x[1]]

-	return (b1 << 4) | b2, b1 != 255 && b2 != 255

-}

deleted file mode 100644

@@ -1,176 +0,0 @@

-// Copyright 2011 Google Inc.  All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package uuid

-

-import (

-	"bytes"

-	"crypto/rand"

-	"encoding/hex"

-	"fmt"

-	"io"

-	"strings"

-)

-

-// A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC

-// 4122.

-type UUID []byte

-

-// A Version represents a UUIDs version.

-type Version byte

-

-// A Variant represents a UUIDs variant.

-type Variant byte

-

-// Constants returned by Variant.

-const (

-	Invalid   = Variant(iota) // Invalid UUID

-	RFC4122                   // The variant specified in RFC4122

-	Reserved                  // Reserved, NCS backward compatibility.

-	Microsoft                 // Reserved, Microsoft Corporation backward compatibility.

-	Future                    // Reserved for future definition.

-)

-

-var rander = rand.Reader // random function

-

-// New returns a new random (version 4) UUID as a string.  It is a convenience

-// function for NewRandom().String().

-func New() string {

-	return NewRandom().String()

-}

-

-// Parse decodes s into a UUID or returns nil.  Both the UUID form of

-// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and

-// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded.

-func Parse(s string) UUID {

-	if len(s) == 36+9 {

-		if strings.ToLower(s[:9]) != "urn:uuid:" {

-			return nil

-		}

-		s = s[9:]

-	} else if len(s) != 36 {

-		return nil

-	}

-	if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {

-		return nil

-	}

-	var uuid [16]byte

-	for i, x := range [16]int{

-		0, 2, 4, 6,

-		9, 11,

-		14, 16,

-		19, 21,

-		24, 26, 28, 30, 32, 34} {

-		if v, ok := xtob(s[x:]); !ok {

-			return nil

-		} else {

-			uuid[i] = v

-		}

-	}

-	return uuid[:]

-}

-

-// Equal returns true if uuid1 and uuid2 are equal.

-func Equal(uuid1, uuid2 UUID) bool {

-	return bytes.Equal(uuid1, uuid2)

-}

-

-// String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx

-// , or "" if uuid is invalid.

-func (uuid UUID) String() string {

-	if len(uuid) != 16 {

-		return ""

-	}

-	var buf [36]byte

-	encodeHex(buf[:], uuid)

-	return string(buf[:])

-}

-

-// URN returns the RFC 2141 URN form of uuid,

-// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx,  or "" if uuid is invalid.

-func (uuid UUID) URN() string {

-	if len(uuid) != 16 {

-		return ""

-	}

-	var buf [36 + 9]byte

-	copy(buf[:], "urn:uuid:")

-	encodeHex(buf[9:], uuid)

-	return string(buf[:])

-}

-

-func encodeHex(dst []byte, uuid UUID) {

-	hex.Encode(dst[:], uuid[:4])

-	dst[8] = '-'

-	hex.Encode(dst[9:13], uuid[4:6])

-	dst[13] = '-'

-	hex.Encode(dst[14:18], uuid[6:8])

-	dst[18] = '-'

-	hex.Encode(dst[19:23], uuid[8:10])

-	dst[23] = '-'

-	hex.Encode(dst[24:], uuid[10:])

-}

-

-// Variant returns the variant encoded in uuid.  It returns Invalid if

-// uuid is invalid.

-func (uuid UUID) Variant() Variant {

-	if len(uuid) != 16 {

-		return Invalid

-	}

-	switch {

-	case (uuid[8] & 0xc0) == 0x80:

-		return RFC4122

-	case (uuid[8] & 0xe0) == 0xc0:

-		return Microsoft

-	case (uuid[8] & 0xe0) == 0xe0:

-		return Future

-	default:

-		return Reserved

-	}

-}

-

-// Version returns the version of uuid.  It returns false if uuid is not

-// valid.

-func (uuid UUID) Version() (Version, bool) {

-	if len(uuid) != 16 {

-		return 0, false

-	}

-	return Version(uuid[6] >> 4), true

-}

-

-func (v Version) String() string {

-	if v > 15 {

-		return fmt.Sprintf("BAD_VERSION_%d", v)

-	}

-	return fmt.Sprintf("VERSION_%d", v)