~ubuntu-branches/ubuntu/wily/grub2/wily-proposed

« back to all changes in this revision

Viewing changes to efiemu/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Zielcke, Robert Millan, Felix Zielcke
  • Date: 2010-01-26 19:26:25 UTC
  • mfrom: (1.13.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126192625-coq6czap2ofjollf
Tags: 1.98~20100126-1
* New Bazaar snapshot.
  - Includes mipsel-yeeloong port.

[ Robert Millan ]
* config.in: Lower priority of grub2/linux_cmdline_default.

[ Felix Zielcke ]
* Drop `CFLAGS=-O0' workaround on powerpc. Should be fixed correctly now.
* Ship grub-bin2h and grub-script-check in grub-common.
* Terminate NEWS.Debian with a blank line like lintian would suggest
  if that check would be working correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
255
255
 
256
256
  suffix = grub_efiemu_get_default_core_name ();
257
257
 
258
 
  filename = grub_malloc (grub_strlen (prefix) + grub_strlen (suffix) + 2);
 
258
  filename = grub_xasprintf ("%s/%s", prefix, suffix);
259
259
  if (! filename)
260
260
    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
261
261
                       "couldn't allocate temporary space");
262
262
 
263
 
  grub_sprintf (filename, "%s/%s", prefix, suffix);
264
263
 
265
264
  err = grub_efiemu_load_file (filename);
266
265
  grub_free (filename);