765e304c4b
```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
```
18 lines
432 B
Diff
18 lines
432 B
Diff
From Rich Felker, over IRC
|
|
|
|
diff --git a/policy.c b/policy.c
|
|
index c0d18a7e..78ad34cd 100644
|
|
--- a/policy.c
|
|
+++ b/policy.c
|
|
@@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk)
|
|
continue;
|
|
if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor))
|
|
continue;
|
|
+ char *result = xstrdup(ent->d_name);
|
|
closedir(by_path);
|
|
- return xstrdup(ent->d_name);
|
|
+ return result;
|
|
}
|
|
closedir(by_path);
|
|
}
|