← Back to branch summary

~ubuntu-branches/ubuntu/natty/busybox/natty

« back to all changes in this revision

Viewing changes to e2fsprogs/old_e2fsprogs/blkid/read.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-10-13 11:03:32 UTC
  • mfrom: (2.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20101013110332-epixayl40r7l8mpi
Tags: 1:1.17.1-4ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - [udeb] Enable chvt, getopt (and -l), killall, losetup, mktemp, NFS
    mount, od, ping, stat, and remote syslog.
  - [deb] Enable mdev.
  - [deb, static] Enable fractional sleep.
  - Enable 'mount -f' and mount helpers for all targets.
  - Add busybox-initramfs.
  - test-bin.patch: Move test and friends to /bin.
  - Add static-sh alias name for ash, and install /bin/static-sh symlink to
    busybox in busybox-static.
  - Use -marm on armel due to gcc thumb2 compilation issue.
  - grep-o-loop.patch: Fix infinite loop in 'grep -o' with a pattern that
    matches the zero-length string at the start of the line.
  - Add cross-compiling support.
  - applets-fallback.patch: Never execute busybox applets when chrooting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
e2fsprogs/old_e2fsprogs/blkid/read.c
374
374
        DBG(DEBUG_CACHE, printf("reading cache file %s\n",
375
375
                                cache->bic_filename));
376
376
 
377
 
        file = fdopen(fd, "r");
378
 
        if (!file)
379
 
                goto errout;
 
377
        file = xfdopen_for_read(fd);
380
378
 
381
379
        while (fgets(buf, sizeof(buf), file)) {
382
380
                blkid_dev dev;