From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.01.org
Subject: [PATCH 2/5] storage: add storage_get_ap_path
Date: Fri, 30 Oct 2020 09:34:10 -0700 [thread overview]
Message-ID: <20201030163413.2446645-2-prestwoj@gmail.com> (raw)
In-Reply-To: <20201030163413.2446645-1-prestwoj@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2042 bytes --]
---
src/storage.c | 30 ++++++++++++++++++++++++++++++
src/storage.h | 1 +
2 files changed, 31 insertions(+)
diff --git a/src/storage.c b/src/storage.c
index 60fb1bc3..e7ac3938 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -50,6 +50,7 @@
static char *storage_path = NULL;
static char *storage_hotspot_path = NULL;
+static char *storage_ap_path = NULL;
static int create_dirs(const char *filename)
{
@@ -221,6 +222,16 @@ bool storage_create_dirs(void)
return false;
}
+ storage_ap_path = l_strdup_printf("%s/ap/", storage_path);
+
+ if (create_dirs(storage_ap_path)) {
+ l_error("Failed to create %s", storage_ap_path);
+
+ l_free(storage_path);
+ l_free(storage_hotspot_path);
+ l_free(storage_ap_path);
+ }
+
return true;
}
@@ -228,6 +239,7 @@ void storage_cleanup_dirs(void)
{
l_free(storage_path);
l_free(storage_hotspot_path);
+ l_free(storage_ap_path);
}
char *storage_get_path(const char *format, ...)
@@ -266,6 +278,24 @@ char *storage_get_hotspot_path(const char *format, ...)
return str;
}
+char *storage_get_ap_path(const char *format, ...)
+{
+ va_list args;
+ char *fmt, *str;
+
+ if (!format)
+ return l_strdup(storage_ap_path);
+
+ fmt = l_strdup_printf("%s/%s", storage_ap_path, format);
+
+ va_start(args, format);
+ str = l_strdup_vprintf(fmt, args);
+ va_end(args);
+
+ l_free(fmt);
+ return str;
+}
+
char *storage_get_network_file_path(enum security type, const char *ssid)
{
char *path;
diff --git a/src/storage.h b/src/storage.h
index d9b17c7f..a6076d63 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -36,6 +36,7 @@ bool storage_create_dirs(void);
void storage_cleanup_dirs(void);
char *storage_get_path(const char *format, ...);
char *storage_get_hotspot_path(const char *format, ...);
+char *storage_get_ap_path(const char *format, ...);
const char *storage_network_filename_from_path(const char *path);
const char *storage_network_ssid_from_path(const char *path,
--
2.26.2
next prev parent reply other threads:[~2020-10-30 16:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 16:34 [PATCH 1/5] storage: add storage_network_filename_from_path James Prestwood
2020-10-30 16:34 ` James Prestwood [this message]
2020-10-30 18:41 ` [PATCH 2/5] storage: add storage_get_ap_path Denis Kenzior
2020-10-30 18:48 ` James Prestwood
2020-10-30 16:34 ` [PATCH 3/5] ap: add provisioning file parsing James Prestwood
2020-10-30 16:34 ` [PATCH 4/5] ap: add StartWithConfig DBus method James Prestwood
2020-10-30 18:37 ` Denis Kenzior
2020-10-30 18:42 ` James Prestwood
2020-10-30 16:34 ` [PATCH 5/5] ap: allow DHCP settings in provisioning files James Prestwood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201030163413.2446645-2-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox