diff --git a/ChangeLog b/ChangeLog index 22eb08fef..4643f5e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-09 Vladimir Serbinenko + + Move OS-dependent file definitions to include/grub/osdep/hostfile*.h. + 2013-10-09 Vladimir Serbinenko * include/grub/emu/hostdisk.h (grub_hostdisk_linux_find_partition): diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h index 016ccf603..6f13c95e3 100644 --- a/include/grub/emu/hostdisk.h +++ b/include/grub/emu/hostdisk.h @@ -23,41 +23,7 @@ #include #include #include - -#if defined (__AROS__) -struct grub_util_fd -{ - enum { GRUB_UTIL_FD_FILE, GRUB_UTIL_FD_DISK } type; - grub_uint64_t off; - union - { - int fd; - struct { - struct IOExtTD *ioreq; - struct MsgPort *mp; - unsigned int is_floppy:1; - unsigned int is_64:1; - }; - }; -}; -typedef struct grub_util_fd *grub_util_fd_t; - -#define GRUB_UTIL_FD_INVALID NULL -#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID) -#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0 - -#elif defined (__CYGWIN__) || defined (__MINGW32__) -#include -typedef HANDLE grub_util_fd_t; -#define GRUB_UTIL_FD_INVALID INVALID_HANDLE_VALUE -#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID) -#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0 -#else -typedef int grub_util_fd_t; -#define GRUB_UTIL_FD_INVALID -1 -#define GRUB_UTIL_FD_IS_VALID(x) ((x) >= 0) -#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 1 -#endif +#include grub_util_fd_t grub_util_fd_open (const char *os_dev, int flags); @@ -124,12 +90,6 @@ grub_hostdisk_find_partition_start_os (const char *dev); void grub_hostdisk_flush_initial_buffer (const char *os_dev); -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__) || defined (__sun__) || defined(__OpenBSD__) -#define GRUB_DISK_DEVS_ARE_CHAR 1 -#else -#define GRUB_DISK_DEVS_ARE_CHAR 0 -#endif - struct grub_util_hostdisk_data { char *dev; diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h index e25049b6a..9a06addd5 100644 --- a/include/grub/emu/misc.h +++ b/include/grub/emu/misc.h @@ -24,19 +24,7 @@ #include #include - -#if defined (__AROS__) -# define DEFAULT_DIRECTORY "SYS:" GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME -#elif defined __CYGWIN__ || defined (__MINGW32__) -# define DEFAULT_DIRECTORY "C:\\"GRUB_BOOT_DIR_NAME"\\"GRUB_DIR_NAME -#elif defined (__NetBSD__) -/* NetBSD uses /boot for its boot block. */ -# define DEFAULT_DIRECTORY "/"GRUB_DIR_NAME -#else -# define DEFAULT_DIRECTORY "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME -#endif - -#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map" +#include extern int verbosity; extern const char *program_name; @@ -63,12 +51,6 @@ void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format extern char * canonicalize_file_name (const char *path); -#ifdef __MINGW32__ - -int fsync (int fno); - -#endif - #ifdef HAVE_DEVICE_MAPPER int grub_device_mapper_supported (void); #endif diff --git a/include/grub/osdep/hostfile.h b/include/grub/osdep/hostfile.h new file mode 100644 index 000000000..6d9f75ba3 --- /dev/null +++ b/include/grub/osdep/hostfile.h @@ -0,0 +1,7 @@ +#if defined (__AROS__) +#include "hostfile_aros.h" +#elif defined (__CYGWIN__) || defined (__MINGW32__) +#include "hostfile_windows.h" +#else +#include "hostfile_unix.h" +#endif diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h new file mode 100644 index 000000000..1a0cd3b3a --- /dev/null +++ b/include/grub/osdep/hostfile_aros.h @@ -0,0 +1,49 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_EMU_HOSTFILE_H +#define GRUB_EMU_HOSTFILE_H 1 + +#include +#include + +struct grub_util_fd +{ + enum { GRUB_UTIL_FD_FILE, GRUB_UTIL_FD_DISK } type; + grub_uint64_t off; + union + { + int fd; + struct { + struct IOExtTD *ioreq; + struct MsgPort *mp; + unsigned int is_floppy:1; + unsigned int is_64:1; + }; + }; +}; +typedef struct grub_util_fd *grub_util_fd_t; + +#define GRUB_UTIL_FD_INVALID NULL +#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID) +#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0 + +#define DEFAULT_DIRECTORY "SYS:" GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME +#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map" + +#endif diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h new file mode 100644 index 000000000..e99509fc8 --- /dev/null +++ b/include/grub/osdep/hostfile_unix.h @@ -0,0 +1,48 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_EMU_HOSTFILE_H +#define GRUB_EMU_HOSTFILE_H 1 + +#include +#include + +#include +#include + +#if defined (__NetBSD__) +/* NetBSD uses /boot for its boot block. */ +# define DEFAULT_DIRECTORY "/"GRUB_DIR_NAME +#else +# define DEFAULT_DIRECTORY "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME +#endif + +#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map" + +typedef int grub_util_fd_t; +#define GRUB_UTIL_FD_INVALID -1 +#define GRUB_UTIL_FD_IS_VALID(x) ((x) >= 0) +#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 1 + +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__) || defined (__sun__) || defined(__OpenBSD__) +#define GRUB_DISK_DEVS_ARE_CHAR 1 +#else +#define GRUB_DISK_DEVS_ARE_CHAR 0 +#endif + +#endif diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h new file mode 100644 index 000000000..b062c4708 --- /dev/null +++ b/include/grub/osdep/hostfile_windows.h @@ -0,0 +1,43 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_EMU_HOSTFILE_H +#define GRUB_EMU_HOSTFILE_H 1 + +#include +#include + +#include +typedef HANDLE grub_util_fd_t; +#define GRUB_UTIL_FD_INVALID INVALID_HANDLE_VALUE +#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID) +#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0 + +#define DEFAULT_DIRECTORY "C:\\"GRUB_BOOT_DIR_NAME"\\"GRUB_DIR_NAME +#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map" + +#ifdef __MINGW32__ + +int fsync (int fno); + +#define fseeko fseeko64 +#define ftello ftello64 + +#endif + +#endif diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h index 598e71243..3c481c500 100644 --- a/include/grub/util/misc.h +++ b/include/grub/util/misc.h @@ -29,6 +29,7 @@ #include #include #include +#include char *grub_util_get_path (const char *dir, const char *file); size_t grub_util_get_image_size (const char *path); @@ -39,14 +40,6 @@ void grub_util_write_image (const char *img, size_t size, FILE *out, void grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out, const char *name); -#ifdef __MINGW32__ - -#define fseeko fseeko64 -#define ftello ftello64 - -#endif - - char *make_system_path_relative_to_its_root (const char *path); char *canonicalize_file_name (const char *path);