~ubuntu-branches/ubuntu/precise/util-linux/precise-proposed

« back to all changes in this revision

Viewing changes to shlibs/blkid/src/superblocks/sysv.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-06-20 22:31:50 UTC
  • mfrom: (1.6.3 upstream) (4.5.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110620223150-lz8wrv0946ihcz3z
Tags: 2.19.1-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build for multiarch.
  - Add pre-depends on multiarch-support.
  - configure.ac: don't try to be clever about extracting a path name from
    $libdir to append to /usr in a way that's not overridable; instead,
    reuse the built-in configurable libexecdir.
  - Fix up the .pc.in files to know about libexecdir, so our substitutions
    don't leave us with unusable pkg-config files.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - Mention mountall(8) in fstab(5) manpages, along with its special
    options.
  - Since upstart is required in Ubuntu, the hwclock.sh init script is not
    called on startup and the hwclockfirst.sh init script is removed.
  - Drop depends on initscripts for the above.
  - Replace hwclock udev rule with an Upstart job.
  - For the case where mount is called with a directory to mount, look
    that directory up in mountall's /lib/init/fstab if we couldn't find
    it mentioned anywhere else.  This means "mount /proc", "mount /sys",
    etc. work.
  - mount.8 points to the cifs-utils package, not the obsolete smbfs one. 
* Dropped changes:
  - mount.preinst: lsb_release has been fixed in lucid and above to be
    usable without configuration, so we don't have to diverge from Debian
    here anymore.
* Changes merged upstream:
  - sfdisk support for '+' with '-N'
  - mount/umount.c: fix a segfault on umount with empty mtab entry
  - Fix arbitrary unmount with fuse security issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#include <stdlib.h>
13
13
#include <unistd.h>
14
14
#include <stdint.h>
 
15
#include <stddef.h>
15
16
 
16
17
#include "superblocks.h"
17
18
 
107
108
 
108
109
                if (sb->s_magic == cpu_to_le32(0xfd187e20) ||
109
110
                    sb->s_magic == cpu_to_be32(0xfd187e20)) {
110
 
                        blkid_probe_set_label(pr, sb->s_fname, sizeof(sb->s_fname));
 
111
 
 
112
                        if (blkid_probe_set_label(pr, sb->s_fname,
 
113
                                                sizeof(sb->s_fname)))
 
114
                                return -1;
 
115
 
 
116
                        if (blkid_probe_set_magic(pr,
 
117
                                        off + offsetof(struct sysv_super_block,
 
118
                                                                s_magic),
 
119
                                        sizeof(sb->s_magic),
 
120
                                        (unsigned char *) &sb->s_magic))
 
121
                                return -1;
 
122
 
111
123
                        return 0;
112
124
                }
113
125
        }