X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Ffilesystem.C;h=b1ace6fd7478d4eeda1fd2a83579ee5e43d430e6;hp=ebc2007da9e145744e7d5b85dc05915ff79763f3;hb=eb9df615719cf3afe2bc08035900e5d3451034e1;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/guicast/filesystem.C b/cinelerra-5.1/guicast/filesystem.C index ebc2007d..b1ace6fd 100644 --- a/cinelerra-5.1/guicast/filesystem.C +++ b/cinelerra-5.1/guicast/filesystem.C @@ -536,7 +536,7 @@ int FileSystem::parse_tildas(char *new_dir) new_user[j] = new_dir[i]; } new_user[j] = 0; - +#if !defined(__TERMUX__) setpwent(); while( (pw = getpwent()) != 0 ) { @@ -550,6 +550,7 @@ int FileSystem::parse_tildas(char *new_dir) } } endpwent(); +#endif return 0; } } @@ -667,18 +668,12 @@ int FileSystem::extract_dir(char *out, const char *in) int FileSystem::extract_name(char *out, const char *in, int test_dir) { - int i; - if(test_dir && is_dir(in)) out[0] = 0; // complete string is directory - else - { - for(i = strlen(in)-1; i > 0 && in[i] != '/'; i--) - { - ; - } - if(in[i] == '/') i++; - strcpy(out, &in[i]); + else { + const char *cp = strrchr(in, '/'); + const char *bp = !cp ? in : cp + 1; + strcpy(out, bp); } return 0; }