soccera/rdo
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid unnecessary recursion in ensuredir()

Browse source 
Before we made the ensuredir() function recurse on itself
if we couldn't open /run/rdo, after mkdir()'ing it,
to retry opening the directory.

Now we simplify and add a simple fd = open([...]) directly
after the mkdir(), to avoid the recursion.
If the second open fails, we error out.
This commit is contained in:
sw1tchbl4d3 2021-07-29 17:25:34 +02:00
parent 4ed6a6d75a
commit b2caacbf68
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sessions.h
View file

@ -47,10 +47,7 @@ int getpstartts(int pid, unsigned long long* startts) {
return 0; return 0;
} }
int ensuredir(int recur) { int ensuredir() {
if (recur >= 2)
errx(1, "Too many recursions in ensuredir()");
struct stat st; struct stat st;
int fd = open("/run/rdo", O_RDONLY, O_DIRECTORY | O_NOFOLLOW); int fd = open("/run/rdo", O_RDONLY, O_DIRECTORY | O_NOFOLLOW);
@ -58,7 +55,10 @@ int ensuredir(int recur) {
if (errno == ENOENT) { if (errno == ENOENT) {
if (mkdir("/run/rdo", 0700) < 0) if (mkdir("/run/rdo", 0700) < 0)
err(1, "Could not create /run/rdo"); err(1, "Could not create /run/rdo");
return ensuredir(++recur);
fd = open("/run/rdo", O_RDONLY, O_DIRECTORY | O_NOFOLLOW);
if (fd < 0)
err(1, "Could not open /run/rdo");
} }
else else
err(1, "Could not open /run/rdo"); err(1, "Could not open /run/rdo");
@ -84,7 +84,7 @@ void setsession(int pid, unsigned int ts_ttl) {
unsigned long long startts; unsigned long long startts;
char path[1024], ts_str[32]; char path[1024], ts_str[32];
if (ensuredir(0) < 0 || getpstartts(pid, &startts) < 0) if (ensuredir() < 0 || getpstartts(pid, &startts) < 0)
return; return;
snprintf(path, sizeof(path), "/run/rdo/%d-%llu", pid, startts); snprintf(path, sizeof(path), "/run/rdo/%d-%llu", pid, startts);
@ -115,7 +115,7 @@ int getsession(int pid, unsigned int ts_ttl) {
unsigned long long startts, current; unsigned long long startts, current;
char path[1024], ts_str[32]; char path[1024], ts_str[32];
if (ensuredir(0) < 0 || getpstartts(pid, &startts) < 0) if (ensuredir() < 0 || getpstartts(pid, &startts) < 0)
return -1; return -1;
snprintf(path, sizeof(path), "/run/rdo/%d-%llu", pid, startts); snprintf(path, sizeof(path), "/run/rdo/%d-%llu", pid, startts);