Repositories / mmondor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ac6cc2)
*** empty log message ***
authorMatthew Mondor <mmondor@pulsar-zone.net>
Thu, 14 Jul 2005 01:02:03 +0000 (01:02 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Thu, 14 Jul 2005 01:02:03 +0000 (01:02 +0000)
tests/js-test/js/httpd/httpd.js patch | blob | blame | history
tests/js-test/src/classes/js_fd.c patch | blob | blame | history
tests/js-test/src/classes/js_fd.h patch | blob | blame | history

diff --git a/tests/js-test/js/httpd/httpd.js b/tests/js-test/js/httpd/httpd.js
index 5676202..0b7c12e 100644 (file)
--- a/tests/js-test/js/httpd/httpd.js
+++ b/tests/js-test/js/httpd/httpd.js
@@ -1,4 +1,4 @@
-/* $Id: httpd.js,v 1.57 2005/07/13 22:39:09 mmondor Exp $ */
+/* $Id: httpd.js,v 1.58 2005/07/14 00:57:09 mmondor Exp $ */
 
 /*
  * Copyright (c) 2005, Matthew Mondor
@@ -56,7 +56,7 @@
  * Server identification
  */
 SERVER_VERSION                 = 'mmondor_js_httpd/0.0.1 (NetBSD)';
-SERVER_CVSID   = '$Id: httpd.js,v 1.57 2005/07/13 22:39:09 mmondor Exp $';
+SERVER_CVSID   = '$Id: httpd.js,v 1.58 2005/07/14 00:57:09 mmondor Exp $';
 
 
 
@@ -408,7 +408,7 @@ function process_query(time)
                        this.request_data += data;
                        this.updateTimeout(time);
                } catch (x) {
-                       if (this.error != FD.EAGAIN)
+                       if (this.errno != Errno.EAGAIN)
                                close = true;
                }
        }
@@ -450,7 +450,7 @@ function process_post(time)
                        this.post_data += data;
                        this.updateTimeout(time);
                } catch (x) {
-                       if (this.error != FD.EAGAIN)
+                       if (this.errno != Errno.EAGAIN)
                                close = true;
                }
        } else
