Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* grub-core/osdep/unix/exec.c: Fix compilation error on emu.

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2013-10-19 23:53:48 +02:00
1 parent bbd2b5396b
commit 518864c05b
2 files changed
+13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2013-10-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/unix/exec.c: Fix compilation error on emu.
2013-10-19 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/misc.c (grub_vsnprintf_real): Fix formatting of * grub-core/kern/misc.c (grub_vsnprintf_real): Fix formatting of
grub-core/osdep/unix/exec.c
+9
View File
@@ -25,6 +25,7 @@
#include <grub/emu/hostdisk.h> #include <grub/emu/hostdisk.h>
#include <grub/emu/getroot.h> #include <grub/emu/getroot.h>
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/disk.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@@ -46,8 +47,10 @@ grub_util_exec (const char *const *argv)
/* Child. */ /* Child. */
/* Close fd's. */ /* Close fd's. */
#ifdef GRUB_UTIL
grub_util_devmapper_cleanup (); grub_util_devmapper_cleanup ();
grub_diskfilter_fini (); grub_diskfilter_fini ();
#endif
/* Ensure child is not localised. */ /* Ensure child is not localised. */
setenv ("LC_ALL", "C", 1); setenv ("LC_ALL", "C", 1);
@@ -78,8 +81,10 @@ grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
/* Child. */ /* Child. */
/* Close fd's. */ /* Close fd's. */
#ifdef GRUB_UTIL
grub_util_devmapper_cleanup (); grub_util_devmapper_cleanup ();
grub_diskfilter_fini (); grub_diskfilter_fini ();
#endif
in = open (stdin_file, O_RDONLY); in = open (stdin_file, O_RDONLY);
dup2 (in, STDIN_FILENO); dup2 (in, STDIN_FILENO);
@@ -129,8 +134,10 @@ grub_util_exec_pipe (const char *const *argv, int *fd)
/* Child. */ /* Child. */
/* Close fd's. */ /* Close fd's. */
#ifdef GRUB_UTIL
grub_util_devmapper_cleanup (); grub_util_devmapper_cleanup ();
grub_diskfilter_fini (); grub_diskfilter_fini ();
#endif
/* Ensure child is not localised. */ /* Ensure child is not localised. */
setenv ("LC_ALL", "C", 1); setenv ("LC_ALL", "C", 1);
@@ -172,8 +179,10 @@ grub_util_exec_pipe_stderr (const char *const *argv, int *fd)
/* Child. */ /* Child. */
/* Close fd's. */ /* Close fd's. */
#ifdef GRUB_UTIL
grub_util_devmapper_cleanup (); grub_util_devmapper_cleanup ();
grub_diskfilter_fini (); grub_diskfilter_fini ();
#endif
/* Ensure child is not localised. */ /* Ensure child is not localised. */
setenv ("LC_ALL", "C", 1); setenv ("LC_ALL", "C", 1);