Lockfile usage can be disabled via config. file now, too.

This commit is contained in:
William Kendrick 2007-10-23 16:11:12 +00:00
parent baa48f6057
commit 10fc8351a8
5 changed files with 57 additions and 40 deletions

View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - September 25, 2007
June 14, 2002 - October 23, 2007
$Id$
*/
@ -6655,6 +6655,11 @@ static void setup(int argc, char *argv[])
debug("Not using lockfile");
ok_to_use_lockfile = 0;
}
else if (strcmp(argv[i], "--lockfile") == 0)
{
debug("Using lockfile");
ok_to_use_lockfile = 1;
}
else
{
show_usage(stderr, (char *) getfilename(argv[0]));
@ -15761,6 +15766,11 @@ static void parse_options(FILE * fi)
printf("datadir set to: %s\n", datadir);
#endif
}
else if (strcmp(str, "nolockfile=yes") == 0 ||
strcmp(str, "lockfile=no") == 0)
{
ok_to_use_lockfile = 0;
}
}
}
while (!feof(fi));