From: <ke...@us...> - 2008-03-22 09:05:15
|
Revision: 6662 http://bacula.svn.sourceforge.net/bacula/?rev=6662&view=rev Author: kerns Date: 2008-03-22 02:05:20 -0700 (Sat, 22 Mar 2008) Log Message: ----------- Keep Schedule run lists in order as suggested by + Bastian Friedrich. Modified Paths: -------------- trunk/bacula/src/dird/run_conf.c trunk/bacula/technotes-2.3 Modified: trunk/bacula/src/dird/run_conf.c =================================================================== --- trunk/bacula/src/dird/run_conf.c 2008-03-22 09:00:23 UTC (rev 6661) +++ trunk/bacula/src/dird/run_conf.c 2008-03-22 09:05:20 UTC (rev 6662) @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -186,7 +186,6 @@ int token, state, state2 = 0, code = 0, code2 = 0; int options = lc->options; RUN **run = (RUN **)(item->value); - RUN *trun; char *p; RES *res; @@ -623,16 +622,24 @@ } /* Allocate run record, copy new stuff into it, - * and link it into the list of run records + * and append it to the list of run records * in the schedule resource. */ if (pass == 2) { - trun = (RUN *)malloc(sizeof(RUN)); - memcpy(trun, &lrun, sizeof(RUN)); - if (*run) { - trun->next = *run; + RUN *tail; + + /* Create new run record */ + RUN *nrun = (RUN *)malloc(sizeof(RUN)); + memcpy(nrun, &lrun, sizeof(RUN)); + nrun ->next = NULL; + + if (!*run) { /* if empty list */ + *run = nrun; /* add new record */ + } else { + for (tail = *run; tail->next; tail=tail->next) + { } + tail->next = nrun; } - *run = trun; } lc->options = options; /* restore scanner options */ Modified: trunk/bacula/technotes-2.3 =================================================================== --- trunk/bacula/technotes-2.3 2008-03-22 09:00:23 UTC (rev 6661) +++ trunk/bacula/technotes-2.3 2008-03-22 09:05:20 UTC (rev 6662) @@ -22,6 +22,9 @@ General: +22Mar08 +kes Keep Schedule run lists in order as suggested by + Bastian Friedrich. 21Mar08 kes Implement autostart scripts for Debian. ebl Implement upgrade catalog scripts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |