From ed280d5ac360e2af796e9bd973d7b4df89f0c449 Mon Sep 17 00:00:00 2001
From: "Jeremy T. Bouse" <jbouse@debian.org>
Date: Fri, 27 Nov 2009 16:20:12 -0500
Subject: Imported Upstream version 1.7.4

---
 paramiko/sftp_handle.py | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'paramiko/sftp_handle.py')

diff --git a/paramiko/sftp_handle.py b/paramiko/sftp_handle.py
index e1d93e9..e976f43 100644
--- a/paramiko/sftp_handle.py
+++ b/paramiko/sftp_handle.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2005 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007  Robey Pointer <robey@lag.net>
 #
 # This file is part of paramiko.
 #
@@ -35,7 +35,16 @@ class SFTPHandle (object):
     Server implementations can (and should) subclass SFTPHandle to implement
     features of a file handle, like L{stat} or L{chattr}.
     """
-    def __init__(self):
+    def __init__(self, flags=0):
+        """
+        Create a new file handle representing a local file being served over
+        SFTP.  If C{flags} is passed in, it's used to determine if the file
+        is open in append mode.
+        
+        @param flags: optional flags as passed to L{SFTPServerInterface.open}
+        @type flags: int
+        """
+        self.__flags = flags
         self.__name = None
         # only for handles to folders:
         self.__files = { }
@@ -81,15 +90,16 @@ class SFTPHandle (object):
         @return: data read from the file, or an SFTP error code.
         @rtype: str
         """
-        if not hasattr(self, 'readfile') or (self.readfile is None):
+        readfile = getattr(self, 'readfile', None)
+        if readfile is None:
             return SFTP_OP_UNSUPPORTED
         try:
             if self.__tell is None:
-                self.__tell = self.readfile.tell()
+                self.__tell = readfile.tell()
             if offset != self.__tell:
-                self.readfile.seek(offset)
+                readfile.seek(offset)
                 self.__tell = offset
-            data = self.readfile.read(length)
+            data = readfile.read(length)
         except IOError, e:
             self.__tell = None
             return SFTPServer.convert_errno(e.errno)
@@ -116,20 +126,24 @@ class SFTPHandle (object):
         @type data: str
         @return: an SFTP error code like L{SFTP_OK}.
         """
-        if not hasattr(self, 'writefile') or (self.writefile is None):
+        writefile = getattr(self, 'writefile', None)
+        if writefile is None:
             return SFTP_OP_UNSUPPORTED
         try:
-            if self.__tell is None:
-                self.__tell = self.writefile.tell()
-            if offset != self.__tell:
-                self.writefile.seek(offset)
-                self.__tell = offset
-            self.writefile.write(data)
-            self.writefile.flush()
+            # in append mode, don't care about seeking
+            if (self.__flags & os.O_APPEND) == 0:
+                if self.__tell is None:
+                    self.__tell = writefile.tell()
+                if offset != self.__tell:
+                    writefile.seek(offset)
+                    self.__tell = offset
+            writefile.write(data)
+            writefile.flush()
         except IOError, e:
             self.__tell = None
             return SFTPServer.convert_errno(e.errno)
-        self.__tell += len(data)
+        if self.__tell is not None:
+            self.__tell += len(data)
         return SFTP_OK
 
     def stat(self):
-- 
cgit v1.2.3