ccppi/systemd-gotify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix config parsing bug, where lines got overjumped

Browse Source
This commit is contained in:
Jonathan Santis 2024-09-19 08:46:57 +02:00
parent 363e4fb05d
commit 272a1eaba9
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config
View File

@ -1,8 +1,11 @@
[APP]
Intervall = 5
[Host] [Host]
Hostname = https://5ccppi.org:4433 Hostname = https://5ccppi.org:4433
[Services] [Services]
/org/freedesktop/systemd1/unit/NetworkManager_2dwait_2donline_2eservice /org/freedesktop/systemd1/unit/NetworkManager_2dwait_2donline_2eservice
/org/freedesktop/systemd1/unit/NetworkManager_2eservice /org/freedesktop/systemd1/unit/NetworkManager_2eservice
/org/freedesktop/systemd1/unit/httpd_2eservice /org/freedesktop/systemd1/unit/httpd_2eservice
[APP]
Intervall = 5
as
df

23
config.c
View File

@ -8,21 +8,24 @@ int loadConfig(char *str_file, char **str_entry,char **host,int *intervall,int s
int i=0; int i=0;
FILE *f_config; FILE *f_config;
char temp_str[256]; char temp_str[256];
char *ret = NULL;
printf("\nopening config file\n"); printf("\nopening config file\n");
f_config = fopen(str_file,"r"); f_config = fopen(str_file,"r");
if(f_config != NULL) if(f_config != NULL)
{ {
while(fgets(temp_str,256,f_config)!=NULL) ret = fgets(temp_str,256,f_config);
while(ret!=NULL)
{ {
temp_str[strcspn(temp_str,"\n")]=0; temp_str[strcspn(temp_str,"\n")]=0;
printf("first temp_str:%s\n",temp_str); printf("first temp_str:%s\n",temp_str);
if(strcmp(temp_str,"[Host]")==0) if(strcmp(temp_str,"[Host]")==0)
{ {
printf("temp_str host:%s\n",temp_str); printf("temp_str host:%s\n",temp_str);
while(fgets(temp_str,256,f_config)!=NULL) while(ret!=NULL)
{ {
printf("temp_str:%s\n",temp_str); printf("temp_str:%s\n",temp_str);
ret = fgets(temp_str,256,f_config);
if(strchr(temp_str,'[')==NULL) if(strchr(temp_str,'[')==NULL)
{ {
printf("strchr\n"); printf("strchr\n");
@ -42,14 +45,16 @@ int loadConfig(char *str_file, char **str_entry,char **host,int *intervall,int s
}else{ }else{
break; break;
} }
} }
} }
else if(strcmp(temp_str,"[Services]")==0) else if(strcmp(temp_str,"[Services]")==0)
{ {
for(i=0;i<size;i++) for(i=0;i<size;i++)
{ {
ret=fgets(temp_str,256,f_config);
printf("for loop:%d\n",i); printf("for loop:%d\n",i);
if(fgets(temp_str,256,f_config)!=NULL) if(ret!=NULL)
{ {
if(strchr(temp_str,'[')==NULL) if(strchr(temp_str,'[')==NULL)
{ {
@ -65,18 +70,21 @@ int loadConfig(char *str_file, char **str_entry,char **host,int *intervall,int s
{ {
break; break;
} }
} }
} }
else if(strcmp(temp_str,"[APP]")==0) else if(strcmp(temp_str,"[APP]")==0)
{ {
while(fgets(temp_str,256,f_config)!=NULL) while(ret!=NULL)
{ {
ret = fgets(temp_str,256,f_config);
printf("temp_str:%s\n",temp_str);
if(strchr(temp_str,'[')==NULL) if(strchr(temp_str,'[')==NULL)
{ {
if(strstr(temp_str,"Intervall")!=NULL) if(strstr(temp_str,"Intervall")!=NULL)
{ {
char *ptr_intervall = strrchr(temp_str,'=')+1;//Without = char *ptr_intervall = strrchr(temp_str,'=')+1;//Without =
ptr_intervall[strcspn(ptr_intervall,"p\n")]=0; ptr_intervall[strcspn(ptr_intervall,"\n")]=0;
while(ptr_intervall[0]==' ') while(ptr_intervall[0]==' ')
{ {
ptr_intervall = ptr_intervall + 1; ptr_intervall = ptr_intervall + 1;
@ -84,12 +92,15 @@ int loadConfig(char *str_file, char **str_entry,char **host,int *intervall,int s
*intervall = atoi(ptr_intervall); *intervall = atoi(ptr_intervall);
printf("intervall:%d\n",*intervall); printf("intervall:%d\n",*intervall);
}else{ }else{
fprintf(stderr,"keyword Intervall not found in config"); fprintf(stderr,"keyword Intervall not found in config\n");
} }
}else{ }else{
break; break;
} }
} }
}else{
ret = fgets(temp_str,256,f_config);
} }
} }
} }