efl: add macro to swap Windows and Unix path separators.

6 files changed, 30 insertions, 53 deletions

diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/dlfcn.c
index a877653ec6..823398c934 100644
--- a/src/lib/evil/dlfcn.c
+++ b/src/lib/evil/dlfcn.c
@@ -196,7 +196,6 @@ dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
    TCHAR  tpath[PATH_MAX];
    MEMORY_BASIC_INFORMATION mbi;
    char  *path;
-   char  *tmp;
    size_t length;
    int    ret = 0;
 
@@ -236,13 +235,7 @@ dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
        path[PATH_MAX - 1] = '\0';
      }
 
-   /* replace '/' by '\' */
-   tmp = path;
-   while (*tmp)
-     {
-        if (*tmp == '/') *tmp = '\\';
-        tmp++;
-     }
+   EVIL_PATH_SEP_UNIX_TO_WIN32(path);
 
    memcpy (info->dli_fname, path, length + 1);
    info->dli_fbase = NULL;
diff --git a/src/lib/evil/evil_dirent.c b/src/lib/evil/evil_dirent.c
index 041899d53e..1a0b19b83b 100644
--- a/src/lib/evil/evil_dirent.c
+++ b/src/lib/evil/evil_dirent.c
@@ -19,8 +19,7 @@ struct DIR
 DIR *opendir(char const *name)
 {
    DIR     *dir;
-   char    *tmp1;
-   char    *tmp2;
+   char    *tmp;
    DWORD    attr;
    size_t   l;
 #ifdef UNICODE
@@ -71,39 +70,34 @@ DIR *opendir(char const *name)
      }
 
    l = strlen(name);
-   tmp1 = (char *)malloc(sizeof(char) * l + 5);
-   if (!tmp1)
+   tmp = (char *)malloc(sizeof(char) * l + 5);
+   if (!tmp)
      {
         errno = ENOMEM;
         return NULL;
      }
 
-   memcpy(tmp1, name, l);
-   memcpy(tmp1 + l, "\\*.*", 5);
+   memcpy(tmp, name, l);
+   memcpy(tmp + l, "\\*.*", 5);
 
-   tmp2 = tmp1;
-   while (*tmp2)
-     {
-        if (*tmp2 == '/') *tmp2 = '\\';
-        tmp2++;
-     }
+   EVIL_PATH_SEP_UNIX_TO_WIN32(tmp);
 
 #ifdef UNICODE
-   wname = evil_char_to_wchar(tmp1);
+   wname = evil_char_to_wchar(tmp);
    if (!wname)
      {
         errno = ENOMEM;
-        free(tmp1);
+        free(tmp);
 
         return NULL;
      }
    dir->handle = FindFirstFile(wname, &dir->data);
    free(wname);
 #else
-   dir->handle = FindFirstFile(tmp1, &dir->data);
+   dir->handle = FindFirstFile(tmp, &dir->data);
 #endif
 
-   free(tmp1);
+   free(tmp);
 
    if (dir->handle == INVALID_HANDLE_VALUE)
      {
diff --git a/src/lib/evil/evil_libgen.c b/src/lib/evil/evil_libgen.c
index 7e98f74386..779193fe30 100644
--- a/src/lib/evil/evil_libgen.c
+++ b/src/lib/evil/evil_libgen.c
@@ -31,12 +31,8 @@ evil_basename(char *path)
         memcpy(_evil_basename_buf, "C:\\", 4);
         return _evil_basename_buf;
      }
-   p2 = p1;
-   while (*p2)
-     {
-        if (*p2 == '/') *p2 = '\\';
-        p2++;
-     }
+
+   EVIL_PATH_SEP_UNIX_TO_WIN32(p1);
 
    /* remove trailing backslashes */
    p2 = p1 + (length - 1);
diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c
index 1aa6f67537..231e5043d6 100644
--- a/src/lib/evil/evil_stdio.c
+++ b/src/lib/evil/evil_stdio.c
@@ -29,7 +29,6 @@ FILE *evil_fopen(const char *path, const char *mode)
 {
    FILE *f;
    char *filename;
-   char *tmp;
 
    if (!path || !*path)
      return NULL;
@@ -56,13 +55,7 @@ FILE *evil_fopen(const char *path, const char *mode)
    else
      filename = _strdup(path);
 
-   tmp = filename;
-   while (*tmp)
-     {
-        if (*tmp == '/')
-          *tmp = '\\';
-        tmp++;
-     }
+   EVIL_PATH_SEP_UNIX_TO_WIN32(filename);
 
    printf ("fopen : %s\n", filename);
 
@@ -108,7 +101,6 @@ FILE *evil_fopen_native(const char *path, const char *mode)
 {
    HANDLE   handle;
    char    *filename;
-   char    *tmp;
    wchar_t *wfilename;
    DWORD    acs = GENERIC_READ;
    DWORD    creation;
@@ -138,13 +130,7 @@ FILE *evil_fopen_native(const char *path, const char *mode)
    else
      filename = _strdup(path);
 
-   tmp = filename;
-   while (*tmp)
-     {
-        if (*tmp == '/')
-          *tmp = '\\';
-        tmp++;
-     }
+   EVIL_PATH_SEP_UNIX_TO_WIN32(filename);
    printf ("fopen native : %s\n", filename);
 
    wfilename = evil_char_to_wchar(filename);
diff --git a/src/lib/evil/evil_stdio.h b/src/lib/evil/evil_stdio.h
index 2b831c4a86..0baf00f5b8 100644
--- a/src/lib/evil/evil_stdio.h
+++ b/src/lib/evil/evil_stdio.h
@@ -13,6 +13,20 @@
  * @{
  */
 
+#define EVIL_PATH_SEP_SWAP(p, s1, s2) \
+   do { \
+     char *_evil_path_tmp; \
+     _evil_path_tmp = p; \
+     while (*_evil_path_tmp) \
+       { \
+          if (*_evil_path_tmp == s1) \
+            *_evil_path_tmp = s2; \
+          _evil_path_tmp++; \
+       } \
+   } while (0)
+
+#define EVIL_PATH_SEP_WIN32_TO_UNIX(p) EVIL_PATH_SEP_SWAP(p, '\\', '/')
+#define EVIL_PATH_SEP_UNIX_TO_WIN32(p) EVIL_PATH_SEP_SWAP(p, '/', '\\')
 
 #ifdef _WIN32_WCE
 
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index 31c018a2f6..eb1c832094 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -169,7 +169,6 @@ evil_stat(const char *file_name, struct stat *st)
    WIN32_FIND_DATA data;
    HANDLE          handle;
    char           *f;
-   char           *tmp;
    wchar_t        *file;
    int             permission = 0;
 
@@ -180,12 +179,7 @@ evil_stat(const char *file_name, struct stat *st)
    if (!f)
      return -1;
 
-   tmp = f;
-   while (*tmp)
-     {
-        if (*tmp == '/') *tmp = '\\';
-        tmp++;
-     }
+   EVIL_PATH_SEP_UNIX_TO_WIN32(f);
 
    if (!strcmp(file_name, "\\"))
      {