Added file I/O and file access API

git-svn-id: http://svn.pjsip.org/repos/pjproject/main@18 74dad513-b988-da41-8d7b-12977e46ad98

8 files changed, 724 insertions, 14 deletions

diff --git a/pjlib/src/pj/file_access_win32.c b/pjlib/src/pj/file_access_win32.c
new file mode 100644
index 00000000..36405658
--- /dev/null
+++ b/pjlib/src/pj/file_access_win32.c
@@ -0,0 +1,172 @@
+/* $Id$ */

+#include <pj/file_access.h>

+#include <pj/assert.h>

+#include <pj/errno.h>

+#include <windows.h>

+#include <time.h>

+

+/*

+ * pj_file_exists()

+ */

+PJ_DEF(pj_bool_t) pj_file_exists(const char *filename)

+{

+    HANDLE hFile;

+

+    PJ_ASSERT_RETURN(filename != NULL, 0);

+

+    hFile = CreateFile(filename, READ_CONTROL, FILE_SHARE_READ, NULL,

+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

+    if (hFile == INVALID_HANDLE_VALUE)

+        return 0;

+

+    CloseHandle(hFile);

+    return PJ_TRUE;

+}

+

+

+/*

+ * pj_file_size()

+ */

+PJ_DEF(pj_off_t) pj_file_size(const char *filename)

+{

+    HANDLE hFile;

+    DWORD sizeLo, sizeHi;

+    pj_off_t size;

+

+    PJ_ASSERT_RETURN(filename != NULL, -1);

+

+    hFile = CreateFile(filename, READ_CONTROL, 

+                       FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,

+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

+    if (hFile == INVALID_HANDLE_VALUE)

+        return -1;

+

+    sizeLo = GetFileSize(hFile, &sizeHi);

+    if (sizeLo == INVALID_FILE_SIZE) {

+        DWORD dwStatus = GetLastError();

+        if (dwStatus != NO_ERROR) {

+            CloseHandle(hFile);

+            return -1;

+        }

+    }

+

+    size = sizeHi;

+    size = (size << 32) + sizeLo;

+

+    CloseHandle(hFile);

+    return size;

+}

+

+

+/*

+ * pj_file_delete()

+ */

+PJ_DEF(pj_status_t) pj_file_delete(const char *filename)

+{

+    PJ_ASSERT_RETURN(filename != NULL, PJ_EINVAL);

+

+    if (DeleteFile(filename) == FALSE)

+        return PJ_RETURN_OS_ERROR(GetLastError());

+

+    return PJ_SUCCESS;

+}

+

+

+/*

+ * pj_file_move()

+ */

+PJ_DEF(pj_status_t) pj_file_move( const char *oldname, const char *newname)

+{

+    BOOL rc;

+

+    PJ_ASSERT_RETURN(oldname!=NULL && newname!=NULL, PJ_EINVAL);

+

+#if PJ_WIN32_WINNT >= 0x0400

+    rc = MoveFileEx(oldname, newname, 

+                    MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING);

+#else

+    rc = MoveFile(oldname, newname);

+#endif

+

+    if (!rc)

+        return PJ_RETURN_OS_ERROR(GetLastError());

+

+    return PJ_SUCCESS;

+}

+

+

+static pj_status_t file_time_to_time_val(const FILETIME *file_time,

+                                         pj_time_val *time_val)

+{

+    SYSTEMTIME systemTime, localTime;

+    struct tm tm;

+

+    if (!FileTimeToSystemTime(file_time, &systemTime))

+        return -1;

+

+    if (!SystemTimeToTzSpecificLocalTime(NULL, &systemTime, &localTime))

+        return -1;

+

+    memset(&tm, 0, sizeof(struct tm));

+    tm.tm_year = localTime.wYear - 1900;

+    tm.tm_mon = localTime.wMonth - 1;

+    tm.tm_mday = localTime.wDay;

+    tm.tm_hour = localTime.wHour;

+    tm.tm_min = localTime.wMinute;

+    tm.tm_sec = localTime.wSecond;

+    tm.tm_isdst = 0;

+

+    time_val->sec = mktime(&tm);

+    if (time_val->sec == (time_t)-1)

+        return -1;

+

+    time_val->msec = localTime.wMilliseconds;

+

+    return PJ_SUCCESS;

+}

+

+/*

+ * pj_file_getstat()

+ */

+PJ_DEF(pj_status_t) pj_file_getstat(const char *filename, pj_file_stat *stat)

+{

+    HANDLE hFile;

+    DWORD sizeLo, sizeHi;

+    FILETIME creationTime, accessTime, writeTime;

+

+    PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL);

+

+    hFile = CreateFile(filename, READ_CONTROL, FILE_SHARE_READ, NULL,

+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

+    if (hFile == INVALID_HANDLE_VALUE)

+        return PJ_RETURN_OS_ERROR(GetLastError());

+

+    sizeLo = GetFileSize(hFile, &sizeHi);

+    if (sizeLo == INVALID_FILE_SIZE) {

+        DWORD dwStatus = GetLastError();

+        if (dwStatus != NO_ERROR) {

+            CloseHandle(hFile);

+            return PJ_RETURN_OS_ERROR(dwStatus);

+        }

+    }

+

+    stat->size = sizeHi;

+    stat->size = (stat->size << 32) + sizeLo;

+

+    if (GetFileTime(hFile, &creationTime, &accessTime, &writeTime)==FALSE) {

+        DWORD dwStatus = GetLastError();

+        CloseHandle(hFile);

+        return PJ_RETURN_OS_ERROR(dwStatus);

+    }

+

+    CloseHandle(hFile);

+

+    if (file_time_to_time_val(&creationTime, &stat->ctime) != PJ_SUCCESS)

+        return PJ_RETURN_OS_ERROR(GetLastError());

+

+    file_time_to_time_val(&accessTime, &stat->atime);

+    file_time_to_time_val(&writeTime, &stat->mtime);

+

+    return PJ_SUCCESS;

+}

+

diff --git a/pjlib/src/pj/file_io_ansi.c b/pjlib/src/pj/file_io_ansi.c
new file mode 100644
index 00000000..f95c74a9
--- /dev/null
+++ b/pjlib/src/pj/file_io_ansi.c
@@ -0,0 +1,138 @@
+/* $Id$ */
+#include <pj/file_io.h>
+#include <pj/assert.h>
+#include <pj/errno.h>
+#include <stdio.h>
+#include <errno.h>
+
+PJ_DEF(pj_status_t) pj_file_open( pj_pool_t *pool,
+                                  const char *pathname, 
+                                  unsigned flags,
+                                  pj_oshandle_t *fd)
+{
+    char mode[8];
+    char *p = mode;
+
+    PJ_ASSERT_RETURN(pathname && fd, PJ_EINVAL);
+    PJ_UNUSED_ARG(pool);
+
+    if ((flags & PJ_O_APPEND) == PJ_O_APPEND) {
+        if ((flags & PJ_O_WRONLY) == PJ_O_WRONLY) {
+            *p++ = 'a';
+            if ((flags & PJ_O_RDONLY) == PJ_O_RDONLY)
+                *p++ = '+';
+        } else {
+            /* This is invalid.
+             * Can not specify PJ_O_RDONLY with PJ_O_APPEND! 
+             */
+        }
+    } else {
+        if ((flags & PJ_O_RDONLY) == PJ_O_RDONLY) {
+            *p++ = 'r';
+            if ((flags & PJ_O_WRONLY) == PJ_O_WRONLY)
+                *p++ = '+';
+        } else {
+            *p++ = 'w';
+        }
+    }
+
+    if (p==mode)
+        return PJ_EINVAL;
+
+    *p++ = 'b';
+    *p++ = '\0';
+
+    *fd = fopen(pathname, mode);
+    if (*fd == NULL)
+        return PJ_RETURN_OS_ERROR(errno);
+    
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_close(pj_oshandle_t fd)
+{
+    PJ_ASSERT_RETURN(fd, PJ_EINVAL);
+    if (fclose((FILE*)fd) != 0)
+        return PJ_RETURN_OS_ERROR(errno);
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_write( pj_oshandle_t fd,
+                                   const void *data,
+                                   pj_ssize_t *size)
+{
+    size_t written;
+
+    clearerr((FILE*)fd);
+    written = fwrite(data, 1, *size, (FILE*)fd);
+    if (ferror((FILE*)fd)) {
+        return PJ_RETURN_OS_ERROR(errno);
+    }
+
+    *size = written;
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_read( pj_oshandle_t fd,
+                                  void *data,
+                                  pj_ssize_t *size)
+{
+    size_t bytes;
+
+    clearerr((FILE*)fd);
+    bytes = fread(data, 1, *size, (FILE*)fd);
+    if (ferror((FILE*)fd)) {
+        return PJ_RETURN_OS_ERROR(errno);
+    }
+
+    *size = bytes;
+    return PJ_SUCCESS;
+}
+

+PJ_DEF(pj_bool_t) pj_file_eof(pj_oshandle_t fd, enum pj_file_access access)

+{

+    PJ_UNUSED_ARG(access);

+    return feof((FILE*)fd) ? PJ_TRUE : 0;

+}

+
+PJ_DEF(pj_status_t) pj_file_setpos( pj_oshandle_t fd,
+                                    pj_off_t offset,
+                                    enum pj_file_seek_type whence)
+{
+    int mode;
+
+    switch (whence) {
+    case PJ_SEEK_SET:
+        mode = SEEK_SET; break;
+    case PJ_SEEK_CUR:
+        mode = SEEK_CUR; break;
+    case PJ_SEEK_END:
+        mode = SEEK_END; break;
+    default:
+        pj_assert(!"Invalid whence in file_setpos");
+        return PJ_EINVAL;
+    }
+
+    if (fseek((FILE*)fd, (long)offset, mode) != 0)
+        return PJ_RETURN_OS_ERROR(errno);
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_getpos( pj_oshandle_t fd,
+                                    pj_off_t *pos)
+{
+    long offset;
+
+    offset = ftell((FILE*)fd);
+    if (offset == -1) {
+        *pos = -1;
+        return PJ_RETURN_OS_ERROR(errno);
+    }
+
+    *pos = offset;
+    return PJ_SUCCESS;
+}
+
+
diff --git a/pjlib/src/pj/file_io_win32.c b/pjlib/src/pj/file_io_win32.c
new file mode 100644
index 00000000..d9908410
--- /dev/null
+++ b/pjlib/src/pj/file_io_win32.c
@@ -0,0 +1,186 @@
+/* $Id$ */
+#include <pj/file_io.h>
+#include <pj/errno.h>
+#include <pj/assert.h>
+
+#include <windows.h>
+
+#ifndef INVALID_SET_FILE_POINTER
+#   define INVALID_SET_FILE_POINTER     ((DWORD)-1)
+#endif
+

+/**

+ * Check for end-of-file condition on the specified descriptor.

+ *

+ * @param fd            The file descriptor.

+ * @param access        The desired access.

+ *

+ * @return              Non-zero if file is EOF.

+ */

+PJ_DECL(pj_bool_t) pj_file_eof(pj_oshandle_t fd, 

+                               enum pj_file_access access);

+
+
+PJ_DEF(pj_status_t) pj_file_open( pj_pool_t *pool,
+                                  const char *pathname, 
+                                  unsigned flags,
+                                  pj_oshandle_t *fd)
+{
+    HANDLE hFile;
+    DWORD dwDesiredAccess = 0;
+    DWORD dwShareMode = 0;
+    DWORD dwCreationDisposition = 0;
+    DWORD dwFlagsAndAttributes = 0;
+
+    PJ_UNUSED_ARG(pool);
+
+    PJ_ASSERT_RETURN(pathname!=NULL, PJ_EINVAL);
+
+    if ((flags & PJ_O_WRONLY) == PJ_O_WRONLY) {
+        dwDesiredAccess |= GENERIC_WRITE;
+        if ((flags & PJ_O_APPEND) == PJ_O_APPEND) {
+            dwDesiredAccess |= FILE_APPEND_DATA;
+        } else {
+            dwDesiredAccess &= ~(FILE_APPEND_DATA);

+            dwCreationDisposition |= CREATE_ALWAYS;

+        }
+    }
+    if ((flags & PJ_O_RDONLY) == PJ_O_RDONLY) {

+        dwDesiredAccess |= GENERIC_READ;

+        if (flags == PJ_O_RDONLY)

+            dwCreationDisposition |= OPEN_EXISTING;

+    }

+
+    if (dwDesiredAccess == 0) {
+        pj_assert(!"Invalid file open flags");
+        return PJ_EINVAL;
+    }
+
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL;
+

+    hFile = CreateFile(pathname, dwDesiredAccess, dwShareMode, NULL,
+                       dwCreationDisposition, dwFlagsAndAttributes, NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        *fd = 0;
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+
+    *fd = hFile;
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_close(pj_oshandle_t fd)
+{
+    if (CloseHandle(fd)==0)
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_write( pj_oshandle_t fd,
+                                   const void *data,
+                                   pj_ssize_t *size)
+{
+    BOOL rc;
+    DWORD bytesWritten;
+
+    rc = WriteFile(fd, data, *size, &bytesWritten, NULL);
+    if (!rc) {
+        *size = -1;
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+
+    *size = bytesWritten;
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_read( pj_oshandle_t fd,
+                                  void *data,
+                                  pj_ssize_t *size)
+{
+    BOOL rc;
+    DWORD bytesRead;
+
+    rc = ReadFile(fd, data, *size, &bytesRead, NULL);
+    if (!rc) {
+        *size = -1;
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+
+    *size = bytesRead;
+    return PJ_SUCCESS;
+}
+

+/*

+PJ_DEF(pj_bool_t) pj_file_eof(pj_oshandle_t fd, enum pj_file_access access)

+{

+    BOOL rc;

+    DWORD dummy = 0, bytes;

+    DWORD dwStatus;

+

+    if ((access & PJ_O_RDONLY) == PJ_O_RDONLY) {

+        rc = ReadFile(fd, &dummy, 0, &bytes, NULL);

+    } else if ((access & PJ_O_WRONLY) == PJ_O_WRONLY) {

+        rc = WriteFile(fd, &dummy, 0, &bytes, NULL);

+    } else {

+        pj_assert(!"Invalid access");

+        return PJ_TRUE;

+    }

+

+    dwStatus = GetLastError();

+    if (dwStatus==ERROR_HANDLE_EOF)

+        return PJ_TRUE;

+

+    return 0;

+}

+*/

+
+PJ_DEF(pj_status_t) pj_file_setpos( pj_oshandle_t fd,
+                                    pj_off_t offset,
+                                    enum pj_file_seek_type whence)
+{
+    DWORD dwMoveMethod;
+    DWORD dwNewPos;
+    LONG  hi32;
+
+    if (whence == PJ_SEEK_SET)
+        dwMoveMethod = FILE_BEGIN;
+    else if (whence == PJ_SEEK_CUR)
+        dwMoveMethod = FILE_CURRENT;
+    else if (whence == PJ_SEEK_END)
+        dwMoveMethod = FILE_END;
+    else {
+        pj_assert(!"Invalid whence in file_setpos");
+        return PJ_EINVAL;
+    }
+
+    hi32 = (LONG)(offset >> 32);
+    dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod);
+    if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) {
+        DWORD dwStatus = GetLastError();
+        if (dwStatus != 0)
+            return PJ_RETURN_OS_ERROR(dwStatus);
+        /* dwNewPos actually is not an error. */
+    }
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_file_getpos( pj_oshandle_t fd,
+                                    pj_off_t *pos)
+{
+    LONG hi32 = 0;
+    DWORD lo32;
+
+    lo32 = SetFilePointer(fd, 0, &hi32, FILE_CURRENT);
+    if (lo32 == (DWORD)INVALID_SET_FILE_POINTER) {
+        DWORD dwStatus = GetLastError();
+        if (dwStatus != 0)
+            return PJ_RETURN_OS_ERROR(dwStatus);
+    }
+
+    *pos = hi32;
+    *pos = (*pos << 32) + lo32;
+    return PJ_SUCCESS;
+}
+
diff --git a/pjlib/src/pj/ioqueue_winnt.c b/pjlib/src/pj/ioqueue_winnt.c
index afb75c54..32a74666 100644
--- a/pjlib/src/pj/ioqueue_winnt.c
+++ b/pjlib/src/pj/ioqueue_winnt.c
@@ -33,9 +33,9 @@ typedef struct generic_overlapped
     WSAOVERLAPPED	   overlapped;

     pj_ioqueue_operation_e operation;

 } generic_overlapped;

-
+

 /*
- * OVERLAP structure for send and receive.
+ * OVERLAPPPED structure for send and receive.
  */
 typedef struct ioqueue_overlapped
 {
@@ -74,6 +74,14 @@ union operation_key
     ioqueue_accept_rec      accept;

 #endif

 };

+

+/* Type of handle in the key. */

+enum handle_type

+{

+    HND_IS_UNKNOWN,

+    HND_IS_FILE,

+    HND_IS_SOCKET,

+};

 
 /*
  * Structure for individual socket.
@@ -82,7 +90,8 @@ struct pj_ioqueue_key_t
 {

     pj_ioqueue_t       *ioqueue;
     HANDLE		hnd;
-    void	       *user_data;
+    void	       *user_data;

+    enum handle_type    hnd_type;
 #if PJ_HAS_TCP
     int			connecting;
 #endif
@@ -316,7 +325,8 @@ PJ_DEF(pj_status_t) pj_ioqueue_register_sock( pj_pool_t *pool,
     /* Build the key for this socket. */
     rec = pj_pool_zalloc(pool, sizeof(pj_ioqueue_key_t));

     rec->ioqueue = ioqueue;
-    rec->hnd = (HANDLE)sock;
+    rec->hnd = (HANDLE)sock;

+    rec->hnd_type = HND_IS_SOCKET;
     rec->user_data = user_data;
     pj_memcpy(&rec->cb, cb, sizeof(pj_ioqueue_callback));
 

@@ -336,7 +346,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_register_sock( pj_pool_t *pool,
     *key = rec;
     return PJ_SUCCESS;
 }
-
+

 /*
  * pj_ioqueue_unregister()

  */
@@ -362,7 +372,10 @@ PJ_DEF(pj_status_t) pj_ioqueue_unregister( pj_ioqueue_key_t *key )
 	key->connecting = 0;

 	pj_lock_release(ioqueue->lock);
     }
-#endif
+#endif

+    if (key->hnd_type == HND_IS_FILE) {

+        CloseHandle(key->hnd);

+    }
     return PJ_SUCCESS;
 }
 

@@ -482,7 +495,7 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout)
     }
     return -1;
 }
-
+

 /*
  * pj_ioqueue_recv()
  *
@@ -505,7 +518,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_recv(  pj_ioqueue_key_t *key,
     union operation_key *op_key_rec;

 

     PJ_CHECK_STACK();

-    PJ_ASSERT_RETURN(key && op_key && buffer, PJ_EINVAL);

+    PJ_ASSERT_RETURN(key && op_key && buffer && length, PJ_EINVAL);

 

     op_key_rec = (union operation_key*)op_key->internal__;

     op_key_rec->overlapped.wsabuf.buf = buffer;

diff --git a/pjlib/src/pjlib-samples/list.c b/pjlib/src/pjlib-samples/list.c
index 34a9fda2..127d8ddf 100644
--- a/pjlib/src/pjlib-samples/list.c
+++ b/pjlib/src/pjlib-samples/list.c
@@ -15,7 +15,7 @@
 struct my_node
 {
     // This must be the first member declared in the struct!
-    PJ_DECL_LIST_MEMBER(struct my_node)
+    PJ_DECL_LIST_MEMBER(struct my_node);
     int value;
 };
 
diff --git a/pjlib/src/pjlib-test/file.c b/pjlib/src/pjlib-test/file.c
new file mode 100644
index 00000000..aa863506
--- /dev/null
+++ b/pjlib/src/pjlib-test/file.c
@@ -0,0 +1,192 @@
+/* $Id$ */

+#include "test.h"

+#include <pjlib.h>

+

+#if INCLUDE_FILE_TEST

+

+#define FILENAME                "testfil1.txt"

+#define NEWNAME                 "testfil2.txt"

+#define INCLUDE_FILE_TIME_TEST  0

+

+static char buffer[11] = "Hello world";

+

+int file_test(void)

+{

+    enum { FILE_MAX_AGE = 1000 };

+    pj_oshandle_t fd = 0;

+    pj_status_t status;

+    char readbuf[sizeof(buffer)+16];

+    pj_file_stat stat;

+    pj_time_val start_time;

+    pj_ssize_t size;

+    pj_off_t pos;

+

+    PJ_LOG(3,("", "..file io test.."));

+

+    /* Get time. */

+    pj_gettimeofday(&start_time);

+

+    /* Delete original file if exists. */

+    if (pj_file_exists(FILENAME))

+        pj_file_delete(FILENAME);

+

+    /*

+     * Write data to the file.

+     */

+    status = pj_file_open(NULL, FILENAME, PJ_O_WRONLY, &fd);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_open() error", status);

+        return -10;

+    }

+

+    size = sizeof(buffer);

+    status = pj_file_write(fd, buffer, &size);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_write() error", status);

+        pj_file_close(fd);

+        return -20;

+    }

+    if (size != sizeof(buffer))

+        return -25;

+

+    status = pj_file_close(fd);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_close() error", status);

+        return -30;

+    }

+

+    /* Check the file existance and size. */

+    if (!pj_file_exists(FILENAME))

+        return -40;

+

+    if (pj_file_size(FILENAME) != sizeof(buffer))

+        return -50;

+

+    /* Get file stat. */

+    status = pj_file_getstat(FILENAME, &stat);

+    if (status != PJ_SUCCESS)

+        return -60;

+

+    /* Check stat size. */

+    if (stat.size != sizeof(buffer))

+        return -70;

+

+    /* Check file creation time >= start_time. */

+    if (!PJ_TIME_VAL_GTE(stat.ctime, start_time))

+#if INCLUDE_FILE_TIME_TEST

+        return -80;

+    /* Check file creation time is not much later. */

+    PJ_TIME_VAL_SUB(stat.ctime, start_time);

+    if (stat.ctime.sec > FILE_MAX_AGE)

+        return -90;

+

+    /* Check file modification time >= start_time. */

+    if (!PJ_TIME_VAL_GTE(stat.mtime, start_time))

+        return -80;

+    /* Check file modification time is not much later. */

+    PJ_TIME_VAL_SUB(stat.mtime, start_time);

+    if (stat.mtime.sec > FILE_MAX_AGE)

+        return -90;

+

+    /* Check file access time >= start_time. */

+    if (!PJ_TIME_VAL_GTE(stat.atime, start_time))

+        return -80;

+    /* Check file access time is not much later. */

+    PJ_TIME_VAL_SUB(stat.atime, start_time);

+    if (stat.atime.sec > FILE_MAX_AGE)

+        return -90;

+#endif

+

+    /*

+     * Re-open the file and read data.

+     */

+    status = pj_file_open(NULL, FILENAME, PJ_O_RDONLY, &fd);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_open() error", status);

+        return -100;

+    }

+

+    size = 0;

+    while (size < sizeof(readbuf)) {

+        pj_ssize_t read;

+        read = 1;

+        status = pj_file_read(fd, &readbuf[size], &read);

+        if (status != PJ_SUCCESS) {

+            app_perror("...file_read() error", status);

+            return -110;

+        }

+        if (read == 0) {

+            // EOF

+            break;

+        }

+        size += read;

+    }

+

+    if (size != sizeof(buffer))

+        return -120;

+

+    /*

+    if (!pj_file_eof(fd, PJ_O_RDONLY))

+        return -130;

+     */

+

+    if (pj_memcmp(readbuf, buffer, size) != 0)

+        return -140;

+

+    /* Seek test. */

+    status = pj_file_setpos(fd, 4, PJ_SEEK_SET);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_setpos() error", status);

+        return -141;

+    }

+

+    /* getpos test. */

+    status = pj_file_getpos(fd, &pos);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_getpos() error", status);

+        return -142;

+    }

