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

Fixed problem with creation of nested logbook directories

Browse Source 
SVN revision: 410
This commit is contained in:
Stefan Ritt 2003-02-24 13:04:50 +00:00
parent f0b5e03bf2
commit 86d633c105
1 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.24 2003/02/24 13:04:50 midas
Fixed problem with creation of nested logbook directories
Revision 1.23 2003/02/24 12:22:00 midas Revision 1.23 2003/02/24 12:22:00 midas
Fixed bug with 'theme =' option in [global] section Fixed bug with 'theme =' option in [global] section
@ -2054,7 +2057,7 @@ struct tm tms;
int el_index_logbooks(BOOL reinit) int el_index_logbooks(BOOL reinit)
{ {
char str[256], data_dir[256], logbook[256]; char str[256], data_dir[256], logbook[256], cwd[256], *p;
int i, j, n, status; int i, j, n, status;
if (reinit) if (reinit)
@ -2136,25 +2139,68 @@ int i, j, n, status;
strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir)); strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir));
/* create data directory if not existing */ /* create data directory if not existing */
getcwd(str, sizeof(str)); getcwd(cwd, sizeof(cwd));
j = chdir(data_dir); j = chdir(data_dir);
if (j < 0) if (j < 0)
{ {
#ifdef OS_WINNT p = data_dir;
j = mkdir(data_dir); if (*p == DIR_SEPARATOR)
#else
j = mkdir(data_dir, 0755);
#endif
if (j == 0)
printf("Created directory \"%s\"\n", data_dir);
else
{ {
perror("el_index_logbooks"); chdir(DIR_SEPARATOR_STR);
printf("Cannot create directory \"%s\"\n", data_dir); p++;
} }
} if (p[1] == ':')
chdir(str); {
strcpy(str, p);
if (str[2] == DIR_SEPARATOR)
str[3] = 0;
else
str[2] = 0;
chdir(str);
p += strlen(str);
}
do
{
if (strchr(p, DIR_SEPARATOR))
{
strlcpy(str, p, sizeof(str));
*strchr(str, DIR_SEPARATOR) = 0;
p = strchr(p, DIR_SEPARATOR)+1;
}
else
{
strlcpy(str, p, sizeof(str));
p = NULL;
}
j = chdir(str);
if (j < 0)
{
#ifdef OS_WINNT
j = mkdir(str);
#else
j = mkdir(str, 0755);
#endif
if (j == 0)
printf("Created directory \"%s\"\n", str);
else
{
perror("el_index_logbooks");
printf("Cannot create directory \"%s\"\n", str);
}
chdir(str);
}
} while (p && *p);
}
chdir(cwd);
strcpy(lb_list[n].data_dir, data_dir); strcpy(lb_list[n].data_dir, data_dir);
lb_list[n].el_index = NULL; lb_list[n].el_index = NULL;