Changeset 1519 for trunk/src/emx/include

Timestamp:

Sep 27, 2004, 4:15:07 AM (21 years ago)

Author:

bird

Message:

Big path handling change. Fixed wrong file headers. A new api or two. A bit of restructuring. And hopefully no new bug :-)

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (5 diffs, 1 prop)
• InnoTekLIBC/logstrict.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (4 diffs, 1 prop)
• direct.h (modified) (1 diff, 1 prop)
• emx/io.h (modified) (1 diff, 1 prop)
• emx/syscalls.h (modified) (4 diffs, 1 prop)
• io.h (modified) (1 diff, 1 prop)
• stdlib.h (modified) (1 diff, 1 prop)
• unistd.h (modified) (1 diff, 1 prop)

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

@@ -30 +30 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <emx/io.h>
 
 __BEGIN_DECLS
@@ -38 +39 @@
 #endif
 struct statfs;
+struct stat;
 
 
@@ -82 +84 @@
 
 
-/** @defgroup __libc_Back_fh   LIBC Backend - File Handles.
- * @{ */
+/** @defgroup __libc_Back_fs   LIBC Backend - File System
+ * @{ */
+
+/**
+ * Get the statistics for the filesystem which pszPath is located on.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     The path to somewhere in the filesystem.
+ * @param   pStatFs     Where to store the obtained information.
+ */
+int __libc_Back_fsStat(const char *pszPath, struct statfs *pStatFs);
+
+/**
+ * Get file system statistics
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   fh          The filehandle of any file within the mounted file system.
+ * @param   pStatFs     Where to store the statistics.
+ */
+int __libc_Back_fsStatFH(int fh, struct statfs *pStatFs);
+
+/**
+ * Get the statistics for all the mounted filesystems.
+ *
+ * @returns Number of returned statfs structs on success.
+ * @returns Number of mounted filesystems on success if paStatFS is NULL
+ * @returns Negative error code (errno.h) on failure.
+ * @param   paStatFs    Where to to store the statistics.
+ * @param   cStatFS     Number of structures the array pointed to by paStatFs can hold.
+ * @param   fFlags      Flags, currently ignored.
+ */
+int __libc_Back_fsStats(struct statfs *paStatFs, unsigned cStatFs, unsigned fFlags);
+
+/**
+ * Schedules all file system buffers for writing.
+ *
+ * See sync() for OS/2 limitations.
+ */
+void __libc_Back_fsSync(void);
+
+/**
+ * Resolves the path into an canonicalized absolute path.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     The path to resolve.
+ * @param   pszBuf      Where to store the resolved path.
+ * @param   cchBuf      Size of the buffer.
+ * @param   fFlags      At the moment 0. Which means the entire path must exist.
+ */
+int __libc_Back_fsPathResolve(const char *pszPath, char *pszBuf, size_t cchBuf, unsigned fFlags);
+
+/**
+ * Changes the default drive of the process.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   chDrive     New default drive.
+ */
+int __libc_Back_fsDriveDefaultSet(char chDrive);
+
+/**
+ * Gets the default drive of the process.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pchDrive    Where to store the default drive.
+ */
+int __libc_Back_fsDriveDefaultGet(char *pchDrive);
+
+/**
+ * Sets or change the unixroot of the current process.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszNewRoot  The new root.
+ */
+int __libc_Back_fsDirChangeRoot(const char *pszNewRoot);
+
+/**
+ * Gets the current directory of the process on a
+ * specific drive or on the current one.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Where to store the path to the current directory.
+ *                      This will be prefixed with a drive letter if we're
+ *                      not in the unix tree.
+ * @param   cchPath     The size of the path buffer.
+ * @param   chDrive     The drive letter of the drive to get it for.
+ *                      If '\0' the current dir for the current drive is returned.
+ * @param   fFlags      Flags for skipping drive letter and slash.
+ */
+int __libc_Back_fsDirCurrentGet(char *pszPath, size_t cchPath, char chDrive, int fFlags);
+
+/** Flags for __libc_Back_fsDirCurrentGet().
+ * @{ */
+#define __LIBC_BACK_FSCWD_NO_DRIVE          1
+#define __LIBC_BACK_FSCWD_NO_ROOT_SLASH     2
+/** @} */
+
+/**
+ * Changes the current directory of the process.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Path to the new current directory of the process.
+ */
+int __libc_Back_fsDirCurrentSet(const char *pszPath);
+
+/**
+ * Creates a new directory.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Path of the new directory.
+ * @param   Mode        Permissions on the created directory.
+ */
+int __libc_Back_fsDirCreate(const char *pszPath, mode_t Mode);
+
+/**
+ * Removes a new directory.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Path to the directory which is to be removed.
+ */
+int __libc_Back_fsDirRemove(const char *pszPath);
+
+/**
+ * Creates a symbolic link.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszTarget   The target of the symlink link.
+ * @param   pszSymlink  The path to the symbolic link to create.
+ */
+int __libc_Back_fsSymlinkCreate(const char *pszTarget, const char *pszSymlink);
+
+/**
+ * Reads the content of a symbolic link.
+ *
+ * This is weird interface as it will return a truncated result if not
+ * enough buffer space. It is also weird in that there is no string
+ * terminator.
+ *
+ * @returns Number of bytes returned in pachBuf.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     The path to the symlink directory.
+ * @param   pachBuf     Where to store the symlink value.
+ * @param   cchBuf      Size of buffer.
+ */
+int __libc_Back_fsSymlinkRead(const char *pszPath, char *pachBuf, size_t cchBuf);
+
+/**
+ * Stats a symbolic link.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Path to the file to stat. If this is a symbolic link
+ *                      the link it self will be stat'ed.
+ * @param   pStat       Where to store the file stats.
+ */
+int __libc_Back_fsSymlinkStat(const char *pszPath, struct stat *pStat);
+
+/**
+ * Stats a file.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath     Path to the file to stat.
+ * @param   pStat       Where to store the file stats.
+ */
+int __libc_Back_fsFileStat(const char *pszPath, struct stat *pStat);
+
+/**
+ * Gets the file stats for a file by filehandle.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure. The content
+ *          of *pStat is undefined.
+ * @param   fh      Handle to file.
+ * @param   pStat   Where to store the stats.
+ */
+int __libc_Back_fsFileStatFH(int fh, struct stat *pStat);
+
+
+/** @defgroup __libc_Back_io   LIBC Backend - I/O and File Management.
+ * @{ */
+
+/**
+ * Opens a file.
+ *
+ * @returns Filehandle to the opened file on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszFile     Path to the file.
+ * @param   fFlags      Open flags.
+ * @param   cbInitial   Initial filesize.
+ * @param   Mode        The specified permission mask.
+ * @param   fLibc       LIBC filehandle flags.
+ * @param   ppFH        Where to store the LIBC filehandle structure which was created
+ *                      for the opened file.
+ */
+int __libc_Back_ioFileOpen(const char *pszFile, int fFlags, off_t cbInitial, mode_t Mode, unsigned fLibc, PLIBCFH *ppFH);
+
+/**
+ * Change the current position of a file stream and get the new position.
+ *
+ * @returns new file offset on success.
+ * @returns Negative error code (errno) on failure.
+ * @param   hFile       File handle to preform seek operation on.
+ * @param   off         Offset to seek to.
+ * @param   iMethod     The seek method. SEEK_CUR, SEEK_SET or SEEK_END.
+ */
+off_t __libc_Back_ioSeek(int hFile, off_t off, int iMethod);
+
+/**
+ * Sets the size of an open file.
+ *
+ * When expanding a file the contents of the allocated
+ * space is undefined.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   fh      Handle to the file which size should be changed.
+ * @param   cbFile  The new filesize.
+ * @param   fZero   If set any new allocated file space will be
+ *                  initialized to zero.
+ */
+int __libc_Back_ioFileSizeSet(int fh, __off_t cbFile, int fZero);
 
 /**
@@ -89 +321 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   fh          The file handle.
  * @param   pszPath     Where to store the path.
  * @param   cchPath     The size of he buffer pointed to by pszPath.
  */
