php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

phar: Re-indent code

Browse Source
This commit is contained in:
Niels Dossche
2025-10-19 23:03:59 +02:00
parent 6291f97c14
commit a69b35328d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ext/phar/dirstream.c
View File

@@ -198,25 +198,25 @@ static php_stream *phar_make_dirstream(const char *dir, size_t dirlen, const Has
}
}
const char *save = ZSTR_VAL(str_key);
save += dirlen + 1; /* seek to just past the path separator */
const char *save = ZSTR_VAL(str_key);
save += dirlen + 1; /* seek to just past the path separator */
const char *has_slash = memchr(save, '/', keylen - dirlen - 1);
if (has_slash) {
/* is subdirectory */
save -= dirlen + 1;
entry = safe_emalloc(has_slash - save + dirlen, 1, 1);
memcpy(entry, save + dirlen + 1, has_slash - save - dirlen - 1);
keylen = has_slash - save - dirlen - 1;
entry[keylen] = '\0';
} else {
/* is file */
save -= dirlen + 1;
entry = safe_emalloc(keylen - dirlen, 1, 1);
memcpy(entry, save + dirlen + 1, keylen - dirlen - 1);
entry[keylen - dirlen - 1] = '\0';
keylen = keylen - dirlen - 1;
}
const char *has_slash = memchr(save, '/', keylen - dirlen - 1);
if (has_slash) {
/* is subdirectory */
save -= dirlen + 1;
entry = safe_emalloc(has_slash - save + dirlen, 1, 1);
memcpy(entry, save + dirlen + 1, has_slash - save - dirlen - 1);
keylen = has_slash - save - dirlen - 1;
entry[keylen] = '\0';
} else {
/* is file */
save -= dirlen + 1;
entry = safe_emalloc(keylen - dirlen, 1, 1);
memcpy(entry, save + dirlen + 1, keylen - dirlen - 1);
entry[keylen - dirlen - 1] = '\0';
keylen = keylen - dirlen - 1;
}
}
if (keylen) {