diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-06-24 02:30:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-24 02:30:06 -0700 |
| commit | d048fcd3a1aec357898036e7fe2d53fd74ede911 (patch) | |
| tree | 7c3e5e71f83505d4cb173c1e2fc393ab28bcb125 /src | |
| parent | c30d9af659ab486dbac5e5b24ae106a20a73a63f (diff) | |
| parent | 72d795454c45a8cd20f0e2d06b40526e600488c0 (diff) | |
| download | android_external_wpa_supplicant_8-d048fcd3a1aec357898036e7fe2d53fd74ede911.tar.gz android_external_wpa_supplicant_8-d048fcd3a1aec357898036e7fe2d53fd74ede911.tar.bz2 android_external_wpa_supplicant_8-d048fcd3a1aec357898036e7fe2d53fd74ede911.zip | |
Merge "Remove newlines from wpa_supplicant config network output" into wlan-service.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/common.c | 11 | ||||
| -rw-r--r-- | src/utils/common.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/utils/common.c b/src/utils/common.c index 3659b7d8..e77b7db5 100644 --- a/src/utils/common.c +++ b/src/utils/common.c @@ -709,6 +709,17 @@ int has_ctrl_char(const u8 *data, size_t len) } +int has_newline(const char *str) +{ + while (*str) { + if (*str == '\n' || *str == '\r') + return 1; + str++; + } + return 0; +} + + size_t merge_byte_arrays(u8 *res, size_t res_len, const u8 *src1, size_t src1_len, const u8 *src2, size_t src2_len) diff --git a/src/utils/common.h b/src/utils/common.h index 667048b6..7dbb24a6 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -504,6 +504,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); char * wpa_config_parse_string(const char *value, size_t *len); int is_hex(const u8 *data, size_t len); int has_ctrl_char(const u8 *data, size_t len); +int has_newline(const char *str); size_t merge_byte_arrays(u8 *res, size_t res_len, const u8 *src1, size_t src1_len, const u8 *src2, size_t src2_len); |