-int __libc_Back_fhToPath(int fh, char *pszPath, size_t cchPath);
-
-/** @} */
-
-
-/** @defgroup __libc_Back_fs   LIBC Backend - File System
- * @{ */
-
-/**
- * Get the statistics for the filesystem which pszPath is located on.
- *
- * @returns 0 on success.
- * @returns -1 and errno on failure.
- * @param   pszPath     The path to somewhere in the filesystem.
- * @param   pStatFs     Where to store the obtained information.
- */
-int __libc_Back_fsStat(const char *pszPath, struct statfs *pStatFs);
-
-/**
- * Get file system statistics
- *
- * @returns 0 on success.
- * @returns -1 and errno on failure.
- * @param   fh          The filehandle of any file within the mounted file system.
- * @param   pStatFs     Where to store the statistics.
- */
-int __libc_Back_fsStatFH(int fh, struct statfs *pStatFs);
-
-/**
- * Get the statistics for all the mounted filesystems.
- *
- * @returns Number of returned statfs structs on success.
- * @returns Number of mounted filesystems on success if paStatFS is NULL
- * @returns -1 and errno on failure.
- * @param   paStatFs    Where to to store the statistics.
- * @param   cStatFS     Number of structures the array pointed to by paStatFs can hold.
- * @param   fFlags      Flags, currently ignored.
- */
-int __libc_Back_fsStats(struct statfs *paStatFs, unsigned cStatFs, unsigned fFlags);
-
-/**
- * Schedules all file system buffers for writing.
- *
- * See sync() for OS/2 limitations.
- */
-void __libc_Back_fsSync(void);
-
-/**
- * Sets or change the unixroot of the current process.
- *
- * @returns 0 on success.
- * @returns -1 and errno on failure.
- * @param   pszNewRoot  The new root.
- */
-int __libc_Back_fsChRoot(const char *pszNewRoot);
+int __libc_Back_ioFHToPath(int fh, char *pszPath, size_t cchPath);
+
+/** @} */
 
 /** @} */
