@@ -9,7 +9,6 @@ import (

 	"github.com/docker/docker/engine"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/signal"

-	"github.com/docker/docker/utils"

 )

 // CmdAttach attaches to a running container.

@@ -81,7 +80,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {

 		return err

 	}

 	if status != 0 {

-		return &utils.StatusError{StatusCode: status}

+		return &StatusError{StatusCode: status}

 	}

 	return nil

@@ -302,7 +302,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 		if jerr.Code == 0 {

 			jerr.Code = 1

 		}

-		return &utils.StatusError{Status: jerr.Message, StatusCode: jerr.Code}

+		return &StatusError{Status: jerr.Message, StatusCode: jerr.Code}

 	}

 	return err

 }

@@ -3,3 +3,15 @@

 // Run "docker help SUBCOMMAND" or "docker SUBCOMMAND --help" to see more information on any Docker subcommand, including the full list of options supported for the subcommand.

 // See https://docs.docker.com/installation/ for instructions on installing Docker.

 package client

+

+import "fmt"

+

+// An StatusError reports an unsuccessful exit by a command.

+type StatusError struct {

+	Status     string

+	StatusCode int

+}

+

+func (e *StatusError) Error() string {

+	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)

+}

@@ -9,7 +9,6 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/pkg/promise"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 // CmdExec runs a command in a running container.

@@ -21,7 +20,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {

 	execConfig, err := runconfig.ParseExec(cmd, args)

 	// just in case the ParseExec does not exit

 	if execConfig.Container == "" || err != nil {

-		return &utils.StatusError{StatusCode: 1}

+		return &StatusError{StatusCode: 1}

 	}

 	stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, nil)

@@ -122,7 +121,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {

 	}

 	if status != 0 {

-		return &utils.StatusError{StatusCode: status}

+		return &StatusError{StatusCode: status}

 	}

 	return nil

@@ -9,8 +9,8 @@ import (

 	"github.com/docker/docker/api/types"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/stringid"

+	"github.com/docker/docker/pkg/stringutils"

 	"github.com/docker/docker/pkg/units"

-	"github.com/docker/docker/utils"

 )

 // CmdHistory shows the history of an image.

@@ -51,7 +51,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {

 			if *noTrunc {

 				fmt.Fprintf(w, "%s\t", entry.CreatedBy)

 			} else {

-				fmt.Fprintf(w, "%s\t", utils.Trunc(entry.CreatedBy, 45))

+				fmt.Fprintf(w, "%s\t", stringutils.Truncate(entry.CreatedBy, 45))

 			}

 			fmt.Fprintf(w, "%s\t", units.HumanSize(float64(entry.Size)))

 			fmt.Fprintf(w, "%s", entry.Comment)

@@ -9,7 +9,6 @@ import (

 	"text/template"

 	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/utils"

 )

 // CmdInspect displays low-level information on one or more containers or images.

@@ -27,7 +26,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {

 		var err error

 		if tmpl, err = template.New("").Funcs(funcMap).Parse(*tmplStr); err != nil {

 			fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)

-			return &utils.StatusError{StatusCode: 64,

+			return &StatusError{StatusCode: 64,

 				Status: "Template parsing error: " + err.Error()}

 		}

 	}

@@ -86,7 +85,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {

 	}

 	if status != 0 {

-		return &utils.StatusError{StatusCode: status}

+		return &StatusError{StatusCode: status}

 	}

 	return nil

 }

@@ -15,8 +15,8 @@ import (

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/parsers/filters"

 	"github.com/docker/docker/pkg/stringid"

+	"github.com/docker/docker/pkg/stringutils"

 	"github.com/docker/docker/pkg/units"

-	"github.com/docker/docker/utils"

 )

 // CmdPs outputs a list of Docker containers.

