emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-uchroot: fix indentation

Browse Source
This commit is contained in:
Juan RP
2020-02-13 08:59:15 +01:00
parent 6ccee8fd5e
commit 28154f488c
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bin/xbps-uchroot/main.c
View File

@@ -145,19 +145,19 @@ walk_dir(const char *path,
while (i--) { while (i--) {
p = list[i]->d_name; p = list[i]->d_name;
if (strcmp(p, ".") == 0 || strcmp(p, "..") == 0) if (strcmp(p, ".") == 0 || strcmp(p, "..") == 0)
continue; continue;
if (strlen(path) + strlen(p) + 1 >= (PATH_MAX - 1)) { if (strlen(path) + strlen(p) + 1 >= (PATH_MAX - 1)) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
rv = -1; rv = -1;
break;
}
strncpy(tmp_path, path, PATH_MAX - 1);
strncat(tmp_path, "/", PATH_MAX - 1 - strlen(tmp_path));
strncat(tmp_path, p, PATH_MAX - 1 - strlen(tmp_path));
if (lstat(tmp_path, &sb) < 0) {
break; break;
} }
if (S_ISDIR(sb.st_mode)) { strncpy(tmp_path, path, PATH_MAX - 1);
strncat(tmp_path, "/", PATH_MAX - 1 - strlen(tmp_path));
strncat(tmp_path, p, PATH_MAX - 1 - strlen(tmp_path));
if (lstat(tmp_path, &sb) < 0) {
break;
}
if (S_ISDIR(sb.st_mode)) {
if (walk_dir(tmp_path, fn) < 0) { if (walk_dir(tmp_path, fn) < 0) {
rv = -1; rv = -1;
break; break;
@@ -167,8 +167,7 @@ walk_dir(const char *path,
if (rv != 0) { if (rv != 0) {
break; break;
} }
}
}
out: out:
free(list); free(list);
return rv; return rv;