chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bfebab7
)
cryptsetup: simplifications
author
Lennart Poettering
<lennart@poettering.net>
Fri, 15 Apr 2011 23:56:16 +0000
(
01:56
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 16 Apr 2011 00:03:35 +0000
(
02:03
+0200)
src/cryptsetup-generator.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup-generator.c
b/src/cryptsetup-generator.c
index b57c0b742ab141f84990edd1ee6f3d1f6d5a6f50..f7c3f23f5e7cda669e6cb48da2b46340fa3eb6a3 100644
(file)
--- a/
src/cryptsetup-generator.c
+++ b/
src/cryptsetup-generator.c
@@
-33,6
+33,11
@@
static bool has_option(const char *haystack, const char *needle) {
const char *f = haystack;
size_t l;
const char *f = haystack;
size_t l;
+ assert(needle);
+
+ if (!haystack)
+ return false;
+
l = strlen(needle);
while ((f = strstr(f, needle))) {
l = strlen(needle);
while ((f = strstr(f, needle))) {
@@
-121,12
+126,12
@@
static int create_disk(
name, u, strempty(password), strempty(options),
name);
name, u, strempty(password), strempty(options),
name);
- if (
options &&
has_option(options, "tmp"))
+ if (has_option(options, "tmp"))
fprintf(f,
"ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
name);
fprintf(f,
"ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
name);
- if (
options &&
has_option(options, "swap"))
+ if (has_option(options, "swap"))
fprintf(f,
"ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
name);
fprintf(f,
"ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
name);
@@
-144,7
+149,7
@@
static int create_disk(
goto fail;
}
goto fail;
}
- if (!
options || !
has_option(options, "noauto")) {
+ if (!has_option(options, "noauto")) {
if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
r = -ENOMEM;
if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
r = -ENOMEM;
@@
-162,7
+167,7
@@
static int create_disk(
free(to);
to = NULL;
free(to);
to = NULL;
- if (!
options || !
has_option(options, "nofail")) {
+ if (!has_option(options, "nofail")) {
if (asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, n) < 0) {
r = -ENOMEM;
if (asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, n) < 0) {
r = -ENOMEM;