← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/disk/loopback.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/disk/loopback.c
25
25
#include <grub/extcmd.h>
26
26
#include <grub/i18n.h>
27
27
 
 
28
GRUB_MOD_LICENSE ("GPLv3+");
 
29
 
28
30
struct grub_loopback
29
31
{
30
32
  char *devname;
97
99
 
98
100
  if (newdev)
99
101
    {
100
 
      char *newname = grub_strdup (args[1]);
101
 
      if (! newname)
102
 
        goto fail;
103
 
 
104
102
      grub_file_close (newdev->file);
105
103
      newdev->file = file;
106
104
 
166
164
    disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
167
165
  disk->id = (unsigned long) dev;
168
166
 
169
 
  disk->data = dev->file;
 
167
  disk->data = dev;
170
168
 
171
169
  return 0;
172
170
}
175
173
grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
176
174
                    grub_size_t size, char *buf)
177
175
{
178
 
  grub_file_t file = (grub_file_t) disk->data;
 
176
  grub_file_t file = ((struct grub_loopback *) disk->data)->file;
179
177
  grub_off_t pos;
180
178
 
181
179
  grub_file_seek (file, sector << GRUB_DISK_SECTOR_BITS);
222
220
GRUB_MOD_INIT(loopback)
223
221
{
224
222
  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, 0,
225
 
                              N_("[-d|-p] DEVICENAME FILE."),
 
223
                              N_("[-d] DEVICENAME FILE."),
226
224
                              N_("Make a device of a file."), options);
227
225
  grub_disk_dev_register (&grub_loopback_dev);
228
226
}