Merge pull request pkg#216 from pkg/issue214/empty-file

respect create flag in open packet

request-server.go

@@ -152,7 +152,12 @@ func (rs *RequestServer) packetWorker(pktChan chan requestPacket) error {
 		case *sshFxpRealpathPacket:
 			rpkt = cleanPacketPath(pkt)
 		case isOpener:
-			handle := rs.nextRequest(requestFromPacket(pkt))
+			request := requestFromPacket(pkt)
+			handle := rs.nextRequest(request)
+			p, ok := pkt.(*sshFxpOpenPacket)
+			if ok && p.hasPflags(ssh_FXF_CREAT) {
+				request.call(rs.Handlers, pkt)
+			}
 			rpkt = sshFxpHandlePacket{pkt.id(), handle}
 		case *sshFxpFstatPacket:
 			handle := pkt.getHandle()

request-server_test.go

@@ -127,6 +127,20 @@ func TestRequestWrite(t *testing.T) {
 	assert.Equal(t, f.content, []byte("hello"))
 }
 
+func TestRequestWriteEmpty(t *testing.T) {
+	p := clientRequestServerPair(t)
+	defer p.Close()
+	n, err := putTestFile(p.cli, "/foo", "")
+	assert.Nil(t, err)
+	assert.Equal(t, 0, n)
+	r := p.testHandler()
+	f, err := r.fetch("/foo")
+	if assert.Nil(t, err) {
+		assert.False(t, f.isdir)
+		assert.Equal(t, f.content, []byte(""))
+	}
+}
+
 // needs fail check
 func TestRequestFilename(t *testing.T) {
 	p := clientRequestServerPair(t)

request.go

@@ -135,7 +135,7 @@ func (r *Request) call(handlers Handlers, pkt requestPacket) responsePacket {
 	switch r.Method {
 	case "Get":
 		return fileget(handlers.FileGet, r, pd)
-	case "Put": // add "Append" to this to handle append only file writes
+	case "Put", "Open": // add "Append" to handle append only file writes
 		return fileput(handlers.FilePut, r, pd)
 	case "Setstat", "Rename", "Rmdir", "Mkdir", "Symlink", "Remove":
 		return filecmd(handlers.FileCmd, r, pd)