void xpread(int fd, void *buf, size_t count, off_t offset)
{
- ssize_t r = pread(fd, buf, count, offset);
-
- if (r != count)
- die("read error (ret %zi)", r);
+ while (count) {
+ ssize_t r = pread(fd, buf, count, offset);
+
+ if (r < 0)
+ die("read error: %m");
+ if (!r)
+ die("pread error: unexpected eof");
+ count -= r;
+ offset += r;
+ }
}
void xpwrite(int fd, const void *buf, size_t count, off_t offset)
return stat;
}
+struct stat xstat(const char *path)
+{
+ struct stat statbuf;
+ if (stat(path, &statbuf))
+ die("stat error statting %s: %m", path);
+ return statbuf;
+}
+
/* Formatting: */
int printf_pad(unsigned pad, const char * fmt, ...)
ssize_t read_string_list_or_die(const char *opt, const char * const list[],
const char *msg)
{
- ssize_t v = bch2_read_string_list(opt, list);
+ ssize_t v = match_string(list, -1, opt);
if (v < 0)
die("Bad %s %s", msg, opt);
return e;
}
-const char *strcmp_prefix(const char *a, const char *a_prefix)
+char *strcmp_prefix(char *a, const char *a_prefix)
{
while (*a_prefix && *a == *a_prefix) {
a++;
return crc;
}
+#endif
+
static void *resolve_crc32c(void)
{
- __builtin_cpu_init();
-
#ifdef __x86_64__
if (__builtin_cpu_supports("sse4.2"))
return crc32c_sse42;
*/
#ifdef HAVE_WORKING_IFUNC
+static void *ifunc_resolve_crc32c(void)
+{
+ __builtin_cpu_init();
+
+ return resolve_crc32c
+}
+
u32 crc32c(u32, const void *, size_t)
- __attribute__((ifunc("resolve_crc32c")));
+ __attribute__((ifunc("ifunc_resolve_crc32c")));
#else
return path;
}
-char *dev_to_mount(char *dev)
+struct mntent *dev_to_mount(char *dev)
{
- char *line = NULL, *ret = NULL;
- size_t n = 0;
-
- FILE *f = fopen("/proc/mounts", "r");
+ struct mntent *mnt, *ret = NULL;
+ FILE *f = setmntent("/proc/mounts", "r");
if (!f)
die("error opening /proc/mounts: %m");
- while (getline(&line, &n, f) != -1) {
- char *d, *p = line;
- char *devs = strsep(&p, " ");
- char *mount = strsep(&p, " ");
-
- if (!devs || !mount)
- continue;
-
- p = devs;
- while ((d = strsep(&p, ":")))
- if (!strcmp(d, dev)) {
- ret = strdup(mount);
- goto found;
+ struct stat d1 = xstat(dev);
+
+ while ((mnt = getmntent(f))) {
+ char *d, *p = mnt->mnt_fsname;
+
+ while ((d = strsep(&p, ":"))) {
+ struct stat d2;
+
+ if (stat(d, &d2))
+ continue;
+
+ if (S_ISBLK(d1.st_mode) != S_ISBLK(d2.st_mode))
+ continue;
+
+ if (S_ISBLK(d1.st_mode)) {
+ if (d1.st_rdev != d2.st_rdev)
+ continue;
+ } else {
+ if (d1.st_dev != d2.st_dev ||
+ d1.st_ino != d2.st_ino)
+ continue;
}
+
+ ret = mnt;
+ goto found;
+ }
}
found:
fclose(f);
- free(line);
return ret;
}
-#endif
+bool dev_mounted_rw(char *dev)
+{
+ struct mntent *mnt = dev_to_mount(dev);
+
+ return mnt && !hasmntopt(mnt, "ro");
+}