Changeset 2439 for trunk/src/emx/include

Timestamp:

Nov 13, 2005, 12:59:18 PM (20 years ago)

Author:

bird

Message:

Created proper backend for fcntl removing F_GETOSFD in the process. Using fcntl to set O_NONBLOCK on sockets works now.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (1 diff)
• emx/io.h (modified) (1 diff)
• emx/syscalls.h (modified) (1 diff)
• sys/fcntl.h (modified) (1 diff)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -465 +465 @@
 ssize_t __libc_Back_ioDirGetEntries(int fh, void *pvBuf, size_t cbBuf, __off_t *poff);
 
+/**
+ * File Control.
+ * 
+ * Deals with file descriptor flags, file descriptor duplication and locking.
+ * 
+ * @returns 0 on success and *piRet set.
+ * @returns Negated errno on failure and *piRet set to -1.
+ * @param   fh          File handle (descriptor).
+ * @param   iRequest    Which file file descriptior request to perform.
+ * @param   iArg        Argument which content is specific to each
+ *                      iRequest operation.
+ * @param   prc         Where to store the value which upon success is
+ *                      returned to the caller.
+ */
+int __libc_Back_ioFileControl(int fh, int iRequest, intptr_t iArg, int *prc);
+
+/**
+ * File Control operation - OS/2 standard handle.
+ * 
+ * @returns 0 on success.
+ * @returns OS/2 error code or negated errno on failure.
+ * 
+ * @param   pFH         Pointer to the handle structure to operate on.
+ * @param   fh          It's associated filehandle.
+ * @param   iRequest    Which file file descriptior request to perform.
+ * @param   iArg        Argument which content is specific to each
+ *                      iRequest operation.
+ * @param   prc         Where to store the value which upon success is
+ *                      returned to the caller.
+ */
+int __libc_Back_ioFileControlStandard(__LIBC_PFH pFH, int fh, int iRequest, intptr_t iArg, int *prc);
+    
 /**
  * Try resolve a filehandle to a path.

trunk/src/emx/include/emx/io.h

@@ -77 +77 @@
 #define __LIBC_FH_FDFLAGS_MASK      0xf0000000
 
+/** The mask of flags settable using fcntl(,F_SETFL,). */
+#define __LIBC_FH_SETFL_MASK        (O_NONBLOCK | O_APPEND /*| O_ASYNC*/ | O_SYNC | O_DIRECT | O_BINARY | O_TEXT)
+/** The mask of flags gettable using fcntl(,F_GETFL,). */
+#define __LIBC_FH_GETFL_MASK        (__LIBC_FH_SETFL_MASK | O_ACCMODE | O_NOINHERIT)
+
 /** @} */
 

trunk/src/emx/include/emx/syscalls.h

@@ -132 +132 @@
 int __execname (char *buf, size_t bufsize);
 void __exit (int ret) __attribute__ ((__noreturn__));
-int __fcntl (int handle, int request, int arg);
+/*int __fcntl (int handle, int request, int arg);*/
 int __filesys (__const__ char *drive, char *name, size_t size);
 int __findfirst (__const__ char *name, int attr, struct _find *fp);

trunk/src/emx/include/sys/fcntl.h

@@ -287 +287 @@
 #endif
 
-/* fcntl command */
-/* bird: EMX specifics - start */
-#define F_GETOSFD       20 /* RSXNT */  /* F_GETOSFD used to be 6 */
-/* bird: EMX specifics - end */
-
-
 #if !defined (F_OK) /* bird: Really defined in unistd.h, but Linux and EMX does it here too. */
 /* access function */