@@ -163 +343 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   pardAvgs    Where to store the samples.
  * @param   cAvgs       Number of samples to get. Max is 3.

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

@@ -182 +182 @@
 #define __LIBC_LOG_GRP_ENV          15
 
+/** Backend FS APIs. */
+#define __LIBC_LOG_GRP_BACK_FS      23
 /** Shared Process Database and LIBC Shared Memory APIs. */
 #define __LIBC_LOG_GRP_SPM          24

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

@@ -178 +178 @@
 typedef __LIBC_SPMINHFHBSOCK *__LIBC_PSPMINHFHBSOCK;
 
+/**
+ * SPM fs inherit data.
+ */
+typedef struct __libc_SPMInhFS
+{
+    /** In Unix Tree global. */
+    int         fInUnixTree;
+    /** Size of the unix root. Only set if there's an official root. */
+    size_t      cchUnixRoot;
+    /** The current unix root if cchUnixRoot is non-zero. */
+    char        szUnixRoot[1];
+} __LIBC_SPMINHFS;
+/** Pointer to FS inherit data. */
+typedef __LIBC_SPMINHFS *__LIBC_PSPMINHFS;
+
+
 
 /**
@@ -191 +207 @@
      * This is a succession of bundles terminating with a _END one. */
     __LIBC_PSPMINHFHBHDR    pFHBundles;
+    /** Pointer to the file system part. If NULL default values are assumed. */
+    __LIBC_PSPMINHFS        pFS;
 
     /** @todo Add signals and the other properties which are inherited. */
@@ -559 +577 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   pLoadAvg    Where to store the load average samples.
  * @param   puTimestamp Where to store the current timestamp.
@@ -569 +587 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   pLoadAvg    Where to store the load average samples.
  */

trunk/src/emx/include/direct.h

@@ -59 +59 @@
 char _getdrive(void);
 
+/* Special LIBC addition. */
+#ifdef __BSD_VISIBLE
+char *_getcwdux(char *, size_t);
+#endif
+
 __END_DECLS
 

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

@@ -384 +384 @@
 int     __libc_FHClose(int fh);
 PLIBCFH __libc_FH(int fh);
