Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
f77b11a0
Commit
f77b11a0
authored
Oct 29, 2008
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
parent
f0e35aeb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
7 deletions
+23
-7
lib-src/ChangeLog
lib-src/ChangeLog
+5
-0
lib-src/emacsclient.c
lib-src/emacsclient.c
+11
-6
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/server.el
lisp/server.el
+2
-1
No files found.
lib-src/ChangeLog
View file @
f77b11a0
2008-10-29 Ulrich Mueller <ulm@gentoo.org>
* emacsclient.c (set_local_socket): Use TMPDIR (default /tmp)
instead of hardcoded /tmp.
2008-10-13 Dan Nicolaescu <dann@ics.uci.edu>
* emacsclient.c (longopts, print_help_and_exit): Add -nw.
...
...
lib-src/emacsclient.c
View file @
f77b11a0
...
...
@@ -1128,6 +1128,7 @@ set_local_socket ()
int
default_sock
=
!
socket_name
;
int
saved_errno
=
0
;
char
*
server_name
=
"server"
;
char
*
tmpdir
;
if
(
socket_name
&&
!
index
(
socket_name
,
'/'
)
&&
!
index
(
socket_name
,
'\\'
))
{
/* socket_name is a file name component. */
...
...
@@ -1138,9 +1139,12 @@ set_local_socket ()
if
(
default_sock
)
{
socket_name
=
alloca
(
100
+
strlen
(
server_name
));
sprintf
(
socket_name
,
"/tmp/emacs%d/%s"
,
(
int
)
geteuid
(),
server_name
);
tmpdir
=
egetenv
(
"TMPDIR"
);
if
(
!
tmpdir
)
tmpdir
=
"/tmp"
;
socket_name
=
alloca
(
32
+
strlen
(
tmpdir
)
+
strlen
(
server_name
));
sprintf
(
socket_name
,
"%s/emacs%d/%s"
,
tmpdir
,
(
int
)
geteuid
(),
server_name
);
}
if
(
strlen
(
socket_name
)
<
sizeof
(
server
.
sun_path
))
...
...
@@ -1174,9 +1178,10 @@ set_local_socket ()
if
(
pw
&&
(
pw
->
pw_uid
!=
geteuid
()))
{
/* We're running under su, apparently. */
socket_name
=
alloca
(
100
+
strlen
(
server_name
));
sprintf
(
socket_name
,
"/tmp/emacs%d/%s"
,
(
int
)
pw
->
pw_uid
,
server_name
);
socket_name
=
alloca
(
32
+
strlen
(
tmpdir
)
+
strlen
(
server_name
));
sprintf
(
socket_name
,
"%s/emacs%d/%s"
,
tmpdir
,
(
int
)
pw
->
pw_uid
,
server_name
);
if
(
strlen
(
socket_name
)
<
sizeof
(
server
.
sun_path
))
strcpy
(
server
.
sun_path
,
socket_name
);
...
...
lisp/ChangeLog
View file @
f77b11a0
2008-10-29 Ulrich Mueller <ulm@gentoo.org>
* server.el (server-socket-dir): Use TMPDIR (default /tmp) instead
of hardcoded /tmp.
2008-10-29 Glenn Morris <rgm@gnu.org>
* net/xesam.el (dbus-get-unique-name, dbus-debug): Declare.
...
...
lisp/server.el
View file @
f77b11a0
...
...
@@ -202,7 +202,8 @@ are done with it in the server.")
(
defvar
server-name
"server"
)
(
defvar
server-socket-dir
(
format
"/tmp/emacs%d"
(
user-uid
))
(
defvar
server-socket-dir
(
format
"%s/emacs%d"
(
or
(
getenv
"TMPDIR"
)
"/tmp"
)
(
user-uid
))
"The directory in which to place the server socket."
)
(
defun
server-clients-with
(
property
value
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment