Move crlf.go to sub pkg

pkg/kubectl/cmd/edit.go

@@ -35,7 +35,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/jsonmerge"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/util/crlf"
 	"k8s.io/kubernetes/pkg/util/strategicpatch"
 	"k8s.io/kubernetes/pkg/util/yaml"
 
@@ -181,7 +181,7 @@ outter:
 			buf := &bytes.Buffer{}
 			var w io.Writer = buf
 			if windowsLineEndings {
-				w = util.NewCRLFWriter(w)
+				w = crlf.NewCRLFWriter(w)
 			}
 			if err := results.header.writeTo(w); err != nil {
 				return preservedFile(err, results.file, out)

pkg/util/crlf.go

@@ -1,57 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"bytes"
-	"io"
-)
-
-type crlfWriter struct {
-	io.Writer
-}
-
-// NewCRLFWriter implements a CR/LF line ending writer used for normalizing
-// text for Windows platforms.
-func NewCRLFWriter(w io.Writer) io.Writer {
-	return crlfWriter{w}
-}
-
-func (w crlfWriter) Write(b []byte) (n int, err error) {
-	for i, written := 0, 0; ; {
-		next := bytes.Index(b[i:], []byte("\n"))
-		if next == -1 {
-			n, err := w.Writer.Write(b[i:])
-			return written + n, err
-		}
-		next = next + i
-		n, err := w.Writer.Write(b[i:next])
-		if err != nil {
-			return written + n, err
-		}
-		written += n
-		n, err = w.Writer.Write([]byte("\r\n"))
-		if err != nil {
-			if n > 1 {
-				n = 1
-			}
-			return written + n, err
-		}
-		written += 1
-		i = next + 1
-	}
-}