mike/vger
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stat(2) can fail, rearange error handling to handle this

Browse source
This commit is contained in:
Florian Obser 2020-12-04 19:43:29 +01:00
parent 75cf996cec
commit f28f906b6a
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
main.c
View file

@ -100,29 +100,32 @@ display_file(const char *path, const char *lang)
FILE *fd; FILE *fd;
/* this is to check if path is a directory */ /* this is to check if path is a directory */
stat(path, &sb); if (stat(path, &sb) == -1)
goto err;
/* open the file requested */ /* open the file requested */
fd = fopen(path, "r"); if ((fd = fopen(path, "r")) == NULL)
goto err;
if (fd != NULL && S_ISDIR(sb.st_mode) != 1) { /* check if directory */
if (S_ISDIR(sb.st_mode) == 1)
goto err;
get_file_mime(path, file_mime, sizeof(file_mime)); get_file_mime(path, file_mime, sizeof(file_mime));
/* check if directory */ status(20, file_mime, lang);
status(20, file_mime, lang);
/* read the file and write it to stdout */ /* read the file and write it to stdout */
while ((nread = fread(buffer, sizeof(char), buflen, fd)) != 0) while ((nread = fread(buffer, sizeof(char), buflen, fd)) != 0)
fwrite(buffer, sizeof(char), nread, stdout); fwrite(buffer, sizeof(char), nread, stdout);
fclose(fd); fclose(fd);
syslog(LOG_DAEMON, "path served %s", path); syslog(LOG_DAEMON, "path served %s", path);
} else {
/* return an error code and no content */
status(40, "text/gemini", lang);
syslog(LOG_DAEMON, "path invalid %s", path);
}
return;
err:
/* return an error code and no content */
status(40, "text/gemini", lang);
syslog(LOG_DAEMON, "path invalid %s", path);
} }
int int