+    if (pos != 4)

+        return -143;

+

+    status = pj_file_close(fd);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_close() error", status);

+        return -150;

+    }

+

+    /*

+     * Rename test.

+     */

+    status = pj_file_move(FILENAME, NEWNAME);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_move() error", status);

+        return -160;

+    }

+

+    if (pj_file_exists(FILENAME))

+        return -170;

+    if (!pj_file_exists(NEWNAME))

+        return -180;

+

+    if (pj_file_size(NEWNAME) != sizeof(buffer))

+        return -190;

+

+    /* Delete test. */

+    status = pj_file_delete(NEWNAME);

+    if (status != PJ_SUCCESS) {

+        app_perror("...file_delete() error", status);

+        return -200;

+    }

+

+    if (pj_file_exists(NEWNAME))

+        return -210;

+

+    PJ_LOG(3,("", "...success"));

+    return PJ_SUCCESS;

+}

+

+#else

+int dummy_file_test;

+#endif

+

diff --git a/pjlib/src/pjlib-test/test.c b/pjlib/src/pjlib-test/test.c
index 8ccdc568..b65fa9e7 100644
--- a/pjlib/src/pjlib-test/test.c
+++ b/pjlib/src/pjlib-test/test.c
@@ -30,6 +30,10 @@ int test_inner(void)
     int rc = 0;
 
     mem = &caching_pool.factory;
