comparison src/filelock.c @ 267:966663fcf606 r20-5b32

Import from CVS: tag r20-5b32
author cvs
date Mon, 13 Aug 2007 10:26:29 +0200
parents 3d6bfa290dbd
children c5d627a313b1
comparison
equal deleted inserted replaced
266:18d185df8c54 267:966663fcf606
38 /* FSFmacs uses char *lock_dir and char *superlock_file instead of 38 /* FSFmacs uses char *lock_dir and char *superlock_file instead of
39 the Lisp variables we use. */ 39 the Lisp variables we use. */
40 40
41 /* The name of the directory in which we keep lock files, with a '/' 41 /* The name of the directory in which we keep lock files, with a '/'
42 appended. */ 42 appended. */
43 Lisp_Object Vlock_directory; 43 Lisp_Object Vlock_directory, Vconfigure_lock_directory;
44 44
45 #if 0 /* FSFmacs */ 45 #if 0 /* FSFmacs */
46 /* Look in startup.el */ 46 /* Look in startup.el */
47 /* The name of the file in the lock directory which is used to 47 /* The name of the file in the lock directory which is used to
48 arbitrate access to the entire directory. */ 48 arbitrate access to the entire directory. */
49 #define SUPERLOCK_NAME "!!!SuperLock!!!" 49 #define SUPERLOCK_NAME "!!!SuperLock!!!"
50 #endif 50 #endif
51 51
52 /* The name of the superlock file. This is SUPERLOCK_NAME appended to 52 /* The name of the superlock file. This is SUPERLOCK_NAME appended to
53 Vlock_directory. */ 53 Vlock_directory. */
54 Lisp_Object Vsuperlock_file; 54 Lisp_Object Vsuperlock_file, Vconfigure_superlock_file;
55 55
56 Lisp_Object Qask_user_about_supersession_threat; 56 Lisp_Object Qask_user_about_supersession_threat;
57 Lisp_Object Qask_user_about_lock; 57 Lisp_Object Qask_user_about_lock;
58 58
59 static void lock_superlock (CONST char *lfname); 59 static void lock_superlock (CONST char *lfname);
521 vars_of_filelock (void) 521 vars_of_filelock (void)
522 { 522 {
523 DEFVAR_LISP ("lock-directory", &Vlock_directory /* 523 DEFVAR_LISP ("lock-directory", &Vlock_directory /*
524 Don't change this 524 Don't change this
525 */ ); 525 */ );
526 Vlock_directory = Qnil;
526 DEFVAR_LISP ("superlock-file", &Vsuperlock_file /* 527 DEFVAR_LISP ("superlock-file", &Vsuperlock_file /*
527 Don't change this 528 Don't change this
528 */ ); 529 */ );
530 Vsuperlock_file = Qnil;
529 } 531 }
530 532
531 void 533 void
532 complex_vars_of_filelock (void) 534 complex_vars_of_filelock (void)
533 { 535 {
536 DEFVAR_LISP ("configure-lock-directory", &Vconfigure_lock_directory /*
537 For internal use by the build procedure only.
538 configure's idea of what LOCK-DIRECTORY will be.
539 */ );
534 #ifdef PATH_LOCK 540 #ifdef PATH_LOCK
535 Vlock_directory = 541 Vconfigure_lock_directory =
536 Ffile_name_as_directory (build_string (PATH_LOCK)); 542 Ffile_name_as_directory (build_string (PATH_LOCK));
537 #else 543 #else
538 Vlock_directory = Qnil; 544 Vconfigure_lock_directory = Qnil;
539 #endif 545 #endif
546 DEFVAR_LISP ("configure-superlock-file", &Vconfigure_superlock_file /*
547 For internal use by the build procedure only.
548 configure's idea of what SUPERLOCK-FILE will be.
549 */ );
540 #ifdef PATH_SUPERLOCK 550 #ifdef PATH_SUPERLOCK
541 Vsuperlock_file = 551 Vconfigure_superlock_file = build_string (PATH_SUPERLOCK);
542 Ffile_name_as_directory (build_string (PATH_SUPERLOCK));
543 #else 552 #else
544 Vsuperlock_file = Qnil; 553 Vconfigure_superlock_file = Qnil;
545 #endif 554 #endif
546 /* All the rest done dynamically by startup.el */ 555 /* All the rest done dynamically by startup.el */
547 } 556 }