@@ -492,7 +492,7 @@ function process_transfer(time)
                                this.transfer_state = STATE_TRANSFER_WRITE;
                                this.updateTimeout(time);
                        } catch (x) {
-                               if (this.error != FD.EAGAIN) {
+                               if (this.errno != Errno.EAGAIN) {
                                        close = true;
                                        try {
                                                this.transfer_dst.fdatasync();
@@ -536,7 +536,7 @@ function process_transfer(time)
                                            STATE_TRANSFER_READ;
                                        this.updateTimeout(time);
                                } catch (x) {
-                                       if (this.error != FD.EAGAIN)
+                                       if (this.errno != Errno.EAGAIN)
                                                close = true;
                                }
                        }
@@ -1277,7 +1277,7 @@ FD.prototype.bwrite_flush = function()
                if (this.bwrite_buffer.length == 0)
                        obj.done = true;
        } catch (x) {
-               if (this.error != FD.EAGAIN)
+               if (this.errno != Errno.EAGAIN)
                        obj.close = true;
        }
 
diff --git a/tests/js-test/src/classes/js_fd.c b/tests/js-test/src/classes/js_fd.c
index 837cd4a..916becc 100644 (file)
--- a/tests/js-test/src/classes/js_fd.c
+++ b/tests/js-test/src/classes/js_fd.c
@@ -1,4 +1,4 @@
-/* $Id: js_fd.c,v 1.36 2005/07/14 00:55:06 mmondor Exp $ */
+/* $Id: js_fd.c,v 1.37 2005/07/14 01:02:03 mmondor Exp $ */
 
 /*
  * Copyright (c) 2005, Matthew Mondor
@@ -49,7 +49,6 @@
  *   for this (maybe a VFS static class?)  Maybe even something calling
  *   execve(2) and fork(2), those primitives... popen(3) also.
  * - Also opendir(3) and friends wrapper...
- * - Error numbers for errno should be placed in a separate class, Errno?
  */
 
 
@@ -409,72 +408,6 @@ enum fd_sprops {
        FD_SP_LOCK_NB,
        FD_SP_LOCK_UN,
 
-       FD_SP_EPERM,
-       FD_SP_ENOENT,
-       FD_SP_EINTR,
-       FD_SP_EIO,
-       FD_SP_ENXIO,
-       FD_SP_EBADF,
-       FD_SP_EACCES,
-       FD_SP_ENOTBLK,
-       FD_SP_EBUSY,
-       FD_SP_EEXIST,
-       FD_SP_EXDEV,
-       FD_SP_ENODEV,
-       FD_SP_ENOTDIR,
-       FD_SP_EISDIR,
-       FD_SP_EINVAL,
-       FD_SP_ENFILE,
-       FD_SP_EMFILE,
-       FD_SP_ENOTTY,
-       FD_SP_ETXTBSY,
-       FD_SP_EFBIG,
-       FD_SP_ENOSPC,
-       FD_SP_ESPIPE,
-       FD_SP_EROFS,
-       FD_SP_EMLINK,
-       FD_SP_EPIPE,
-       FD_SP_EAGAIN,
-       FD_SP_EINPROGRESS,
-       FD_SP_EALREADY,
-       FD_SP_ENOTSOCK,
-       FD_SP_EDESTADDRREQ,
-       FD_SP_EMSGSIZE,
-       FD_SP_EPROTOTYPE,
-       FD_SP_EPROTONOSUPPORT,
-       FD_SP_EOPNOTSUPP,
-       FD_SP_EPFNOSUPPORT,
-       FD_SP_EAFNOSUPPORT,
-       FD_SP_EADDRINUSE,
-       FD_SP_EADDRNOTAVAIL,
-       FD_SP_ENETDOWN,
-       FD_SP_ENETUNREACH,
-       FD_SP_ENETRESET,
-       FD_SP_ECONNABORTED,
-       FD_SP_ECONNRESET,
-       FD_SP_ENOBUFS,
-       FD_SP_EISCONN,
-       FD_SP_ENOTCONN,
-       FD_SP_ESHUTDOWN,
-       FD_SP_ETIMEDOUT,
-       FD_SP_ECONNREFUSED,
-       FD_SP_ELOOP,
-       FD_SP_ENAMETOOLONG,
-       FD_SP_EHOSTDOWN,
-       FD_SP_EHOSTUNREACH,
-       FD_SP_ENOTEMPTY,
-       FD_SP_EDQUOT,
-       FD_SP_ESTALE,
-       FD_SP_ENOLCK,
-       FD_SP_ENOSYS,
-       FD_SP_EFTYPE,
-       FD_SP_ENOMSG,
-       FD_SP_ENOTSUP,
-       FD_SP_ECANCELED,
-       FD_SP_EBADMSG,
-       FD_SP_ENODATA,
-       FD_SP_ETIME,
-
        FD_SP_MAX
 };
 
@@ -576,76 +509,6 @@ static JSPropertySpec fd_sproperties[FD_SP_MAX + 1] = {
        { "LOCK_NB", FD_SP_LOCK_NB, JSP_STATPROP, JSP_STATPROPFS },
        { "LOCK_UN", FD_SP_LOCK_UN, JSP_STATPROP, JSP_STATPROPFS },
 
-       /*
-        * XXX An Errno class should probably be created for this
-        */
-       { "EPERM", FD_SP_EPERM, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOENT", FD_SP_ENOENT, JSP_STATPROP, JSP_STATPROPFS },
-       { "EINTR", FD_SP_EINTR, JSP_STATPROP, JSP_STATPROPFS },
-       { "EIO", FD_SP_EIO, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENXIO", FD_SP_ENXIO, JSP_STATPROP, JSP_STATPROPFS },
-       { "EBADF", FD_SP_EBADF, JSP_STATPROP, JSP_STATPROPFS },
-       { "EACCES", FD_SP_EACCES, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTBLK", FD_SP_ENOTBLK, JSP_STATPROP, JSP_STATPROPFS },
-       { "EBUSY", FD_SP_EBUSY, JSP_STATPROP, JSP_STATPROPFS },
-       { "EEXIST", FD_SP_EEXIST, JSP_STATPROP, JSP_STATPROPFS },
-       { "EXDEV", FD_SP_EXDEV, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENODEV", FD_SP_ENODEV, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTDIR", FD_SP_ENOTDIR, JSP_STATPROP, JSP_STATPROPFS },
-       { "EISDIR", FD_SP_EISDIR, JSP_STATPROP, JSP_STATPROPFS },
-       { "EINVAL", FD_SP_EINVAL, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENFILE", FD_SP_ENFILE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EMFILE", FD_SP_EMFILE, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTTY", FD_SP_ENOTTY, JSP_STATPROP, JSP_STATPROPFS },
-       { "ETXTBSY", FD_SP_ETXTBSY, JSP_STATPROP, JSP_STATPROPFS },
-       { "EFBIG", FD_SP_EFBIG, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOSPC", FD_SP_ENOSPC, JSP_STATPROP, JSP_STATPROPFS },
-       { "ESPIPE", FD_SP_ESPIPE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EROFS", FD_SP_EROFS, JSP_STATPROP, JSP_STATPROPFS },
-       { "EMLINK", FD_SP_EMLINK, JSP_STATPROP, JSP_STATPROPFS },
-       { "EPIPE", FD_SP_EPIPE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EAGAIN", FD_SP_EAGAIN, JSP_STATPROP, JSP_STATPROPFS },
-       { "EINPROGRESS", FD_SP_EINPROGRESS, JSP_STATPROP, JSP_STATPROPFS },
-       { "EALREADY", FD_SP_EALREADY, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTSOCK", FD_SP_ENOTSOCK, JSP_STATPROP, JSP_STATPROPFS },
-       { "EDESTADDRREQ", FD_SP_EDESTADDRREQ, JSP_STATPROP, JSP_STATPROPFS },
-       { "EMSGSIZE", FD_SP_EMSGSIZE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EPROTOTYPE", FD_SP_EPROTOTYPE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EPROTONOSUPPORT", FD_SP_EPROTONOSUPPORT, JSP_STATPROP,
-           JSP_STATPROPFS },
-       { "EOPNOTSUPP", FD_SP_EOPNOTSUPP, JSP_STATPROP, JSP_STATPROPFS },
-       { "EPFNOSUPPORT", FD_SP_EPFNOSUPPORT, JSP_STATPROP, JSP_STATPROPFS },
-       { "EAFNOSUPPORT", FD_SP_EAFNOSUPPORT, JSP_STATPROP, JSP_STATPROPFS },
-       { "EADDRINUSE", FD_SP_EADDRINUSE, JSP_STATPROP, JSP_STATPROPFS },
-       { "EADDRNOTAVAIL", FD_SP_EADDRNOTAVAIL, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENETDOWN", FD_SP_ENETDOWN, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENETUNREACH", FD_SP_ENETUNREACH, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENETRESET", FD_SP_ENETRESET, JSP_STATPROP, JSP_STATPROPFS },
-       { "ECONNABORTED", FD_SP_ECONNABORTED, JSP_STATPROP, JSP_STATPROPFS },
-       { "ECONNRESET", FD_SP_ECONNRESET, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOBUFS", FD_SP_ENOBUFS, JSP_STATPROP, JSP_STATPROPFS },
-       { "EISCONN", FD_SP_EISCONN, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTCONN", FD_SP_ENOTCONN, JSP_STATPROP, JSP_STATPROPFS },
-       { "ESHUTDOWN", FD_SP_ESHUTDOWN, JSP_STATPROP, JSP_STATPROPFS },
-       { "ETIMEDOUT", FD_SP_ETIMEDOUT, JSP_STATPROP, JSP_STATPROPFS },
-       { "ECONNREFUSED", FD_SP_ECONNREFUSED, JSP_STATPROP, JSP_STATPROPFS },
-       { "ELOOP", FD_SP_ELOOP, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENAMETOOLONG", FD_SP_ENAMETOOLONG, JSP_STATPROP, JSP_STATPROPFS },
-       { "EHOSTDOWN", FD_SP_EHOSTDOWN, JSP_STATPROP, JSP_STATPROPFS },
-       { "EHOSTUNREACH", FD_SP_EHOSTUNREACH, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTEMPTY", FD_SP_ENOTEMPTY, JSP_STATPROP, JSP_STATPROPFS },
-       { "EDQUOT", FD_SP_EDQUOT, JSP_STATPROP, JSP_STATPROPFS },
-       { "ESTALE", FD_SP_ESTALE, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOLCK", FD_SP_ENOLCK, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOSYS", FD_SP_ENOSYS, JSP_STATPROP, JSP_STATPROPFS },
-       { "EFTYPE", FD_SP_EFTYPE, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOMSG", FD_SP_ENOMSG, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENOTSUP", FD_SP_ENOTSUP, JSP_STATPROP, JSP_STATPROPFS },
-       { "ECANCELED", FD_SP_ECANCELED, JSP_STATPROP, JSP_STATPROPFS },
-       { "EBADMSG", FD_SP_EBADMSG, JSP_STATPROP, JSP_STATPROPFS },
-       { "ENODATA", FD_SP_ENODATA, JSP_STATPROP, JSP_STATPROPFS },
-       { "ETIME", FD_SP_ETIME, JSP_STATPROP, JSP_STATPROPFS },
-
        { NULL, 0, 0, NULL, NULL }
 };
 
@@ -749,73 +612,7 @@ static int fd_sprops_data[FD_SP_MAX] = {
        LOCK_SH,
        LOCK_EX,
        LOCK_NB,
-       LOCK_UN,
-
-       EPERM,
-       ENOENT,
-       EINTR,
-       EIO,
-       ENXIO,
-       EBADF,
-       EACCES,
-       ENOTBLK,
-       EBUSY,
-       EEXIST,
-       EXDEV,
-       ENODEV,
-       ENOTDIR,
-       EISDIR,
-       EINVAL,
-       ENFILE,
-       EMFILE,
-       ENOTTY,
-       ETXTBSY,
-       EFBIG,
-       ENOSPC,
-       ESPIPE,
-       EROFS,
-       EMLINK,
-       EPIPE,
-       EAGAIN,
-       EINPROGRESS,
-       EALREADY,
-       ENOTSOCK,
-       EDESTADDRREQ,
-       EMSGSIZE,
-       EPROTOTYPE,
-       EPROTONOSUPPORT,
-       EOPNOTSUPP,
-       EPFNOSUPPORT,
-       EAFNOSUPPORT,
-       EADDRINUSE,
-       EADDRNOTAVAIL,
-       ENETDOWN,
-       ENETUNREACH,
-       ENETRESET,
-       ECONNABORTED,
-       ECONNRESET,
-       ENOBUFS,
-       EISCONN,
-       ENOTCONN,
-       ESHUTDOWN,
-       ETIMEDOUT,
-       ECONNREFUSED,
-       ELOOP,
-       ENAMETOOLONG,
-       EHOSTDOWN,
-       EHOSTUNREACH,
-       ENOTEMPTY,
-       EDQUOT,
-       ESTALE,
-       ENOLCK,
-       ENOSYS,
-       EFTYPE,
-       ENOMSG,
-       ENOTSUP,
-       ECANCELED,
-       EBADMSG,
-       ENODATA,
-       ETIME
+       LOCK_UN
 };
 
 /*
diff --git a/tests/js-test/src/classes/js_fd.h b/tests/js-test/src/classes/js_fd.h
index 2066504..9a7f9e5 100644 (file)
--- a/tests/js-test/src/classes/js_fd.h
+++ b/tests/js-test/src/classes/js_fd.h
@@ -1,4 +1,4 @@
-/* $Id */
+/* $Id: js_fd.h,v 1.2 2005/07/14 00:55:06 mmondor Exp $ */
 
 /*
  * Copyright (c) 2004, Matthew Mondor
MMSoftware