+int     __libc_FHEx(int fh, __LIBC_PFH *ppFH);
 
 

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

@@ -120 +120 @@
 
 
-int __accept (int handle, struct sockaddr *addr, int *paddrlen);
+//dead int __accept (int handle, struct sockaddr *addr, int *paddrlen);
 unsigned __alarm (unsigned sec);
-int __bind (int handle, __const__ struct sockaddr *addr, int addrlen);
+//dead int __bind (int handle, __const__ struct sockaddr *addr, int addrlen);
 void *__brk (void *addr);
 void __cgets (char *buffer);
-int __chdir (__const__ char *name);
+//dead int __chdir (__const__ char *name);
 int __chmod (__const__ char *name, int flag, int attr);
 int __chdrive (char drive);
-int __chsize (int handle, off_t length);
+//dead int __chsize (int handle, off_t length);
 long long __clock (void);
 int __close (int handle);
-int __connect (int handle, __const__ struct sockaddr *addr, int addrlen);
+//dead int __connect (int handle, __const__ struct sockaddr *addr, int addrlen);
 int __core (int handle);
 int __dup (int handle);
@@ -142 +142 @@
 int __findfirst (__const__ char *name, int attr, struct _find *fp);
 int __findnext (struct _find *fp);
-int __fork (void);
-int __fstat (int handle, struct stat *buffer);
+//dead int __fork (void);
+//dead int __fstat (int handle, struct stat *buffer);
 int __fsync (int handle);
 void __ftime (struct timeb *ptr);
-int __ftruncate (int handle, off_t length);
-int __getcwd (char *buffer, char drive);
+//dead int __ftruncate (int handle, off_t length);
+//dead int __getcwd (char *buffer, char drive);
 char __getdrive (void);
-int __gethostbyaddr (__const__ char *addr, int len, int type,
-    struct hostent **dst);
-int __gethostbyname (__const__ char *name, struct hostent **dst);
-int __gethostid (int *dst);
-int __gethostname (char *name, int len);
-int __getnetbyname (__const__ char *name, struct netent **dst);
-int __getnetbyaddr (long net, struct netent **dst);
-int __getpeername (int handle, struct sockaddr *name, int *pnamelen);
+//dead int __gethostbyaddr (__const__ char *addr, int len, int type,
+//dead     struct hostent **dst);
+//dead int __gethostbyname (__const__ char *name, struct hostent **dst);
+//dead int __gethostid (int *dst);
+//dead int __gethostname (char *name, int len);
+//dead int __getnetbyname (__const__ char *name, struct netent **dst);
+//dead int __getnetbyaddr (long net, struct netent **dst);
+//dead int __getpeername (int handle, struct sockaddr *name, int *pnamelen);
 int __getpid (void);
 int __getppid (void);
-int __getprotobyname (__const__ char *name, struct protoent **dst);
-int __getprotobynumber (int prot, struct protoent **dst);
-int __getservbyname (__const__ char *name, __const__ char *proto,
-    struct servent **dst);
-int __getservbyport (int port, __const__ char *proto, struct servent **dst);
-int __getsockhandle (int handle);
-int __getsockname (int handle, struct sockaddr *name, int *pnamelen);
-int __getsockopt (int handle, int level, int optname, void *optval,
-    int *poptlen);
-int __imphandle (int handle);
-int __impsockhandle (int handle, int flags);
+//dead int __getprotobyname (__const__ char *name, struct protoent **dst);
+//dead int __getprotobynumber (int prot, struct protoent **dst);
+//dead int __getservbyname (__const__ char *name, __const__ char *proto,
+//dead     struct servent **dst);
+//dead int __getservbyport (int port, __const__ char *proto, struct servent **dst);
+//dead int __getsockhandle (int handle);
+//dead int __getsockname (int handle, struct sockaddr *name, int *pnamelen);
+//dead int __getsockopt (int handle, int level, int optname, void *optval,
+//dead     int *poptlen);
+//dead int __imphandle (int handle);
+//dead int __impsockhandle (int handle, int flags);
 int __ioctl1 (int handle, int code);
 int __ioctl2 (int handle, unsigned long request, int arg);
 int __kill (int pid, int sig);
 int __listen (int handle, int backlog);
