char *xrealpath(const char *path, char restrict resolved_path[]);
#endif
-extern_inline size_t xmin_size_t(size_t a, size_t b);
extern_inline void x__dirname(char *restrict res, const char *file, size_t len);
extern_inline size_t x__dirlen(const char *file, size_t len);
extern_inline char *xdirname(const char *file);
-\f
-/* str funs */
-/* thought these were defined already :O */
-#define xstrlen strlen
-#define xstrcmp strcmp
-#define xstrcat strcat
-#define xstrncmp strncmp
-#define xstrncpy strncpy
-#define xstrncat strncat
-#if defined HAVE_STPCPY
-# define xstpcpy stpcpy
-#else
-extern_inline char*
-xstpcpy(char *target, const char *source)
- __attribute__((always_inline));
-extern_inline char*
-xstpcpy(char *target, const char *source)
-{
- char *p = target;
- size_t len = xstrlen(source);
-
- strcpy(target, source);
- p += len;
- return p;
-}
-#endif /* !HAVE_STPCPY */
-#if defined HAVE_STPNCPY
-# define xstpncpy stpncpy
-#else
-extern_inline char*
-xstpncpy(char *target, const char *source, size_t len)
- __attribute__((always_inline));
-extern_inline char*
-xstpncpy(char *target, const char *source, size_t len)
-{
- char *p = target;
- strncpy(target, source, len);
- p += len;
- return p;
-}
-#endif /* !HAVE_STPNCPY */
-
-#define xmemcmp memcmp
-#define xmemcpy memcpy
-
-extern_inline size_t
-xmin_size_t(size_t a, size_t b)
-{
- if (a < b) {
- return a;
- } else {
- return b;
- }
-}
-
\f
/* big dirname magic, some of it stolen from dirname.c from coreutils 6.9 */
/* POSIX says:
#define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
+extern_inline size_t
+x__dirlen(const char *file, size_t len)
+ __attribute__((always_inline));
extern_inline size_t
x__dirlen(const char *file, size_t len)
{
return len;
}
-#if defined(HAVE_DIRNAME) && defined(DIRNAME_SIDE_EFFECT)
extern_inline void
x__dirname(char *restrict res, const char *file, size_t len)
-{
- /* assumes res is malloc'd of size LEN */
- xstrncpy(res, file, len);
- dirname(res);
- return;
-}
-#elif defined(HAVE_DIRNAME) && !defined(DIRNAME_ACCEPTS_PROTMEM)
-extern_inline void
-x__dirname(char *restrict res, const char *file, size_t len)
-{
- /* assumes res is malloc'd of size LEN */
- char *result;
- xstrncpy(res, file, len);
- /* if we were using side effects we woulda matched the above cond */
- result = dirname(res);
- xstrncpy(res, result, xmin_size_t(len, xstrlen(result)));
- return;
-}
-#elif defined(HAVE_DIRNAME)
+ __attribute__((always_inline));
+#if defined(HAVE_DIRNAME)
extern_inline void
x__dirname(char *restrict res, const char *file, size_t len)
{
- /* assumes res is malloc'd of size LEN */
- char *result = dirname(res);
- xstrncpy(res, result, xmin_size_t(len, xstrlen(result)));
- return;
+ /* assumes res is malloc'd of size LEN */
+ char *result;
+ xstrncpy(res, file, len);
+ result = dirname(res);
+ if (res == result) {
+ return;
+ }
+ if (result < res || result >= (res+len)) {
+ xstrncpy(res, result, len);
+ } else {
+ /* Use memmove if result overlaps res */
+ memmove(res, result, strlen(result)+1);
+ }
+ return;
}
#endif
+extern_inline char*
+xdirname(const char *file)
+ __attribute__((always_inline));
extern_inline char*
xdirname(const char *file)
{
- size_t len = xstrlen(file);
+ size_t len = xstrlen(file)+1;
char *res = xmalloc_atomic(len);
x__dirname(res, file, len);