vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-18 14:54:01 +01:00
commit 4d5b72cdb4
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-18 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):
Handle errors from mkstemp.
(grub_util_make_temporary_dir): Handle errors from mkdtemp.
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: Use -cdrom and don't force cdrom * tests/util/grub-shell.in: Use -cdrom and don't force cdrom

7
grub-core/osdep/unix/hostdisk.c
View file

@ -281,7 +281,8 @@ grub_util_make_temporary_file (void)
memcpy (tmp, t, tl); memcpy (tmp, t, tl);
memcpy (tmp + tl, "/grub.XXXXXX", memcpy (tmp + tl, "/grub.XXXXXX",
sizeof ("/grub.XXXXXX")); sizeof ("/grub.XXXXXX"));
mkstemp (tmp); if (mkstemp (tmp) == -1)
grub_util_error (_("cannot make temporary file: %s"), strerror (errno));
return tmp; return tmp;
} }
@ -298,7 +299,9 @@ grub_util_make_temporary_dir (void)
memcpy (tmp, t, tl); memcpy (tmp, t, tl);
memcpy (tmp + tl, "/grub.XXXXXX", memcpy (tmp + tl, "/grub.XXXXXX",
sizeof ("/grub.XXXXXX")); sizeof ("/grub.XXXXXX"));
mkdtemp (tmp); if (!mkdtemp (tmp))
grub_util_error (_("cannot make temporary directory: %s"),
strerror (errno));
return tmp; return tmp;
} }