-off_t __lseek (int handle, off_t offset, int origin);
+//dead off_t __lseek (int handle, off_t offset, int origin);
 int __memavail (void);
-int __mkdir (__const__ char *name);
+//dead int __mkdir (__const__ char *name);
 int __newthread (int tid);
 struct __libc_FileHandle;
-int __open (__const__ char *name, int flags, off_t size, unsigned fLibc, struct __libc_FileHandle **pFH);
+//dead int __open (__const__ char *name, int flags, off_t size, mode_t cmode, unsigned fLibc, struct __libc_FileHandle **pFH);
 int __pause (void);
 int __pipe(int *two_handles, int pipe_size, struct __libc_FileHandle **ppFHRead, struct __libc_FileHandle **ppFHWrite);
@@ -191 +191 @@
 int __remove (__const__ char *name);
 int __rename (__const__ char *old_name, __const__ char *new_name);
-int __rmdir (__const__ char *name);
+//dead int __rmdir (__const__ char *name);
 void *__sbrk (int incr);
 void __scrsize (int *dst);
-int __select(int nfds, struct fd_set *readfds, struct fd_set *writefds,
-             struct fd_set *exceptfds, struct timeval *tv);
-int __send (int handle, __const__ void *buf, int len, unsigned flags);
-int __sendto (__const__ struct _sendto *args);
-int __setsockopt (int handle, int level, int optname, __const__ void *optval,
-    int optlen);
+//dead int __select(int nfds, struct fd_set *readfds, struct fd_set *writefds,
+//dead              struct fd_set *exceptfds, struct timeval *tv);
+//dead int __send (int handle, __const__ void *buf, int len, unsigned flags);
+//dead int __sendto (__const__ struct _sendto *args);
+//dead int __setsockopt (int handle, int level, int optname, __const__ void *optval,
+//dead     int optlen);
 int __settime (const struct timeval *tp);
-int __shutdown (int handle, int how);
+//dead int __shutdown (int handle, int how);
 int __sigaction (int _sig, __const__ struct sigaction *_iact,
     struct sigaction *_oact);
@@ -210 +210 @@
 unsigned __sleep (unsigned sec);
 unsigned __sleep2 (unsigned millisec);
-int __socket (int domain, int type, int protocol);
+//dead int __socket (int domain, int type, int protocol);
 int __spawnve (struct _new_proc *np);
-int __stat (__const__ char *name, struct stat *buffer);
+//dead int __stat (__const__ char *name, struct stat *buffer);
 int __swchar (int flag, int new_char);
 int __uflags (int mask, int new_flags);
 long __ulimit (int cmd, long new_limit);
-int __umask (int pmode);
+//dead int __umask (int pmode);
 void __unwind2 (void *xcpt_reg_ptr);
 int __utimes (__const__ char *name, __const__ struct timeval *tvp);

trunk/src/emx/include/io.h

@@ -85 +85 @@
 int      truncate(const char *, off_t);
 #endif
-int umask (int);
+mode_t  umask(mode_t);
 int unlink (__const__ char *);
 int write (int, __const__ void *, size_t);

trunk/src/emx/include/stdlib.h

@@ -287 +287 @@
 #endif /* __BSD_VISIBLE */
 
+
+
+/* bird: LIBC stuff - start  */
+#ifdef __BSD_VISIBLE
+char    *_getcwdux(char *, size_t);
+#endif
+#ifdef  __USE_GNU
+char    *canonicalize_file_name(const char *);
+#endif
+/* bird: LIBC stuff - end  */
 
 

trunk/src/emx/include/unistd.h

@@ -408 +408 @@
 
 
-#if !defined(_POSIX_SOURCE)
-
-
-#endif
-
-
+/*
+ * LIBC additions.
+ */
+#ifdef __BSD_VISIBLE
+char    *_getcwdux(char *, size_t);
+#endif
+
+
+/*
+ * EMX stuff.
+ */
 #if !defined(_POSIX_SOURCE) || defined(_WITH_UNDERSCORE)
 /** @todo update this section to match the one without underscores as far as needed! */