From 9520e61a7fb672b4ad1a65420da7379c8bcb35d1 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 1 Sep 2024 17:14:17 +0200
Subject: [PATCH] lib-sieve: sieve-storage - Rename bin_dir field to bin_path
---
src/lib-sieve/sieve-script.c | 4 ++--
src/lib-sieve/sieve-storage-private.h | 2 +-
src/lib-sieve/sieve-storage.c | 20 +++++++++----------
.../storage/dict/sieve-dict-script.c | 4 ++--
.../storage/file/sieve-file-script.c | 6 +++---
.../storage/ldap/sieve-ldap-script.c | 4 ++--
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 86fdc92f0..3b2ba963c 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -566,9 +566,9 @@ const char *sieve_script_binary_get_prefix(struct sieve_script *script)
{
struct sieve_storage *storage = script->storage;
- if (storage->bin_dir != NULL &&
+ if (storage->bin_path != NULL &&
sieve_storage_setup_bindir(storage, 0700) >= 0)
- return t_strconcat(storage->bin_dir, "/", script->name, NULL);
+ return t_strconcat(storage->bin_path, "/", script->name, NULL);
if (script->v.binary_get_prefix == NULL)
return NULL;
diff --git a/src/lib-sieve/sieve-storage-private.h b/src/lib-sieve/sieve-storage-private.h
index 0baaa78a7..e7b48f969 100644
--- a/src/lib-sieve/sieve-storage-private.h
+++ b/src/lib-sieve/sieve-storage-private.h
@@ -105,7 +105,7 @@ struct sieve_storage {
const char *data;
const char *location;
const char *script_name;
- const char *bin_dir;
+ const char *bin_path;
const char *default_name;
const char *default_location;
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 8c3588ca9..35b7fd177 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -238,7 +238,7 @@ sieve_storage_data_parse(struct sieve_storage *storage, const char *data,
}
}
- storage->bin_dir = p_strdup(storage->pool, value);
+ storage->bin_path = p_strdup(storage->pool, value);
} else {
array_append(&options, &option, 1);
}
@@ -616,31 +616,31 @@ void sieve_storage_unref(struct sieve_storage **_storage)
int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode)
{
- const char *bin_dir = storage->bin_dir;
+ const char *bin_path = storage->bin_path;
struct stat st;
- if (bin_dir == NULL)
+ if (bin_path == NULL)
return -1;
- if (stat(bin_dir, &st) == 0)
+ if (stat(bin_path, &st) == 0)
return 0;
if (errno == EACCES) {
e_error(storage->event,
"Failed to setup directory for binaries: "
- "%s", eacces_error_get("stat", bin_dir));
+ "%s", eacces_error_get("stat", bin_path));
return -1;
} else if (errno != ENOENT) {
e_error(storage->event,
"Failed to setup directory for binaries: "
"stat(%s) failed: %m",
- bin_dir);
+ bin_path);
return -1;
}
- if (mkdir_parents(bin_dir, mode) == 0) {
+ if (mkdir_parents(bin_path, mode) == 0) {
e_debug(storage->event,
- "Created directory for binaries: %s", bin_dir);
+ "Created directory for binaries: %s", bin_path);
return 1;
}
@@ -654,11 +654,11 @@ int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode)
case EACCES:
e_error(storage->event,
"%s", eacces_error_get_creating("mkdir_parents_chgrp",
- bin_dir));
+ bin_path));
break;
default:
e_error(storage->event,
- "mkdir_parents_chgrp(%s) failed: %m", bin_dir);
+ "mkdir_parents_chgrp(%s) failed: %m", bin_path);
break;
}
diff --git a/src/lib-sieve/storage/dict/sieve-dict-script.c b/src/lib-sieve/storage/dict/sieve-dict-script.c
index 91edf285e..c7e55eef5 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-script.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-script.c
@@ -215,10 +215,10 @@ sieve_dict_script_get_binpath(struct sieve_dict_script *dscript)
struct sieve_storage *storage = script->storage;
if (dscript->binpath == NULL) {
- if (storage->bin_dir == NULL)
+ if (storage->bin_path == NULL)
return NULL;
dscript->binpath = p_strconcat(
- script->pool, storage->bin_dir, "/",
+ script->pool, storage->bin_path, "/",
sieve_binfile_from_name(script->name), NULL);
}
return dscript->binpath;
diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c
index f9868f34e..37342e82b 100644
--- a/src/lib-sieve/storage/file/sieve-file-script.c
+++ b/src/lib-sieve/storage/file/sieve-file-script.c
@@ -393,8 +393,8 @@ sieve_file_script_open(struct sieve_script *script,
if (success) {
const char *bpath, *bfile, *bprefix;
- if (storage->bin_dir != NULL) {
- bpath = storage->bin_dir;
+ if (storage->bin_path != NULL) {
+ bpath = storage->bin_path;
bfile = sieve_binfile_from_name(name);
bprefix = name;
@@ -554,7 +554,7 @@ sieve_file_script_binary_save(struct sieve_script *script,
struct sieve_file_script *fscript =
container_of(script, struct sieve_file_script, script);
- if (storage->bin_dir != NULL &&
+ if (storage->bin_path != NULL &&
sieve_storage_setup_bindir(storage, 0700) < 0)
return -1;
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-script.c b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
index 0a27adc83..585ce04d6 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-script.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
@@ -237,10 +237,10 @@ sieve_ldap_script_get_binpath(struct sieve_ldap_script *lscript)
struct sieve_storage *storage = script->storage;
if (lscript->binpath == NULL) {
- if (storage->bin_dir == NULL)
+ if (storage->bin_path == NULL)
return NULL;
lscript->binpath = p_strconcat(
- script->pool, storage->bin_dir, "/",
+ script->pool, storage->bin_path, "/",
sieve_binfile_from_name(script->name), NULL);
}
return lscript->binpath;
--
GitLab