Changeset 3903 for branches/libc-0.6/src/emx/include

Timestamp:

Oct 23, 2014, 10:26:55 PM (11 years ago)

Author:

bird

Message:

0.6: Safer and more generic _path and _searchenv functions, making the spawn code use for locating executables in a more flexible manner. Unix style search PATH separators are now honored. Fixes #180 and #308.

Location:

branches/libc-0.6/src/emx/include

Files:

• stdlib.h (modified) (2 diffs)
• sys/cdefs.h (modified) (1 diff)

branches/libc-0.6/src/emx/include/stdlib.h

@@ -462 +462 @@
     const char *, const char *);
 int _path (char *, const char *);
+int _path2(const char *pszName, const char *pszSuffixes, char *pszDst, size_t cbDst);
 int _read_kbd (int, int, int);
 void _remext (char *);
@@ -468 +469 @@
 void _scrsize (int *);
 void _searchenv (const char *, const char *, char *);
+int _searchenv2(const char *pszEnvVar, const char *pszName, unsigned fFlags, const char *pszSuffixes,
+                char *pszDst, size_t cbDst);
+int _searchenv2_value(const char *pszSearchPath, const char *pszName, unsigned fFlags, const char *pszSuffixes,
+                      char *pszDst, size_t cbDst);
+int _searchenv2_has_suffix(const char *pszName, size_t cchName, const char *pszSuffixes);
+int _searchenv2_one_file(char *pszDst, size_t cbDst, size_t cchName, unsigned fFlags, const char *pszSuffixes);
+/** @name _SEARCHENV2_F_XXX - Flags for _searchenv2(), _searchenv2_value()
+ *                            and _searchenv2_one_file().
+ * @{ */
+/** Indicates that we're searching for an executable file. */
+#define _SEARCHENV2_F_EXEC_FILE     1
+/** Indicates that we shouldn't explicitly check the current directory before
+ * searching the search path. */
+#define _SEARCHENV2_F_SKIP_CURDIR   2
+/** @} */
+
 void _sfnlwr (const char *);
 unsigned _sleep2 (unsigned);

branches/libc-0.6/src/emx/include/sys/cdefs.h

@@ -627 +627 @@
 #include <sys/gnu/cdefs.h>
 
+/* bird: kLIBC specifics - start */
+/** @def __KLIBC_PATH_SLASH
+ * The default slash character (path component separator). */
+/** @def __KLIBC_PATH_SLASH_ALT
+ * Alternative slash character (path component separator). Optional. */
+/** @def __KLIBC_PATH_HAVE_DRIVE_LETTERS
+ * Defined if we have driver letters on this platform. */
+/** @def __KLIBC_PATH_HAVE_DRIVES
+ * Defined if we have UNC paths on this platform. */
+#if defined(__OS2__) || defined(_WIN32) || defined(_WIN64) || defined(__NT__)
+# define __KLIBC_PATH_SLASH         '\\'
+# define __KLIBC_PATH_SLASH_ALT     '/'
+# define __KLIBC_PATH_HAVE_DRIVE_LETTERS   1
+# define __KLIBC_PATH_HAVE_UNC      1
+#else
+# define __KLIBC_PATH_SLASH         '/'
+# undef  __KLIBC_PATH_SLASH_ALT
+# undef  __KLIBC_PATH_HAVE_DRIVE_LETTERS
+# undef  __KLIBC_PATH_HAVE_UNC
+#endif
+/** @def __KLIBC_PATH_IS_SLASH
+ * Checks if @a a_ch is a slash character.
+ * @param a_ch      The character. */
+#ifdef __KLIBC_PATH_SLASH_ALT
+# define __KLIBC_PATH_IS_SLASH(a_ch)    ((a_ch) == __KLIBC_PATH_SLASH || (a_ch) == __KLIBC_PATH_SLASH_ALT)
+#else
+# define __KLIBC_PATH_IS_SLASH(a_ch)    ((a_ch) == __KLIBC_PATH_SLASH)
+#endif
+/* bird: kLIBC specifics - end */
+
 #endif /* !_SYS_CDEFS_H_ */