@@ -135,7 +135,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 		)

 		if !*noTrunc {

-			command = utils.Trunc(command, 20)

+			command = stringutils.Truncate(command, 20)

 			// only display the default name for the container with notrunc is passed

 			for _, name := range names {

@@ -12,7 +12,6 @@ import (

 	"github.com/docker/docker/pkg/resolvconf"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 func (cid *cidFile) Close() error {

@@ -242,7 +241,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 		}

 	}

 	if status != 0 {

-		return &utils.StatusError{StatusCode: status}

+		return &StatusError{StatusCode: status}

 	}

 	return nil

 }

@@ -10,8 +10,8 @@ import (

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/parsers"

+	"github.com/docker/docker/pkg/stringutils"

 	"github.com/docker/docker/registry"

-	"github.com/docker/docker/utils"

 )

 type ByStars []registry.SearchResult

@@ -68,7 +68,7 @@ func (cli *DockerCli) CmdSearch(args ...string) error {

 		desc := strings.Replace(res.Description, "\n", " ", -1)

 		desc = strings.Replace(desc, "\r", " ", -1)

 		if !*noTrunc && len(desc) > 45 {

-			desc = utils.Trunc(desc, 42) + "..."

+			desc = stringutils.Truncate(desc, 42) + "..."

 		}

 		fmt.Fprintf(w, "%s\t%s\t%d\t", res.Name, desc, res.StarCount)

 		if res.IsOfficial {

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

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/promise"

 	"github.com/docker/docker/pkg/signal"

-	"github.com/docker/docker/utils"

 )

 func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {

@@ -156,7 +155,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 			return err

 		}

 		if status != 0 {

-			return &utils.StatusError{StatusCode: status}

+			return &StatusError{StatusCode: status}

 		}

 	}

 	return nil

@@ -25,6 +25,7 @@ import (

 	imagepkg "github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/chrootarchive"

+	"github.com/docker/docker/pkg/httputils"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/parsers"

@@ -35,7 +36,6 @@ import (

 	"github.com/docker/docker/pkg/tarsum"

 	"github.com/docker/docker/pkg/urlutil"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 func (b *Builder) readContext(context io.Reader) error {

@@ -250,7 +250,7 @@ func calcCopyInfo(b *Builder, cmdName string, cInfos *[]*copyInfo, origPath stri

 		*cInfos = append(*cInfos, &ci)

 		// Initiate the download

-		resp, err := utils.Download(ci.origPath)

+		resp, err := httputils.Download(ci.origPath)

 		if err != nil {

 			return err

 		}

@@ -16,12 +16,12 @@ import (

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/pkg/archive"

+	"github.com/docker/docker/pkg/httputils"

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/urlutil"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 // whitelist of commands allowed for a commit/import

@@ -106,7 +106,7 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) error {

 		}

 		context = c

 	} else if urlutil.IsURL(remoteURL) {

-		f, err := utils.Download(remoteURL)

+		f, err := httputils.Download(remoteURL)

 		if err != nil {

 			return err

 		}

@@ -10,7 +10,6 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/pkg/jsonlog"

 	"github.com/docker/docker/pkg/promise"

-	"github.com/docker/docker/utils"

 )

 func (c *Container) AttachWithLogs(stdin io.ReadCloser, stdout, stderr io.Writer, logs, stream bool) error {

@@ -131,7 +130,7 @@ func attach(streamConfig *StreamConfig, openStdin, stdinOnce, tty bool, stdin io

 		var err error

 		if tty {

-			_, err = utils.CopyEscapable(cStdin, stdin)

+			_, err = copyEscapable(cStdin, stdin)

 		} else {

 			_, err = io.Copy(cStdin, stdin)

@@ -185,3 +184,46 @@ func attach(streamConfig *StreamConfig, openStdin, stdinOnce, tty bool, stdin io

 		return nil

 	})

 }

+

+// Code c/c from io.Copy() modified to handle escape sequence

+func copyEscapable(dst io.Writer, src io.ReadCloser) (written int64, err error) {

+	buf := make([]byte, 32*1024)

+	for {

+		nr, er := src.Read(buf)

+		if nr > 0 {

+			// ---- Docker addition

+			// char 16 is C-p

+			if nr == 1 && buf[0] == 16 {

+				nr, er = src.Read(buf)

+				// char 17 is C-q

+				if nr == 1 && buf[0] == 17 {

+					if err := src.Close(); err != nil {

+						return 0, err

+					}

+					return 0, nil

+				}

+			}

+			// ---- End of docker

+			nw, ew := dst.Write(buf[0:nr])

+			if nw > 0 {

+				written += int64(nw)

+			}

+			if ew != nil {

+				err = ew

+				break

+			}

+			if nr != nw {

+				err = io.ErrShortWrite

+				break

+			}

+		}

+		if er == io.EOF {

+			break

+		}

+		if er != nil {

+			err = er

+			break

+		}

+	}

+	return written, err

+}

@@ -1063,7 +1063,7 @@ func (container *Container) setupContainerDns() error {

 			updatedResolvConf, modified := resolvconf.FilterResolvDns(latestResolvConf, container.daemon.config.Bridge.EnableIPv6)

 			if modified {

 				// changes have occurred during resolv.conf localhost cleanup: generate an updated hash

-				newHash, err := utils.HashData(bytes.NewReader(updatedResolvConf))

+				newHash, err := ioutils.HashData(bytes.NewReader(updatedResolvConf))

 				if err != nil {

 					return err

 				}

@@ -1118,7 +1118,7 @@ func (container *Container) setupContainerDns() error {

 	}

 	//get a sha256 hash of the resolv conf at this point so we can check

 	//for changes when the host resolv.conf changes (e.g. network update)

-	resolvHash, err := utils.HashData(bytes.NewReader(resolvConf))

+	resolvHash, err := ioutils.HashData(bytes.NewReader(resolvConf))

 	if err != nil {

 		return err

 	}

@@ -1150,7 +1150,7 @@ func (container *Container) updateResolvConf(updatedResolvConf []byte, newResolv

 	if err != nil {

 		return err

 	}

-	curHash, err := utils.HashData(bytes.NewReader(resolvBytes))

+	curHash, err := ioutils.HashData(bytes.NewReader(resolvBytes))

 	if err != nil {

 		return err

 	}

@@ -32,6 +32,7 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/broadcastwriter"

+	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/graphdb"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/namesgenerator"

@@ -431,7 +432,7 @@ func (daemon *Daemon) setupResolvconfWatcher() error {

 						updatedResolvConf, modified := resolvconf.FilterResolvDns(updatedResolvConf, daemon.config.Bridge.EnableIPv6)

 						if modified {

 							// changes have occurred during localhost cleanup: generate an updated hash

-							newHash, err := utils.HashData(bytes.NewReader(updatedResolvConf))

+							newHash, err := ioutils.HashData(bytes.NewReader(updatedResolvConf))

 							if err != nil {

 								logrus.Debugf("Error generating hash of new resolv.conf: %v", err)

 							} else {

@@ -830,7 +831,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService

 	if err != nil {

 		return nil, fmt.Errorf("Unable to get the TempDir under %s: %s", config.Root, err)

 	}

-	realTmp, err := utils.ReadSymlinkedDirectory(tmp)

+	realTmp, err := fileutils.ReadSymlinkedDirectory(tmp)

 	if err != nil {

 		return nil, fmt.Errorf("Unable to get the full path to the TempDir (%s): %s", tmp, err)

 	}

@@ -841,7 +842,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService

 	if _, err := os.Stat(config.Root); err != nil && os.IsNotExist(err) {

 		realRoot = config.Root

 	} else {

-		realRoot, err = utils.ReadSymlinkedDirectory(config.Root)

+		realRoot, err = fileutils.ReadSymlinkedDirectory(config.Root)

 		if err != nil {

 			return nil, fmt.Errorf("Unable to get the full path to root (%s): %s", config.Root, err)

 		}

@@ -959,7 +960,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService

 		if err := os.Mkdir(path.Dir(localCopy), 0700); err != nil && !os.IsExist(err) {

 			return nil, err

 		}

-		if _, err := utils.CopyFile(sysInitPath, localCopy); err != nil {

+		if _, err := fileutils.CopyFile(sysInitPath, localCopy); err != nil {

 			return nil, err

 		}

 		if err := os.Chmod(localCopy, 0700); err != nil {

@@ -18,10 +18,10 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/daemon/execdriver"

+	"github.com/docker/docker/pkg/stringutils"

 	sysinfo "github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/pkg/term"

 	"github.com/docker/docker/pkg/version"

-	"github.com/docker/docker/utils"

 	"github.com/docker/libcontainer"

 	"github.com/docker/libcontainer/cgroups"

 	"github.com/docker/libcontainer/configs"

@@ -187,7 +187,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba

 		// without exec in go we have to do this horrible shell hack...

 		shellString :=

 			"mount --make-rslave /; exec " +

-				utils.ShellQuoteArguments(params)

+				stringutils.ShellQuoteArguments(params)

 		params = []string{

 			"unshare", "-m", "--", "/bin/sh", "-c", shellString,

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

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/daemon/execdriver"

 	nativeTemplate "github.com/docker/docker/daemon/execdriver/native/template"

-	"github.com/docker/docker/utils"

+	"github.com/docker/docker/pkg/stringutils"

 	"github.com/docker/libcontainer/label"

 )

@@ -177,7 +177,7 @@ func keepCapabilities(adds []string, drops []string) ([]string, error) {

 }

 func dropList(drops []string) ([]string, error) {

-	if utils.StringsContainsNoCase(drops, "all") {

+	if stringutils.InSlice(drops, "all") {

 		var newCaps []string

 		for _, capName := range execdriver.GetAllCapabilities() {

 			cap := execdriver.GetCapability(capName)

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

 	"fmt"

 	"strings"

-	"github.com/docker/docker/utils"

+	"github.com/docker/docker/pkg/stringutils"

 	"github.com/syndtr/gocapability/capability"

 )

@@ -89,17 +89,17 @@ func TweakCapabilities(basics, adds, drops []string) ([]string, error) {

 		if strings.ToLower(cap) == "all" {

 			continue

 		}

-		if !utils.StringsContainsNoCase(allCaps, cap) {

+		if !stringutils.InSlice(allCaps, cap) {

 			return nil, fmt.Errorf("Unknown capability drop: %q", cap)

 		}

 	}

 	// handle --cap-add=all

-	if utils.StringsContainsNoCase(adds, "all") {

+	if stringutils.InSlice(adds, "all") {

 		basics = allCaps

 	}

-	if !utils.StringsContainsNoCase(drops, "all") {

+	if !stringutils.InSlice(drops, "all") {

 		for _, cap := range basics {

 			// skip `all` aready handled above

 			if strings.ToLower(cap) == "all" {

@@ -107,7 +107,7 @@ func TweakCapabilities(basics, adds, drops []string) ([]string, error) {

 			}

 			// if we don't drop `all`, add back all the non-dropped caps

-			if !utils.StringsContainsNoCase(drops, cap) {

+			if !stringutils.InSlice(drops, cap) {

 				newCaps = append(newCaps, strings.ToUpper(cap))

 			}

 		}

@@ -119,12 +119,12 @@ func TweakCapabilities(basics, adds, drops []string) ([]string, error) {

 			continue

 		}

-		if !utils.StringsContainsNoCase(allCaps, cap) {

+		if !stringutils.InSlice(allCaps, cap) {

 			return nil, fmt.Errorf("Unknown capability to add: %q", cap)

 		}

 		// add cap if not already in the list

-		if !utils.StringsContainsNoCase(newCaps, cap) {

+		if !stringutils.InSlice(newCaps, cap) {

 			newCaps = append(newCaps, strings.ToUpper(cap))

 		}

 	}

@@ -8,6 +8,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/engine"

+	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/docker/docker/pkg/parsers/operatingsystem"

 	"github.com/docker/docker/pkg/system"

@@ -61,7 +62,7 @@ func (daemon *Daemon) CmdInfo(job *engine.Job) error {

 	v.SetBool("SwapLimit", daemon.SystemConfig().SwapLimit)

 	v.SetBool("IPv4Forwarding", !daemon.SystemConfig().IPv4ForwardingDisabled)

 	v.SetBool("Debug", os.Getenv("DEBUG") != "")

-	v.SetInt("NFd", utils.GetTotalUsedFds())

+	v.SetInt("NFd", fileutils.GetTotalUsedFds())

 	v.SetInt("NGoroutines", runtime.NumGoroutine())

 	v.Set("SystemTime", time.Now().Format(time.RFC3339Nano))

 	v.Set("ExecutionDriver", daemon.ExecutionDriver().Name())

@@ -4,12 +4,11 @@ import (

 	"testing"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 func TestMergeLxcConfig(t *testing.T) {

 	hostConfig := &runconfig.HostConfig{

-		LxcConf: []utils.KeyValuePair{

+		LxcConf: []runconfig.KeyValuePair{

 			{Key: "lxc.cgroups.cpuset", Value: "1,2"},

 		},

 	}

@@ -15,7 +15,6 @@ import (

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/term"

-	"github.com/docker/docker/utils"

 )

 const (

@@ -136,7 +135,7 @@ func main() {

 	}

 	if err := cli.Cmd(flag.Args()...); err != nil {

-		if sterr, ok := err.(*utils.StatusError); ok {

+		if sterr, ok := err.(*client.StatusError); ok {

 			if sterr.Status != "" {

 				logrus.Println(sterr.Status)

 			}

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

 	"strings"

 	"time"

-	"github.com/docker/docker/utils"

+	"github.com/docker/docker/pkg/ioutils"

 )

 type Env []string

@@ -258,7 +258,7 @@ func (env *Env) Encode(dst io.Writer) error {

 }

 func (env *Env) WriteTo(dst io.Writer) (int64, error) {

-	wc := utils.NewWriteCounter(dst)

+	wc := ioutils.NewWriteCounter(dst)

 	err := env.Encode(wc)

 	return wc.Count, err

 }

@@ -25,7 +25,6 @@ import (

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/truncindex"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 // A Graph is a store for versioned filesystem images and the relationship between them.

@@ -154,7 +153,7 @@ func (graph *Graph) Register(img *image.Image, layerData archive.ArchiveReader)

 			graph.driver.Remove(img.ID)

 		}

 	}()

-	if err := utils.ValidateID(img.ID); err != nil {

+	if err := image.ValidateID(img.ID); err != nil {

 		return err

 	}

 	// (This is a convenience to save time. Race conditions are taken care of by os.Rename)

@@ -9,6 +9,7 @@ import (

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/archive"

+	"github.com/docker/docker/pkg/httputils"

 	"github.com/docker/docker/pkg/progressreader"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/runconfig"

@@ -46,7 +47,7 @@ func (s *TagStore) CmdImport(job *engine.Job) error {

 			u.Path = ""

 		}

 		job.Stdout.Write(sf.FormatStatus("", "Downloading from %s", u))

-		resp, err = utils.Download(u.String())

+		resp, err = httputils.Download(u.String())

 		if err != nil {

 			return err

 		}

@@ -13,7 +13,6 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/chrootarchive"

-	"github.com/docker/docker/utils"

 )

 // Loads a set of images into the repository. This is the complementary of ImageExport.

@@ -100,7 +99,7 @@ func (s *TagStore) recursiveLoad(eng *engine.Engine, address, tmpImageDir string

 			logrus.Debugf("Error unmarshalling json", err)

 			return err

 		}

-		if err := utils.ValidateID(img.ID); err != nil {

+		if err := image.ValidateID(img.ID); err != nil {

 			logrus.Debugf("Error validating ID: %s", err)

 			return err

 		}

@@ -6,12 +6,12 @@ import (

 	"io/ioutil"

 	"os"

 	"path"

+	"regexp"

 	"strconv"

 	"time"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/utils"

 )

 // Set the max depth to the aufs default that most

@@ -51,7 +51,7 @@ func LoadImage(root string) (*Image, error) {

 	if err := dec.Decode(img); err != nil {

 		return nil, err

 	}

-	if err := utils.ValidateID(img.ID); err != nil {

+	if err := ValidateID(img.ID); err != nil {

 		return nil, err

 	}

@@ -263,3 +263,13 @@ func NewImgJSON(src []byte) (*Image, error) {

 	}

 	return ret, nil

 }

+

+// Check wheather id is a valid image ID or not

+func ValidateID(id string) error {

+	validHex := regexp.MustCompile(`^([a-f0-9]{64})$`)

+	if ok := validHex.MatchString(id); !ok {

+		err := fmt.Errorf("image ID '%s' is invalid", id)

+		return err

+	}

+	return nil

+}

@@ -15,7 +15,6 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/utils"

 )

 func TestMount(t *testing.T) {

@@ -103,7 +102,7 @@ func TestGraphCreate(t *testing.T) {

 	if err != nil {

 		t.Fatal(err)

 	}

-	if err := utils.ValidateID(img.ID); err != nil {

+	if err := image.ValidateID(img.ID); err != nil {

 		t.Fatal(err)

 	}

 	if img.Comment != "Testing" {

@@ -23,6 +23,7 @@ import (

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/nat"

+	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/stringid"

@@ -121,7 +122,7 @@ func init() {

 	spawnGlobalDaemon()

 	spawnLegitHttpsDaemon()

 	spawnRogueHttpsDaemon()

-	startFds, startGoroutines = utils.GetTotalUsedFds(), runtime.NumGoroutine()

+	startFds, startGoroutines = fileutils.GetTotalUsedFds(), runtime.NumGoroutine()

 }

 func setupBaseImage() {

@@ -1,13 +1,14 @@

 package docker

 import (

-	"github.com/docker/docker/utils"

 	"runtime"

 	"testing"

+

+	"github.com/docker/docker/pkg/fileutils"

 )

 func displayFdGoroutines(t *testing.T) {

-	t.Logf("File Descriptors: %d, Goroutines: %d", utils.GetTotalUsedFds(), runtime.NumGoroutine())

+	t.Logf("File Descriptors: %d, Goroutines: %d", fileutils.GetTotalUsedFds(), runtime.NumGoroutine())

 }

 func TestFinal(t *testing.T) {

@@ -1,6 +1,10 @@

 package fileutils

 import (

+	"fmt"

+	"io"

+	"io/ioutil"

+	"os"

 	"path/filepath"

 	"github.com/Sirupsen/logrus"

@@ -25,3 +29,53 @@ func Matches(relFilePath string, patterns []string) (bool, error) {

 	}

 	return false, nil

 }

+

+func CopyFile(src, dst string) (int64, error) {

+	if src == dst {

+		return 0, nil

+	}

+	sf, err := os.Open(src)

+	if err != nil {

+		return 0, err

+	}

+	defer sf.Close()

+	if err := os.Remove(dst); err != nil && !os.IsNotExist(err) {

+		return 0, err

+	}

+	df, err := os.Create(dst)

+	if err != nil {

+		return 0, err

+	}

+	defer df.Close()

+	return io.Copy(df, sf)

+}

+

+func GetTotalUsedFds() int {

+	if fds, err := ioutil.ReadDir(fmt.Sprintf("/proc/%d/fd", os.Getpid())); err != nil {

+		logrus.Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)

+	} else {

+		return len(fds)

+	}

+	return -1

+}

+

+// ReadSymlinkedDirectory returns the target directory of a symlink.

+// The target of the symbolic link may not be a file.

+func ReadSymlinkedDirectory(path string) (string, error) {

+	var realPath string

+	var err error

+	if realPath, err = filepath.Abs(path); err != nil {

+		return "", fmt.Errorf("unable to get absolute path for %s: %s", path, err)

+	}

+	if realPath, err = filepath.EvalSymlinks(realPath); err != nil {

+		return "", fmt.Errorf("failed to canonicalise path for %s: %s", path, err)

+	}

+	realPathInfo, err := os.Stat(realPath)

+	if err != nil {

+		return "", fmt.Errorf("failed to stat target '%s' of '%s': %s", realPath, path, err)

+	}

+	if !realPathInfo.Mode().IsDir() {

+		return "", fmt.Errorf("canonical path points to a file '%s'", realPath)

+	}

+	return realPath, nil

+}

new file mode 100644

@@ -0,0 +1,81 @@

+package fileutils

+

+import (

+	"os"

+	"testing"

+)

+

+// Reading a symlink to a directory must return the directory

+func TestReadSymlinkedDirectoryExistingDirectory(t *testing.T) {

+	var err error

+	if err = os.Mkdir("/tmp/testReadSymlinkToExistingDirectory", 0777); err != nil {

+		t.Errorf("failed to create directory: %s", err)

+	}

+

+	if err = os.Symlink("/tmp/testReadSymlinkToExistingDirectory", "/tmp/dirLinkTest"); err != nil {

+		t.Errorf("failed to create symlink: %s", err)

+	}

+

+	var path string

+	if path, err = ReadSymlinkedDirectory("/tmp/dirLinkTest"); err != nil {

+		t.Fatalf("failed to read symlink to directory: %s", err)

+	}

+

+	if path != "/tmp/testReadSymlinkToExistingDirectory" {

+		t.Fatalf("symlink returned unexpected directory: %s", path)

+	}

+

+	if err = os.Remove("/tmp/testReadSymlinkToExistingDirectory"); err != nil {

+		t.Errorf("failed to remove temporary directory: %s", err)

+	}

+

+	if err = os.Remove("/tmp/dirLinkTest"); err != nil {

+		t.Errorf("failed to remove symlink: %s", err)

+	}

+}

+

+// Reading a non-existing symlink must fail

+func TestReadSymlinkedDirectoryNonExistingSymlink(t *testing.T) {

+	var path string

+	var err error

+	if path, err = ReadSymlinkedDirectory("/tmp/test/foo/Non/ExistingPath"); err == nil {

+		t.Fatalf("error expected for non-existing symlink")

+	}

+

+	if path != "" {

+		t.Fatalf("expected empty path, but '%s' was returned", path)

+	}

+}

+

+// Reading a symlink to a file must fail

+func TestReadSymlinkedDirectoryToFile(t *testing.T) {

+	var err error

+	var file *os.File

+

+	if file, err = os.Create("/tmp/testReadSymlinkToFile"); err != nil {

+		t.Fatalf("failed to create file: %s", err)

+	}

+

+	file.Close()

+

+	if err = os.Symlink("/tmp/testReadSymlinkToFile", "/tmp/fileLinkTest"); err != nil {

+		t.Errorf("failed to create symlink: %s", err)

+	}

+

+	var path string

+	if path, err = ReadSymlinkedDirectory("/tmp/fileLinkTest"); err == nil {

+		t.Fatalf("ReadSymlinkedDirectory on a symlink to a file should've failed")

+	}

+

+	if path != "" {

+		t.Fatalf("path should've been empty: %s", path)

+	}

+

+	if err = os.Remove("/tmp/testReadSymlinkToFile"); err != nil {

+		t.Errorf("failed to remove file: %s", err)

+	}

+

+	if err = os.Remove("/tmp/fileLinkTest"); err != nil {

+		t.Errorf("failed to remove symlink: %s", err)

+	}

+}

new file mode 100644

@@ -0,0 +1,26 @@

+package httputils

+

+import (

+	"fmt"

+	"net/http"

+

+	"github.com/docker/docker/pkg/jsonmessage"

+)

+

+// Request a given URL and return an io.Reader

+func Download(url string) (resp *http.Response, err error) {

+	if resp, err = http.Get(url); err != nil {

+		return nil, err

+	}

+	if resp.StatusCode >= 400 {

+		return nil, fmt.Errorf("Got HTTP status code >= 400: %s", resp.Status)

+	}

+	return resp, nil

+}

+

+func NewHTTPRequestError(msg string, res *http.Response) error {

+	return &jsonmessage.JSONError{

+		Message: msg,

+		Code:    res.StatusCode,

+	}

+}

@@ -3,6 +3,8 @@ package ioutils

 import (