From 1eb3c02eb5aa367645368518f6a88688094860e3 Mon Sep 17 00:00:00 2001 From: martin-s Date: Tue, 25 Jan 2011 15:42:49 +0000 Subject: [PATCH] Fix:vehicle_file:MSVC fixes git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4025 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/file.c | 12 ++++++++++++ navit/navit/vehicle/file/vehicle_file.c | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/navit/navit/file.c b/navit/navit/file.c index 1b9f9b1..2d38ba5 100644 --- a/navit/navit/file.c +++ b/navit/navit/file.c @@ -264,6 +264,9 @@ file_create_url(char *url) #ifndef S_ISDIR #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif +#ifndef S_ISREG +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif int file_is_dir(char *name) { @@ -275,6 +278,15 @@ int file_is_dir(char *name) } +int file_is_reg(char *name) +{ + struct stat buf; + if (! stat(name, &buf)) { + return S_ISREG(buf.st_mode); + } + return 0; +} + long long file_size(struct file *file) { diff --git a/navit/navit/vehicle/file/vehicle_file.c b/navit/navit/vehicle/file/vehicle_file.c index 88a7cdd..c05c6dd 100644 --- a/navit/navit/vehicle/file/vehicle_file.c +++ b/navit/navit/vehicle/file/vehicle_file.c @@ -231,8 +231,7 @@ vehicle_file_open(struct vehicle_priv *priv) priv->fd = open(name, O_RDONLY | O_NDELAY); if (priv->fd < 0) return 0; - stat(name, &st); - if (S_ISREG(st.st_mode)) { + if (file_is_reg(name)) { priv->file_type = file_type_file; } #ifndef _WIN32 -- 2.7.4