mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-05 20:42:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Flag files loaded by camera_dir

Browse Source 
Add an (int) flag to the context structure to flag config files
loaded by `camera_dir`. We do this to skip writing them out
as separate `camera` lines.
Also fixed the printing of a blank line to the config when
printing out the default disabled `camera` line.
This commit is contained in:
genius3000
2017-08-11 17:33:59 -06:00
parent da556d7ef0
commit 5afafcb09f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
conf.c
View File

@@ -1882,9 +1882,10 @@ void conf_print(struct context **cnt)
*/
if (val) {
fprintf(conffile, "%s\n", config_params[i].param_help);
fprintf(conffile, "%s\n", val);
if (strlen(val) == 0)
if (strlen(val) > 0)
fprintf(conffile, "%s\n", val);
else
fprintf(conffile, "; camera %s/motion/camera1.conf\n", sysconfdir);
free(val);
@@ -2394,6 +2395,10 @@ static const char *print_camera(struct context **cnt, char **str,
retval[0] = 0;
while (cnt[++i]) {
/* Skip config files loaded from conf directory */
if (cnt[i]->from_conf_dir)
continue;
retval = myrealloc(retval, strlen(retval) + strlen(cnt[i]->conf_filename) + 10,
"print_camera");
sprintf(retval + strlen(retval), "camera %s\n", cnt[i]->conf_filename);
@@ -2416,6 +2421,7 @@ static struct context **read_camera_dir(struct context **cnt, const char *str,
DIR *dp;
struct dirent *ep;
size_t name_len;
int i;
char conf_file[PATH_MAX];
@@ -2438,7 +2444,13 @@ static struct context **read_camera_dir(struct context **cnt, const char *str,
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,
"Processing config file %s", conf_file );
cnt = config_camera(cnt, conf_file, 0);
}
/* The last context thread would be ours,
* set it as created from conf directory.
*/
i = 0;
while (cnt[++i]);
cnt[i-1]->from_conf_dir = 1;
}
}
closedir(dp);
}

1
motion.h
View File

@@ -370,6 +370,7 @@ struct context {
FILE *extpipe;
int extpipe_open;
char conf_filename[PATH_MAX];
int from_conf_dir;
int threadnr;
unsigned int daemon;
char pid_file[PATH_MAX];