← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/cpio.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:
fs/cpio.c
280
280
 
281
281
      /* Compare NAME and FN by hand in order to cope with duplicate
282
282
         slashes.  */
283
 
      i = 1;
 
283
      i = 0;
284
284
      j = 0;
 
285
      while (name[i] == '/')
 
286
        i++;
285
287
      while (1)
286
288
        {
287
289
          if (name[i] != fn[j])
290
292
          if (name[i] == '\0')
291
293
            break;
292
294
 
293
 
          if (name[i] == '/' && name[i+1] == '/')
 
295
          while (name[i] == '/' && name[i+1] == '/')
294
296
            i++;
295
297
 
296
298
          i++;
297
299
          j++;
298
300
        }
299
301
 
 
302
      if (name[i] != fn[j])
 
303
        goto no_match;
 
304
 
300
305
      file->data = data;
301
306
      file->size = data->size;
302
307
      grub_free (fn);