Use unix functions for temporary files and special files on cygwin.

diff --git a/ChangeLog b/ChangeLog
index ac59e97d0e166734473f9c19ad0d99677b7c6160..5824c165fe3a828174892ae2bc2623857422a089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Use unix functions for temporary files and special files on cygwin.
+
 2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Define functions explicitly rather than using --defsym in tests

diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c
index 309562af4237d346afe59c6cfac713a290d58b4f..fa83f26e28de202f090a5599071d2dfb31e5087c 100644 (file)
--- a/grub-core/osdep/unix/hostdisk.c
+++ b/grub-core/osdep/unix/hostdisk.c
@@ -275,6 +275,10 @@ grub_util_get_mtime (const char *path)
   return st.st_mtime;
 }
 
+#endif
+
+#if defined (__CYGWIN__) || (!defined (__MINGW32__) && !defined (__AROS__))
+
 int
 grub_util_is_special_file (const char *path)
 {

diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
index 8f56c21b0afefee2164eff904e8a263aae92257c..af7d07ca73dfcfadcd560ffc70822a0f3846b64d 100644 (file)
--- a/grub-core/osdep/windows/hostdisk.c
+++ b/grub-core/osdep/windows/hostdisk.c
@@ -467,6 +467,8 @@ grub_util_rmdir (const char *name)
   return ret;
 }
 
+#ifndef __CYGWIN__
+
 static char *
 get_temp_name (void)
 {
@@ -536,6 +538,8 @@ grub_util_make_temporary_dir (void)
   return ret;
 }
 
+#endif
+
 int
 grub_util_is_directory (const char *name)
 {
@@ -661,14 +665,4 @@ grub_util_fopen (const char *path, const char *mode)
   return fopen (path, mode);
 }
 
-int
-grub_util_is_special_file (const char *path)
-{
-  struct stat st;
-
-  if (lstat (path, &st) == -1)
-    return 1;
-  return (!S_ISREG (st.st_mode) && !S_ISDIR (st.st_mode));
-}
-
 #endif