← Back to branch summary

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

« back to all changes in this revision

Viewing changes to grub-core/fs/iso9660.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/fs/iso9660.c
28
28
#include <grub/fshelp.h>
29
29
#include <grub/charset.h>
30
30
 
 
31
GRUB_MOD_LICENSE ("GPLv3+");
 
32
 
31
33
#define GRUB_ISO9660_FSTYPE_DIR         0040000
32
34
#define GRUB_ISO9660_FSTYPE_REG         0100000
33
35
#define GRUB_ISO9660_FSTYPE_SYMLINK     0120000
808
810
                 ((grub_uint16_t *) &data->voldesc.volname, 16);
809
811
      else
810
812
        *label = grub_strndup ((char *) data->voldesc.volname, 32);
 
813
      if (*label)
 
814
        {
 
815
          char *ptr;
 
816
          for (ptr = *label; *ptr;ptr++);
 
817
          ptr--;
 
818
          while (ptr >= *label && *ptr == ' ')
 
819
            *ptr-- = 0;
 
820
        }
 
821
 
811
822
      grub_free (data);
812
823
    }
813
824
  else