Release-1.4.7-20060716

4 files changed, 54 insertions, 0 deletions

diff --git a/qtools/qfile.h b/qtools/qfile.h
index 4ef0685..cfd357b 100644
--- a/qtools/qfile.h
+++ b/qtools/qfile.h
@@ -94,6 +94,9 @@ public:
 
     int		handle() const;
 
+    int64       pos() const;
+    bool        seek(int64 pos);
+
 protected:
     QString	fn;
     FILE       *fh;
diff --git a/qtools/qfile_unix.cpp b/qtools/qfile_unix.cpp
index 6b63d99..fbf6acf 100644
--- a/qtools/qfile_unix.cpp
+++ b/qtools/qfile_unix.cpp
@@ -632,3 +632,24 @@ void QFile::close()
 
     return;
 }
+
+int64 QFile::pos() const
+{
+  if (isOpen())
+  {
+    // TODO: support 64 bit size
+    return ftell( fh );
+  }
+  return -1;
+}
+
+bool QFile::seek( int64 pos )
+{
+  if (isOpen())
+  {
+    // TODO: support 64 bit size
+    return fseek( fh, pos, SEEK_SET )!=-1;
+  }
+  return FALSE;
+}
+
diff --git a/qtools/qfile_win32.cpp b/qtools/qfile_win32.cpp
index 39b1fa5..83c8c8d 100644
--- a/qtools/qfile_win32.cpp
+++ b/qtools/qfile_win32.cpp
@@ -591,3 +591,26 @@ void QFile::close()
 
     return;
 }
+
+int64 QFile::pos() const
+{
+  if (isOpen())
+  {
+    // TODO: support 64 bit size
+    return ftell( fh );
+  }
+  return -1;
+}
+
+bool QFile::seek( int64 pos )
+{
+  if (isOpen())
+  {
+    // TODO: support 64 bit size
+    return fseek( fh, pos, SEEK_SET )!=-1;
+  }
+  return FALSE;
+}
+
+
+
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
index 7dca39b..0123dee 100644
--- a/qtools/qglobal.h
+++ b/qtools/qglobal.h
@@ -336,6 +336,13 @@ typedef unsigned long	ulong;
 typedef char	       *pchar;
 typedef uchar	       *puchar;
 typedef const char     *pcchar;
+#if defined(_OS_WIN32_) && !defined(_CC_GNU_)
+typedef __int64            int64;
+typedef unsigned __int64   uint64;
+#else
+typedef long long          int64;
+typedef unsigned long long uint64;
+#endif
 
 
 //