X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxsftp.c;h=fd6b528ba6e5eedd270edc47e9ce6da5c8c3569d;hb=7e4eb1f4042323d42e9b7753714a6bf1becd9b5e;hp=8db397ad55160926fdf0826efe41928dde31a75a;hpb=33b7caa5900167e6a8134c3affef352da557af23;p=PuTTY.git

diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 8db397ad..fd6b528b 100644
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -143,14 +143,9 @@ RFile *open_existing_file(char *name, uint64 *size,
 	    memset(&statbuf, 0, sizeof(statbuf));
 	}
 
-	if (size) {
-	    if (sizeof(statbuf.st_size) == 8) {
-		size->hi = statbuf.st_size >> 32;
-		size->lo = (long) statbuf.st_size;
-	    } else {
-		*size = uint64_make(0, statbuf.st_size);
-	    }
-	}
+	if (size)
+	    *size = uint64_make((statbuf.st_size >> 16) >> 16,
+				statbuf.st_size);
 	 	
 	if (mtime)
 	    *mtime = statbuf.st_mtime;
@@ -214,12 +209,8 @@ WFile *open_existing_wfile(char *name, uint64 *size)
 	    memset(&statbuf, 0, sizeof(statbuf));
 	}
 
-	if (sizeof(statbuf.st_size) == 8) {
-	    size->hi = statbuf.st_size >> 32;
-	    size->lo = (long) statbuf.st_size;
-	} else {
-	    *size = uint64_make(0, statbuf.st_size);
-	}
+	*size = uint64_make((statbuf.st_size >> 16) >> 16,
+			    statbuf.st_size);
     }
 
     return ret;
@@ -273,11 +264,7 @@ int seek_file(WFile *f, uint64 offset, int whence)
     off_t fileofft;
     int lseek_whence;
     
-    if (sizeof(off_t) == 8) {
-	fileofft = ((off_t) offset.hi << 32) + offset.lo;
-    } else {
-	fileofft = offset.lo;
-    }
+    fileofft = (((off_t) offset.hi << 16) << 16) + offset.lo;
 
     switch (whence) {
     case FROM_START:
@@ -303,12 +290,7 @@ uint64 get_file_posn(WFile *f)
 
     fileofft = lseek(f->fd, (off_t) 0, SEEK_CUR);
 
-    if (sizeof(off_t) == 8) {
-	ret.hi = fileofft >> 32;
-	ret.lo = (long) fileofft;
-    } else {
-	ret = uint64_make(0, fileofft);
-    }
+    ret = uint64_make((fileofft >> 16) >> 16, fileofft);
 
     return ret;
 }