7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
152 lines
3.4 KiB
Diff
152 lines
3.4 KiB
Diff
From 42c45995fdee50f135f1ac42d0ab496dd0d01f60 Mon Sep 17 00:00:00 2001
|
|
From: Baruch Even <baruch@ev-en.org>
|
|
Date: Wed, 25 Nov 2015 23:02:38 +0200
|
|
Subject: [PATCH 1/5] Fix crash on a non-disk device
|
|
|
|
Closes #9
|
|
---
|
|
src/disku.c | 115 +++++++++++++++++++++++++++-------------------------
|
|
1 file changed, 59 insertions(+), 56 deletions(-)
|
|
|
|
diff --git src/disku.c src/disku.c
|
|
index b918147..b33ba91 100644
|
|
--- a/src/disku.c
|
|
+++ b/src/disku.c
|
|
@@ -36,66 +36,33 @@
|
|
|
|
#include <unistd.h>
|
|
|
|
-
|
|
-/*
|
|
- * get disk geometry. The medium is opened for reading,
|
|
- * descriptor in d_fd.
|
|
- */
|
|
-
|
|
-struct disk_geom *disk_geometry(disk_desc *d)
|
|
-{
|
|
- static struct disk_geom g;
|
|
- uint64_t nsects;
|
|
-
|
|
- memset(&g, 0, sizeof(g));
|
|
-
|
|
#if defined(__linux__)
|
|
- struct hd_geometry hg;
|
|
-#endif
|
|
-#if defined(__FreeBSD__)
|
|
- struct disklabel dl;
|
|
-#endif
|
|
-
|
|
- struct stat st;
|
|
- int ret;
|
|
- uint64_t lba;
|
|
- ret = stat(d->d_dev, &st);
|
|
- if (ret == 0)
|
|
- {
|
|
- if (S_ISREG(st.st_mode))
|
|
- {
|
|
- nsects = st.st_size / 512;
|
|
- if (nsects == 0)
|
|
- pr(FATAL, EM_FATALERROR, "Not a block device image file");
|
|
- lba = nsects - 1;
|
|
- g.d_h = (lba / 63) % 255;
|
|
- g.d_s = lba % 63 + 1;
|
|
- g.d_c = lba / (255 * 63);
|
|
- g.d_nsecs = nsects;
|
|
- return (&g);
|
|
- }
|
|
+static void os_disk_geometry(disk_desc *d, struct disk_geom *g)
|
|
+{
|
|
+ struct hd_geometry hg;
|
|
+ uint64_t nsects;
|
|
+
|
|
+ if (ioctl(d->d_fd, HDIO_GETGEO, &hg) == -1)
|
|
+ pr(FATAL, EM_IOCTLFAILED, "HDIO_GETGEO", strerror(errno));
|
|
+ else {
|
|
+ g->d_h = hg.heads;
|
|
+ g->d_s = hg.sectors;
|
|
+ g->d_c = hg.cylinders;
|
|
}
|
|
-
|
|
-#if defined(__linux__)
|
|
- if (ioctl(d->d_fd,HDIO_GETGEO,&hg) == -1)
|
|
- pr(FATAL,EM_IOCTLFAILED,"HDIO_GETGEO",strerror(errno));
|
|
#ifdef BLKGETSIZE
|
|
- if (ioctl(d->d_fd,BLKGETSIZE,&nsects) == -1)
|
|
- pr(FATAL,EM_IOCTLFAILED,"BLKGETSIZE",strerror(errno));
|
|
- g.d_nsecs = nsects;
|
|
- g.d_c = nsects / (hg.heads * hg.sectors);
|
|
-#else
|
|
- g.d_c = hg.cylinders;
|
|
-#endif
|
|
- g.d_h = hg.heads;
|
|
- g.d_s = hg.sectors;
|
|
-
|
|
+ if (ioctl(d->d_fd, BLKGETSIZE, &nsects) == -1)
|
|
+ pr(FATAL, EM_IOCTLFAILED, "BLKGETSIZE", strerror(errno));
|
|
+ else
|
|
+ g->d_c = nsects / (hg.heads * hg.sectors);
|
|
#endif
|
|
-
|
|
-#if defined(__FreeBSD__)
|
|
- struct disklabel loclab;
|
|
- u_int u;
|
|
- off_t o; /* total disk size */
|
|
+}
|
|
+#elif defined(__FreeBSD__)
|
|
+static void os_disk_geometry(disk_desc *d, struct disk_geom *g)
|
|
+{
|
|
+ struct disklabel dl;
|
|
+ struct disklabel loclab;
|
|
+ u_int u;
|
|
+ off_t o; /* total disk size */
|
|
|
|
if (ioctl(d->d_fd, DIOCGFWSECTORS, &u) == 0)
|
|
g.d_s = u;
|
|
@@ -114,8 +81,44 @@ struct disk_geom *disk_geometry(disk_desc *d)
|
|
|
|
g.d_nsecs = o / u;
|
|
g.d_c = g.d_nsecs / g.d_h / g.d_s;
|
|
+}
|
|
+#else
|
|
+#error Only Linux and FreeBSD supported
|
|
#endif
|
|
|
|
+/*
|
|
+ * get disk geometry. The medium is opened for reading,
|
|
+ * descriptor in d_fd.
|
|
+ */
|
|
+
|
|
+struct disk_geom *disk_geometry(disk_desc *d)
|
|
+{
|
|
+ static struct disk_geom g;
|
|
+ uint64_t nsects;
|
|
+
|
|
+ memset(&g, 0, sizeof(g));
|
|
+
|
|
+ struct stat st;
|
|
+ int ret;
|
|
+ uint64_t lba;
|
|
+ ret = stat(d->d_dev, &st);
|
|
+ if (ret == 0) {
|
|
+ // We have something, we'll use it for a first fill of the data
|
|
+ nsects = st.st_size / 512;
|
|
+ if (nsects == 0)
|
|
+ pr(FATAL, EM_FATALERROR, "Not a block device image file");
|
|
+ lba = nsects - 1;
|
|
+ g.d_h = (lba / 63) % 255;
|
|
+ g.d_s = lba % 63 + 1;
|
|
+ g.d_c = lba / (255 * 63);
|
|
+ g.d_nsecs = nsects;
|
|
+
|
|
+ // If it is a regular file there is no reason to try anything else
|
|
+ if (S_ISREG(st.st_mode))
|
|
+ return (&g);
|
|
+ }
|
|
+
|
|
+ os_disk_geometry(d, &g);
|
|
return (&g);
|
|
}
|
|
|
|
--
|
|
2.24.0
|
|
|