'''
With that, all complaints raised by checkpatch.pl have been suppressed.
Suggested-by: Thomas Huth <thuth@redhat.com>
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
---
util/uri.c | 463 +++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 294 insertions(+), 169 deletions(-)
@@ -211,16 +211,19 @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
{
const char *cur;
- if (str == NULL)
+ if (str == NULL) {
return -1;
+ }
cur = *str;
- if (!ISA_ALPHA(cur))
+ if (!ISA_ALPHA(cur)) {
return 2;
+ }
cur++;
while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
- (*cur == '.'))
+ (*cur == '.')) {
cur++;
+ }
if (uri != NULL) {
g_free(uri->scheme);
uri->scheme = g_strndup(*str, cur - *str);
@@ -248,21 +251,24 @@ static int rfc3986_parse_fragment(URI *uri, const char **str)
{
const char *cur;
- if (str == NULL)
+ if (str == NULL) {
return -1;
+ }
cur = *str;
while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||
(*cur == '[') || (*cur == ']') ||
- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur))))
+ ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {
NEXT(cur);
+ }
if (uri != NULL) {
g_free(uri->fragment);
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->fragment = g_strndup(*str, cur - *str);
- else
+ } else {
uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
+ }
}
*str = cur;
return 0;
@@ -283,14 +289,16 @@ static int rfc3986_parse_query(URI *uri, const char **str)
{
const char *cur;
- if (str == NULL)
+ if (str == NULL) {
return -1;
+ }
cur = *str;
while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||
- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur))))
+ ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {
NEXT(cur);
+ }
if (uri != NULL) {
g_free(uri->query);
uri->query = g_strndup(*str, cur - *str);
@@ -351,15 +359,17 @@ static int rfc3986_parse_user_info(URI *uri, const char **str)
cur = *str;
while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur) ||
- (*cur == ':'))
+ (*cur == ':')) {
NEXT(cur);
+ }
if (*cur == '@') {
if (uri != NULL) {
g_free(uri->user);
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->user = g_strndup(*str, cur - *str);
- else
+ } else {
uri->user = uri_string_unescape(*str, cur - *str, NULL);
+ }
}
*str = cur;
return 0;
@@ -385,22 +395,24 @@ static int rfc3986_parse_dec_octet(const char **str)
{
const char *cur = *str;
- if (!(ISA_DIGIT(cur)))
+ if (!(ISA_DIGIT(cur))) {
return 1;
- if (!ISA_DIGIT(cur + 1))
+ }
+ if (!ISA_DIGIT(cur + 1)) {
cur++;
- else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2)))
+ } else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2))) {
cur += 2;
- else if ((*cur == '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur + 2)))
+ } else if ((*cur == '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur + 2))) {
cur += 3;
- else if ((*cur == '2') && (*(cur + 1) >= '0') && (*(cur + 1) <= '4') &&
- (ISA_DIGIT(cur + 2)))
+ } else if ((*cur == '2') && (*(cur + 1) >= '0') && (*(cur + 1) <= '4') &&
+ (ISA_DIGIT(cur + 2))) {
cur += 3;
- else if ((*cur == '2') && (*(cur + 1) == '5') && (*(cur + 2) >= '0') &&
- (*(cur + 1) <= '5'))
+ } else if ((*cur == '2') && (*(cur + 1) == '5') && (*(cur + 2) >= '0') &&
+ (*(cur + 1) <= '5')) {
cur += 3;
- else
+ } else {
return 1;
+ }
*str = cur;
return 0;
}
@@ -430,10 +442,12 @@ static int rfc3986_parse_host(URI *uri, const char **str)
*/
if (*cur == '[') {
cur++;
- while ((*cur != ']') && (*cur != 0))
+ while ((*cur != ']') && (*cur != 0)) {
cur++;
- if (*cur != ']')
+ }
+ if (*cur != ']') {
return 1;
+ }
cur++;
goto found;
}
@@ -441,21 +455,28 @@ static int rfc3986_parse_host(URI *uri, const char **str)
* try to parse an IPv4
*/
if (ISA_DIGIT(cur)) {
- if (rfc3986_parse_dec_octet(&cur) != 0)
+ if (rfc3986_parse_dec_octet(&cur) != 0) {
goto not_ipv4;
- if (*cur != '.')
+ }
+ if (*cur != '.') {
goto not_ipv4;
+ }
cur++;
- if (rfc3986_parse_dec_octet(&cur) != 0)
+ if (rfc3986_parse_dec_octet(&cur) != 0) {
goto not_ipv4;
- if (*cur != '.')
+ }
+ if (*cur != '.') {
goto not_ipv4;
- if (rfc3986_parse_dec_octet(&cur) != 0)
+ }
+ if (rfc3986_parse_dec_octet(&cur) != 0) {
goto not_ipv4;
- if (*cur != '.')
+ }
+ if (*cur != '.') {
goto not_ipv4;
- if (rfc3986_parse_dec_octet(&cur) != 0)
+ }
+ if (rfc3986_parse_dec_octet(&cur) != 0) {
goto not_ipv4;
+ }
goto found;
not_ipv4:
cur = *str;
@@ -463,20 +484,23 @@ static int rfc3986_parse_host(URI *uri, const char **str)
/*
* then this should be a hostname which can be empty
*/
- while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur))
+ while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur)) {
NEXT(cur);
+ }
found:
if (uri != NULL) {
g_free(uri->authority);
uri->authority = NULL;
g_free(uri->server);
if (cur != host) {
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->server = g_strndup(host, cur - host);
- else
+ } else {
uri->server = uri_string_unescape(host, cur - host, NULL);
- } else
+ }
+ } else {
uri->server = NULL;
+ }
}
*str = cur;
return 0;
@@ -504,18 +528,21 @@ static int rfc3986_parse_authority(URI *uri, const char **str)
* try to parse a userinfo and check for the trailing @
*/
ret = rfc3986_parse_user_info(uri, &cur);
- if ((ret != 0) || (*cur != '@'))
+ if ((ret != 0) || (*cur != '@')) {
cur = *str;
- else
+ } else {
cur++;
+ }
ret = rfc3986_parse_host(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
if (*cur == ':') {
cur++;
ret = rfc3986_parse_port(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
*str = cur;
return 0;
@@ -543,12 +570,14 @@ static int rfc3986_parse_segment(const char **str, char forbid, int empty)
cur = *str;
if (!ISA_PCHAR(cur)) {
- if (empty)
+ if (empty) {
return 0;
+ }
return 1;
}
- while (ISA_PCHAR(cur) && (*cur != forbid))
+ while (ISA_PCHAR(cur) && (*cur != forbid)) {
NEXT(cur);
+ }
*str = cur;
return 0;
}
@@ -575,16 +604,18 @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
while (*cur == '/') {
cur++;
ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (uri != NULL) {
g_free(uri->path);
if (*str != cur) {
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->path = g_strndup(*str, cur - *str);
- else
+ } else {
uri->path = uri_string_unescape(*str, cur - *str, NULL);
+ }
} else {
uri->path = NULL;
}
@@ -612,25 +643,28 @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
cur = *str;
- if (*cur != '/')
+ if (*cur != '/') {
return 1;
+ }
cur++;
ret = rfc3986_parse_segment(&cur, 0, 0);
if (ret == 0) {
while (*cur == '/') {
cur++;
ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
}
if (uri != NULL) {
g_free(uri->path);
if (cur != *str) {
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->path = g_strndup(*str, cur - *str);
- else
+ } else {
uri->path = uri_string_unescape(*str, cur - *str, NULL);
+ }
} else {
uri->path = NULL;
}
@@ -659,21 +693,24 @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)
cur = *str;
ret = rfc3986_parse_segment(&cur, 0, 0);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
while (*cur == '/') {
cur++;
ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (uri != NULL) {
g_free(uri->path);
if (cur != *str) {
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->path = g_strndup(*str, cur - *str);
- else
+ } else {
uri->path = uri_string_unescape(*str, cur - *str, NULL);
+ }
} else {
uri->path = NULL;
}
@@ -702,21 +739,24 @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
cur = *str;
ret = rfc3986_parse_segment(&cur, ':', 0);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
while (*cur == '/') {
cur++;
ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (uri != NULL) {
g_free(uri->path);
if (cur != *str) {
- if (uri->cleanup & 2)
+ if (uri->cleanup & 2) {
uri->path = g_strndup(*str, cur - *str);
- else
+ } else {
uri->path = uri_string_unescape(*str, cur - *str, NULL);
+ }
} else {
uri->path = NULL;
}
@@ -750,21 +790,25 @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)
if ((*cur == '/') && (*(cur + 1) == '/')) {
cur += 2;
ret = rfc3986_parse_authority(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
ret = rfc3986_parse_path_ab_empty(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
*str = cur;
return 0;
} else if (*cur == '/') {
ret = rfc3986_parse_path_absolute(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
} else if (ISA_PCHAR(cur)) {
ret = rfc3986_parse_path_rootless(uri, &cur);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
} else {
/* path-empty is effectively empty */
if (uri != NULL) {
@@ -799,19 +843,23 @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)
if ((*str == '/') && (*(str + 1) == '/')) {
str += 2;
ret = rfc3986_parse_authority(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
ret = rfc3986_parse_path_ab_empty(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
} else if (*str == '/') {
ret = rfc3986_parse_path_absolute(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
} else if (ISA_PCHAR(str)) {
ret = rfc3986_parse_path_no_scheme(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
} else {
/* path-empty is effectively empty */
if (uri != NULL) {
@@ -823,14 +871,16 @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)
if (*str == '?') {
str++;
ret = rfc3986_parse_query(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (*str == '#') {
str++;
ret = rfc3986_parse_fragment(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (*str != 0) {
uri_clean(uri);
@@ -856,26 +906,30 @@ static int rfc3986_parse(URI *uri, const char *str)
int ret;
ret = rfc3986_parse_scheme(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
if (*str != ':') {
return 1;
}
str++;
ret = rfc3986_parse_hier_part(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
if (*str == '?') {
str++;
ret = rfc3986_parse_query(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (*str == '#') {
str++;
ret = rfc3986_parse_fragment(uri, &str);
- if (ret != 0)
+ if (ret != 0) {
return ret;
+ }
}
if (*str != 0) {
uri_clean(uri);
@@ -900,8 +954,9 @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)
{
int ret;
- if (str == NULL)
+ if (str == NULL) {
return -1;
+ }
uri_clean(uri);
/*
@@ -935,8 +990,9 @@ URI *uri_parse(const char *str)
URI *uri;
int ret;
- if (str == NULL)
+ if (str == NULL) {
return NULL;
+ }
uri = uri_new();
ret = rfc3986_parse_uri_reference(uri, str);
if (ret) {
@@ -979,8 +1035,9 @@ URI *uri_parse_raw(const char *str, int raw)
URI *uri;
int ret;
- if (str == NULL)
+ if (str == NULL) {
return NULL;
+ }
uri = uri_new();
if (raw) {
uri->cleanup |= 2;
@@ -1047,8 +1104,9 @@ char *uri_to_string(URI *uri)
int len;
int max;
- if (uri == NULL)
+ if (uri == NULL) {
return NULL;
+ }
max = 80;
ret = g_malloc(max + 1);
@@ -1076,9 +1134,9 @@ char *uri_to_string(URI *uri)
temp = realloc2n(ret, &max);
ret = temp;
}
- if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
+ if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p))) {
ret[len++] = *p++;
- else {
+ } else {
int val = *(unsigned char *)p++;
int hi = val / 0x10, lo = val % 0x10;
ret[len++] = '%';
@@ -1103,9 +1161,9 @@ char *uri_to_string(URI *uri)
}
if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
- ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
+ ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ','))) {
ret[len++] = *p++;
- else {
+ } else {
int val = *(unsigned char *)p++;
int hi = val / 0x10, lo = val % 0x10;
ret[len++] = '%';
@@ -1150,9 +1208,9 @@ char *uri_to_string(URI *uri)
if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
- ((*(p) == '+')))
+ ((*(p) == '+'))) {
ret[len++] = *p++;
- else {
+ } else {
int val = *(unsigned char *)p++;
int hi = val / 0x10, lo = val % 0x10;
ret[len++] = '%';
@@ -1194,9 +1252,9 @@ char *uri_to_string(URI *uri)
if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
- ((*(p) == ',')))
+ ((*(p) == ','))) {
ret[len++] = *p++;
- else {
+ } else {
int val = *(unsigned char *)p++;
int hi = val / 0x10, lo = val % 0x10;
ret[len++] = '%';
@@ -1233,9 +1291,9 @@ char *uri_to_string(URI *uri)
temp = realloc2n(ret, &max);
ret = temp;
}
- if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
+ if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p)))) {
ret[len++] = *p++;
- else {
+ } else {
int val = *(unsigned char *)p++;
int hi = val / 0x10, lo = val % 0x10;
ret[len++] = '%';
@@ -1260,8 +1318,9 @@ char *uri_to_string(URI *uri)
*/
static void uri_clean(URI *uri)
{
- if (uri == NULL)
+ if (uri == NULL) {
return;
+ }
g_free(uri->scheme);
uri->scheme = NULL;
@@ -1314,17 +1373,20 @@ static int normalize_uri_path(char *path)
{
char *cur, *out;
- if (path == NULL)
+ if (path == NULL) {
return -1;
+ }
/* Skip all initial "/" chars. We want to get to the beginning of the
* first non-empty segment.
*/
cur = path;
- while (cur[0] == '/')
+ while (cur[0] == '/') {
++cur;
- if (cur[0] == '\0')
+ }
+ if (cur[0] == '\0') {
return 0;
+ }
/* Keep everything we've seen so far. */
out = cur;
@@ -1340,8 +1402,9 @@ static int normalize_uri_path(char *path)
if ((cur[0] == '.') && (cur[1] == '/')) {
cur += 2;
/* '//' normalization should be done at this point too */
- while (cur[0] == '/')
+ while (cur[0] == '/') {
cur++;
+ }
continue;
}
@@ -1349,18 +1412,21 @@ static int normalize_uri_path(char *path)
* d) If the buffer string ends with "." as a complete path segment,
* that "." is removed.
*/
- if ((cur[0] == '.') && (cur[1] == '\0'))
+ if ((cur[0] == '.') && (cur[1] == '\0')) {
break;
+ }
/* Otherwise keep the segment. */
while (cur[0] != '/') {
- if (cur[0] == '\0')
+ if (cur[0] == '\0') {
goto done_cd;
+ }
(out++)[0] = (cur++)[0];
}
/* nomalize // */
- while ((cur[0] == '/') && (cur[1] == '/'))
+ while ((cur[0] == '/') && (cur[1] == '/')) {
cur++;
+ }
(out++)[0] = (cur++)[0];
}
@@ -1369,10 +1435,12 @@ done_cd:
/* Reset to the beginning of the first segment for the next sequence. */
cur = path;
- while (cur[0] == '/')
+ while (cur[0] == '/') {
++cur;
- if (cur[0] == '\0')
+ }
+ if (cur[0] == '\0') {
return 0;
+ }
/*
* Analyze each segment in sequence for cases (e) and (f).
@@ -1401,14 +1469,16 @@ done_cd:
/* Find the end of the current segment. */
segp = cur;
- while ((segp[0] != '/') && (segp[0] != '\0'))
+ while ((segp[0] != '/') && (segp[0] != '\0')) {
++segp;
+ }
/* If this is the last segment, we're done (we need at least two
* segments to meet the criteria for the (e) and (f) cases).
*/
- if (segp[0] == '\0')
+ if (segp[0] == '\0') {
break;
+ }
/* If the first segment is "..", or if the next segment _isn't_ "..",
* keep this segment and try the next one.
@@ -1437,15 +1507,18 @@ done_cd:
/* string will overlap, do not use strcpy */
tmp = cur;
segp += 3;
- while ((*tmp++ = *segp++) != 0)
- ;
+ while ((*tmp++ = *segp++) != 0) {
+ /* No further work */
+ }
/* If there are no previous segments, then keep going from here. */
segp = cur;
- while ((segp > path) && ((--segp)[0] == '/'))
- ;
- if (segp == path)
+ while ((segp > path) && ((--segp)[0] == '/')) {
+ /* No further work */
+ }
+ if (segp == path) {
continue;
+ }
/* "segp" is pointing to the end of a previous segment; find it's
* start. We need to back up to the previous segment and start
@@ -1455,8 +1528,9 @@ done_cd:
* remove the "foo/..".
*/
cur = segp;
- while ((cur > path) && (cur[-1] != '/'))
+ while ((cur > path) && (cur[-1] != '/')) {
--cur;
+ }
}
out[0] = '\0';
@@ -1474,13 +1548,15 @@ done_cd:
if (path[0] == '/') {
cur = path;
while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.') &&
- ((cur[3] == '/') || (cur[3] == '\0')))
+ ((cur[3] == '/') || (cur[3] == '\0'))) {
cur += 3;
+ }
if (cur != path) {
out = path;
- while (cur[0] != '\0')
+ while (cur[0] != '\0') {
(out++)[0] = (cur++)[0];
+ }
out[0] = 0;
}
}
@@ -1491,8 +1567,9 @@ done_cd:
static int is_hex(char c)
{
if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ||
- ((c >= 'A') && (c <= 'F')))
+ ((c >= 'A') && (c <= 'F'))) {
return 1;
+ }
return 0;
}
@@ -1515,35 +1592,41 @@ char *uri_string_unescape(const char *str, int len, char *target)
char *ret, *out;
const char *in;
- if (str == NULL)
+ if (str == NULL) {
return NULL;
- if (len <= 0)
+ }
+ if (len <= 0) {
len = strlen(str);
- if (len < 0)
+ }
+ if (len < 0) {
return NULL;
+ }
if (target == NULL) {
ret = g_malloc(len + 1);
- } else
+ } else {
ret = target;
+ }
in = str;
out = ret;
while (len > 0) {
if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
in++;
- if ((*in >= '0') && (*in <= '9'))
+ if ((*in >= '0') && (*in <= '9')) {
*out = (*in - '0');
- else if ((*in >= 'a') && (*in <= 'f'))
+ } else if ((*in >= 'a') && (*in <= 'f')) {
*out = (*in - 'a') + 10;
- else if ((*in >= 'A') && (*in <= 'F'))
+ } else if ((*in >= 'A') && (*in <= 'F')) {
*out = (*in - 'A') + 10;
+ }
in++;
- if ((*in >= '0') && (*in <= '9'))
+ if ((*in >= '0') && (*in <= '9')) {
*out = *out * 16 + (*in - '0');
- else if ((*in >= 'a') && (*in <= 'f'))
+ } else if ((*in >= 'a') && (*in <= 'f')) {
*out = *out * 16 + (*in - 'a') + 10;
- else if ((*in >= 'A') && (*in <= 'F'))
+ } else if ((*in >= 'A') && (*in <= 'F')) {
*out = *out * 16 + (*in - 'A') + 10;
+ }
in++;
len -= 3;
out++;
@@ -1573,13 +1656,16 @@ char *uri_string_escape(const char *str, const char *list)
const char *in;
int len, out;
- if (str == NULL)
+ if (str == NULL) {
return NULL;
- if (str[0] == 0)
+ }
+ if (str[0] == 0) {
return g_strdup(str);
+ }
len = strlen(str);
- if (!(len > 0))
+ if (!(len > 0)) {
return NULL;
+ }
len += 20;
ret = g_malloc(len);
@@ -1597,15 +1683,17 @@ char *uri_string_escape(const char *str, const char *list)
unsigned char val;
ret[out++] = '%';
val = ch >> 4;
- if (val <= 9)
+ if (val <= 9) {
ret[out++] = '0' + val;
- else
+ } else {
ret[out++] = 'A' + val - 0xA;
+ }
val = ch & 0xF;
- if (val <= 9)
+ if (val <= 9) {
ret[out++] = '0' + val;
- else
+ } else {
ret[out++] = 'A' + val - 0xA;
+ }
in++;
} else {
ret[out++] = *in++;
@@ -1652,17 +1740,19 @@ char *uri_resolve(const char *uri, const char *base)
* as a reference to "." rather than as a synonym for the current
* URI. Should we do that here?
*/
- if (uri == NULL)
+ if (uri == NULL) {
ret = -1;
- else {
+ } else {
if (*uri) {
ref = uri_new();
ret = uri_parse_into(ref, uri);
- } else
+ } else {
ret = 0;
+ }
}
- if (ret != 0)
+ if (ret != 0) {
goto done;
+ }
if ((ref != NULL) && (ref->scheme != NULL)) {
/*
* The URI is absolute don't modify.
@@ -1670,15 +1760,16 @@ char *uri_resolve(const char *uri, const char *base)
val = g_strdup(uri);
goto done;
}
- if (base == NULL)
+ if (base == NULL) {
ret = -1;
- else {
+ } else {
bas = uri_new();
ret = uri_parse_into(bas, base);
}
if (ret != 0) {
- if (ref)
+ if (ref) {
val = uri_to_string(ref);
+ }
goto done;
}
if (ref == NULL) {
@@ -1707,9 +1798,9 @@ char *uri_resolve(const char *uri, const char *base)
if ((ref->scheme == NULL) && (ref->path == NULL) &&
((ref->authority == NULL) && (ref->server == NULL))) {
res->scheme = g_strdup(bas->scheme);
- if (bas->authority != NULL)
+ if (bas->authority != NULL) {
res->authority = g_strdup(bas->authority);
- else if (bas->server != NULL) {
+ } else if (bas->server != NULL) {
res->server = g_strdup(bas->server);
res->user = g_strdup(bas->user);
res->port = bas->port;
@@ -1747,9 +1838,9 @@ char *uri_resolve(const char *uri, const char *base)
* use an authority component.
*/
if ((ref->authority != NULL) || (ref->server != NULL)) {
- if (ref->authority != NULL)
+ if (ref->authority != NULL) {
res->authority = g_strdup(ref->authority);
- else {
+ } else {
res->server = g_strdup(ref->server);
res->user = g_strdup(ref->user);
res->port = ref->port;
@@ -1757,9 +1848,9 @@ char *uri_resolve(const char *uri, const char *base)
res->path = g_strdup(ref->path);
goto step_7;
}
- if (bas->authority != NULL)
+ if (bas->authority != NULL) {
res->authority = g_strdup(bas->authority);
- else if (bas->server != NULL) {
+ } else if (bas->server != NULL) {
res->server = g_strdup(bas->server);
res->user = g_strdup(bas->user);
res->port = bas->port;
@@ -1783,10 +1874,12 @@ char *uri_resolve(const char *uri, const char *base)
* Allocate a buffer large enough for the result string.
*/
len = 2; /* extra / and 0 */
- if (ref->path != NULL)
+ if (ref->path != NULL) {
len += strlen(ref->path);
- if (bas->path != NULL)
+ }
+ if (bas->path != NULL) {
len += strlen(bas->path);
+ }
res->path = g_malloc(len);
res->path[0] = 0;
@@ -1799,10 +1892,12 @@ char *uri_resolve(const char *uri, const char *base)
out = 0;
if (bas->path != NULL) {
while (bas->path[cur] != 0) {
- while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
+ while ((bas->path[cur] != 0) && (bas->path[cur] != '/')) {
cur++;
- if (bas->path[cur] == 0)
+ }
+ if (bas->path[cur] == 0) {
break;
+ }
cur++;
while (out < cur) {
@@ -1822,8 +1917,9 @@ char *uri_resolve(const char *uri, const char *base)
/*
* Ensure the path includes a '/'
*/
- if ((out == 0) && (bas->server != NULL))
+ if ((out == 0) && (bas->server != NULL)) {
res->path[out++] = '/';
+ }
while (ref->path[indx] != 0) {
res->path[out++] = ref->path[indx++];
}
@@ -1845,12 +1941,15 @@ step_7:
val = uri_to_string(res);
done:
- if (ref != NULL)
+ if (ref != NULL) {
uri_free(ref);
- if (bas != NULL)
+ }
+ if (bas != NULL) {
uri_free(bas);
- if (res != NULL)
+ }
+ if (res != NULL) {
uri_free(res);
+ }
return val;
}
@@ -1899,8 +1998,9 @@ char *uri_resolve_relative(const char *uri, const char *base)
char *bptr, *uptr, *vptr;
int remove_path = 0;
- if ((uri == NULL) || (*uri == 0))
+ if ((uri == NULL) || (*uri == 0)) {
return NULL;
+ }
/*
* First parse URI into a standard form
@@ -1909,10 +2009,12 @@ char *uri_resolve_relative(const char *uri, const char *base)
/* If URI not already in "relative" form */
if (uri[0] != '.') {
ret = uri_parse_into(ref, uri);
- if (ret != 0)
+ if (ret != 0) {
goto done; /* Error in URI, return NULL */
- } else
+ }
+ } else {
ref->path = g_strdup(uri);
+ }
/*
* Next parse base into the same standard form
@@ -1924,10 +2026,12 @@ char *uri_resolve_relative(const char *uri, const char *base)
bas = uri_new();
if (base[0] != '.') {
ret = uri_parse_into(bas, base);
- if (ret != 0)
+ if (ret != 0) {
goto done; /* Error in base, return NULL */
- } else
+ }
+ } else {
bas->path = g_strdup(base);
+ }
/*
* If the scheme / server on the URI differs from the base,
@@ -1962,8 +2066,9 @@ char *uri_resolve_relative(const char *uri, const char *base)
if (bas->path == NULL) {
if (ref->path != NULL) {
uptr = ref->path;
- if (*uptr == '/')
+ if (*uptr == '/') {
uptr++;
+ }
/* exception characters from uri_to_string */
val = uri_string_escape(uptr, "/;&=+$,");
}
@@ -1972,8 +2077,9 @@ char *uri_resolve_relative(const char *uri, const char *base)
bptr = bas->path;
if (ref->path == NULL) {
for (ix = 0; bptr[ix] != 0; ix++) {
- if (bptr[ix] == '/')
+ if (bptr[ix] == '/') {
nbslash++;
+ }
}
uptr = NULL;
len = 1; /* this is for a string terminator only */
@@ -1981,14 +2087,17 @@ char *uri_resolve_relative(const char *uri, const char *base)
/*
* Next we compare the two strings and find where they first differ
*/
- if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/'))
+ if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/')) {
pos += 2;
- if ((*bptr == '.') && (bptr[1] == '/'))
+ }
+ if ((*bptr == '.') && (bptr[1] == '/')) {
bptr += 2;
- else if ((*bptr == '/') && (ref->path[pos] != '/'))
+ } else if ((*bptr == '/') && (ref->path[pos] != '/')) {
bptr++;
- while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
+ }
+ while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0)) {
pos++;
+ }
if (bptr[pos] == ref->path[pos]) {
val = g_strdup("");
@@ -2000,13 +2109,16 @@ char *uri_resolve_relative(const char *uri, const char *base)
* beginning of the "unique" suffix of URI
*/
ix = pos;
- if ((ref->path[ix] == '/') && (ix > 0))
+ if ((ref->path[ix] == '/') && (ix > 0)) {
ix--;
- else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
+ } else if ((ref->path[ix] == 0) && (ix > 1)
+ && (ref->path[ix - 1] == '/')) {
ix -= 2;
+ }
for (; ix > 0; ix--) {
- if (ref->path[ix] == '/')
+ if (ref->path[ix] == '/') {
break;
+ }
}
if (ix == 0) {
uptr = ref->path;
@@ -2020,17 +2132,19 @@ char *uri_resolve_relative(const char *uri, const char *base)
*/
if (bptr[pos] != ref->path[pos]) { /* check for trivial URI == base */
for (; bptr[ix] != 0; ix++) {
- if (bptr[ix] == '/')
+ if (bptr[ix] == '/') {
nbslash++;
+ }
}
}
len = strlen(uptr) + 1;
}
if (nbslash == 0) {
- if (uptr != NULL)
+ if (uptr != NULL) {
/* exception characters from uri_to_string */
val = uri_string_escape(uptr, "/;&=+$,");
+ }
goto done;
}
@@ -2075,12 +2189,15 @@ done:
/*
* Free the working variables
*/
- if (remove_path != 0)
+ if (remove_path != 0) {
ref->path = NULL;
- if (ref != NULL)
+ }
+ if (ref != NULL) {
uri_free(ref);
- if (bas != NULL)
+ }
+ if (bas != NULL) {
uri_free(bas);
+ }
return val;
}
@@ -2093,8 +2210,9 @@ struct QueryParams *query_params_new(int init_alloc)
{
struct QueryParams *ps;
- if (init_alloc <= 0)
+ if (init_alloc <= 0) {
init_alloc = 1;
+ }
ps = g_new(QueryParams, 1);
ps->n = 0;
@@ -2141,27 +2259,32 @@ struct QueryParams *query_params_parse(const char *query)
const char *end, *eq;
ps = query_params_new(0);
- if (!query || query[0] == '\0')
+ if (!query || query[0] == '\0') {
return ps;
+ }
while (*query) {
char *name = NULL, *value = NULL;
/* Find the next separator, or end of the string. */
end = strchr(query, '&');
- if (!end)
+ if (!end) {
end = strchr(query, ';');
- if (!end)
+ }
+ if (!end) {
end = query + strlen(query);
+ }
/* Find the first '=' character between here and end. */
eq = strchr(query, '=');
- if (eq && eq >= end)
+ if (eq && eq >= end) {
eq = NULL;
+ }
/* Empty section (eg. "&&"). */
- if (end == query)
+ if (end == query) {
goto next;
+ }
/* If there is no '=' character, then we have just "name"
* and consistent with CGI.pm we assume value is "".
@@ -2180,8 +2303,9 @@ struct QueryParams *query_params_parse(const char *query)
/* If the '=' character is at the beginning then we have
* "=value" and consistent with CGI.pm we _ignore_ this.
*/
- else if (query == eq)
+ else if (query == eq) {
goto next;
+ }
/* Otherwise it's "name=value". */
else {
@@ -2196,8 +2320,9 @@ struct QueryParams *query_params_parse(const char *query)
next:
query = end;
- if (*query)
+ if (*query) {
query++; /* skip '&' separator */
+ }
}
return ps;
For this patch, using curly braces to wrap `if` `while` `else` statements, which only hold single statement. For example: ''' if (cond) statement; ''' to ''' if (cond) { statement; } ''' And using tricks that compare the disassemblies before and after code changes, to make sure code logic isn't changed: ''' git checkout master make util/uri.o strip util/uri.o objdump -Drx util/uri.o > /tmp/uri-master.txt git checkout cleanupbranch make util/uri.o strip util/uri.o objdump -Drx util/uri.o > /tmp/uri-cleanup.txt