diff options
| author | Miles Bader <miles@gnu.org> | 2004-12-08 05:02:30 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-12-08 05:02:30 +0000 |
| commit | 000fc2b1fad05ccd9e6cdb5810febb091f4b5738 (patch) | |
| tree | 808f1473847c7c44bc8b28d8edfa086ec25035d1 /src/filelock.c | |
| parent | 5bc63b073c3c75dbfab1f14423f01cc615e26eeb (diff) | |
| parent | ad136a7c3b310fa7240dd2adf62f23b454782bd0 (diff) | |
| download | emacs-000fc2b1fad05ccd9e6cdb5810febb091f4b5738.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/filelock.c b/src/filelock.c index b802d0e2a51..fc214b5a34a 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -377,6 +377,9 @@ lock_file_1 (lfname, force) char *host_name; char *lock_info_str; + /* Call this first because it can GC. */ + boot_time = get_boot_time (); + if (STRINGP (Fuser_login_name (Qnil))) user_name = (char *)SDATA (Fuser_login_name (Qnil)); else @@ -386,9 +389,8 @@ lock_file_1 (lfname, force) else host_name = ""; lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name) - + LOCK_PID_MAX + 5); + + LOCK_PID_MAX + 30); - boot_time = get_boot_time (); if (boot_time) sprintf (lock_info_str, "%s@%s.%lu:%lu", user_name, host_name, (unsigned long) getpid (), (unsigned long) boot_time); |