root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly chdir() before lstat()

Browse source
This commit is contained in:
Yorhel 2009-04-25 11:49:20 +02:00
parent 00217dd86e
commit 18211ebe2e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/calc.c
View file

@ -302,15 +302,23 @@ void calc_process() {
struct dir *t; struct dir *t;
/* check root directory */ /* check root directory */
if((tmp = path_real(curpath)) == NULL || lstat(tmp, &fs) != 0 || !S_ISDIR(fs.st_mode)) { if((tmp = path_real(curpath)) == NULL) {
failed = 1; failed = 1;
strcpy(errmsg, "Directory not found"); strcpy(errmsg, "Directory not found");
goto fail; goto calc_fail;
} }
/* we need to chdir so we can provide relative paths for lstat() and opendir(),
* this to prevent creating path names longer than PATH_MAX */
if(path_chdir(tmp) < 0 || chdir("..") < 0) { if(path_chdir(tmp) < 0 || chdir("..") < 0) {
failed = 1; failed = 1;
strcpy(errmsg, "Couldn't chdir into directory"); strcpy(errmsg, "Couldn't chdir into directory");
goto fail; goto calc_fail;
}
/* would be strange for this to fail, but oh well... */
if(lstat(tmp, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
failed = 1;
strcpy(errmsg, "Couldn't stat directory");
goto calc_fail;
} }
/* initialize parent dir */ /* initialize parent dir */
@ -352,7 +360,7 @@ void calc_process() {
/* something went wrong... */ /* something went wrong... */
freedir(root); freedir(root);
fail: calc_fail:
while(failed && !input_handle(0)) while(failed && !input_handle(0))
; ;
pstate = orig ? ST_BROWSE : ST_QUIT; pstate = orig ? ST_BROWSE : ST_QUIT;