+

+    pj_log_set_level(3);

+    pj_log_set_decor(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | 

+                     PJ_LOG_HAS_MICRO_SEC);

 
     rc = pj_init();
     if (rc != 0) {
@@ -37,8 +41,6 @@ int test_inner(void)
 	return rc;
     }
     
-    pj_log_set_level(3);
-    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
     pj_dump_config();
     pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
 
@@ -125,6 +127,10 @@ int test_inner(void)
 #if INCLUDE_IOQUEUE_PERF_TEST

     DO_TEST( ioqueue_perf_test() );

 #endif

+

+#if INCLUDE_FILE_TEST

+    DO_TEST( file_test() );

+#endif

 
 #if INCLUDE_XML_TEST
     DO_TEST( xml_test() );
diff --git a/pjlib/src/pjlib-test/test.h b/pjlib/src/pjlib-test/test.h
index f4408513..b16aff69 100644
--- a/pjlib/src/pjlib-test/test.h
+++ b/pjlib/src/pjlib-test/test.h
@@ -8,7 +8,8 @@
 #define GROUP_LIBC                  0
 #define GROUP_OS                    0
 #define GROUP_DATA_STRUCTURE        0
-#define GROUP_NETWORK               1
+#define GROUP_NETWORK               0

+#define GROUP_FILE                  1
 #define GROUP_EXTRA                 0
 
 #define INCLUDE_ERRNO_TEST          GROUP_LIBC
@@ -31,7 +32,8 @@
 #define INCLUDE_SELECT_TEST	    GROUP_NETWORK
 #define INCLUDE_UDP_IOQUEUE_TEST    GROUP_NETWORK
 #define INCLUDE_TCP_IOQUEUE_TEST    GROUP_NETWORK

-#define INCLUDE_IOQUEUE_PERF_TEST   GROUP_NETWORK
+#define INCLUDE_IOQUEUE_PERF_TEST   GROUP_NETWORK

+#define INCLUDE_FILE_TEST           GROUP_FILE
 #define INCLUDE_XML_TEST	    GROUP_EXTRA
 
 #define INCLUDE_ECHO_SERVER         0
@@ -67,7 +69,8 @@ extern int sock_perf_test(void);
 extern int select_test(void);
 extern int udp_ioqueue_test(void);
 extern int tcp_ioqueue_test(void);

-extern int ioqueue_perf_test(void);
+extern int ioqueue_perf_test(void);

+extern int file_test(void);
 extern int xml_test(void);
 
 extern int echo_server(void);