Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-29 04:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Serve attachments correctly

Browse Source
This commit is contained in:
Stefan Ritt 2014-10-21 13:41:44 +02:00
parent daedbc788c
commit 762b7d6708
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/elogd.c
View File

@ -4683,10 +4683,8 @@ int el_retrieve_attachment(LOGBOOK * lbs, int message_id, int n, char name[MAX_P
break; break;
} }
if (p) { if (p)
strlcpy(name, lbs->el_index[index].subdir, MAX_PATH_LENGTH); strlcpy(name, p, MAX_PATH_LENGTH);
strlcat(name, p, MAX_PATH_LENGTH);
}
return EL_SUCCESS; return EL_SUCCESS;
} }
@ -26620,7 +26618,7 @@ void interprete(char *lbook, char *path)
edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80], edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80],
full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment, full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment,
group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH], group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH],
thumb_name[256], sid[32], error_str[256]; thumb_name[256], sid[32], error_str[256], subdir[256];
LOGBOOK *lbs; LOGBOOK *lbs;
FILE *f; FILE *f;
@ -27188,6 +27186,8 @@ void interprete(char *lbook, char *path)
pfile[13] = '_'; pfile[13] = '_';
/* file from data directory requested */ /* file from data directory requested */
strlcpy(file_name, lbs->data_dir, sizeof(file_name)); strlcpy(file_name, lbs->data_dir, sizeof(file_name));
generate_subdir_name(pfile, subdir, sizeof(subdir));
strlcat(file_name, subdir, sizeof(file_name));
strlcat(file_name, pfile, sizeof(file_name)); strlcat(file_name, pfile, sizeof(file_name));
} else { } else {
/* file from theme directory requested */ /* file from theme directory requested */