From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Adam Edge Newsgroups: gmane.emacs.bugs Subject: bug#41707: [PATCH] Try $TMPDIR if $XDG_RUNTIME_DIR has no socket Date: Thu, 4 Jun 2020 16:05:00 +0300 Message-ID: <20200604130500.438983-1-baronedge@airmail.cc> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="71127"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Adam Edge To: 41707@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 04 15:58:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jgqNn-000IOK-2t for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 04 Jun 2020 15:58:11 +0200 Original-Received: from localhost ([::1]:38348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgqNl-0008PL-OC for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 04 Jun 2020 09:58:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgqNe-0008Oy-98 for bug-gnu-emacs@gnu.org; Thu, 04 Jun 2020 09:58:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgqNd-0001cx-Vt for bug-gnu-emacs@gnu.org; Thu, 04 Jun 2020 09:58:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jgqNd-0004Sr-Tz for bug-gnu-emacs@gnu.org; Thu, 04 Jun 2020 09:58:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Adam Edge Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jun 2020 13:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41707 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.159127908017152 (code B ref -1); Thu, 04 Jun 2020 13:58:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Jun 2020 13:58:00 +0000 Original-Received: from localhost ([127.0.0.1]:47116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgqNb-0004SZ-Jj for submit@debbugs.gnu.org; Thu, 04 Jun 2020 09:58:00 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:45064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgpYg-0002hQ-Dw for submit@debbugs.gnu.org; Thu, 04 Jun 2020 09:05:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgpYg-0002Qh-92 for bug-gnu-emacs@gnu.org; Thu, 04 Jun 2020 09:05:22 -0400 Original-Received: from mail.cock.li ([37.120.193.124]:52092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgpYe-0007Rz-Ku for bug-gnu-emacs@gnu.org; Thu, 04 Jun 2020 09:05:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1591275909; bh=FZWhliFldyjoLeIKBWOMFuyERrzL2c6y3ov8cwq9+pA=; h=From:To:Cc:Subject:Date:From; b=EYtMRGWJpY7meaMn9nMekpG7XGUi0xSlLvb9HJgfLV1/9IlCze/ngKVFPKGW4FLD0 AbHq0Zq8bILAEfaoWmkBRFt8LB9k0PNKVXa+tVY013MMx9ZRMaLPt4SVheIdCA1c+0 7SAMLmPaCyo2tKB78lr8syyDhCMv1KnvyAplAPYplD58ACuHL+xHLPZGi7ByQy0fEm OCedKXeDXgF02/AUgpobxyhBhmW9bOfER7r34vtrt/IFGHbLJtEHLoMlVo9qV2wKBo 8YGJJAFOHPpCq4IxwSA1Yi296mVuc/GJYdNMGrZ4F1gPLJ8MhmvIPtd3ocEuYlYLn1 3MYEU0WZ3lKBQ== X-Mailer: git-send-email 2.26.2 Received-SPF: permerror client-ip=37.120.193.124; envelope-from=baronedge@airmail.cc; helo=mail.cock.li X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/04 09:05:09 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_RP_RNBL=1.31, T_SPF_PERMERROR=0.01, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Jun 2020 09:57:58 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:181508 Archived-At: Emacsclient currently checks whether $XDG_RUNTIME_DIR exists in the environment, and if it does, it uses that as a base for the socket directory. However, Emacs seems to still use $TMPDIR when the daemon is started (both via emacs --daemon and M-x start-server). This commit makes Emacsclient first check whether the socket exists in $XDG_RUNTIME_DIR, and if it doesn't, fall back to $TMPDIR. --- lib-src/emacsclient.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 380be95222..926d6cdd45 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1365,6 +1365,19 @@ local_sockname (char *sockname, int socknamesize, int tmpdirlen, return -1; } +/* Check the result the sockname snprintf, and fail () if + it's invalid. */ + +static void +check_sockname_length (const char *name, int len, int size) +{ + if (! (0 <= len && len < size)) + { + message (true, "%s: socket-name %s... too long\n", progname, name); + fail (); + } +} + /* Create a local socket for SERVER_NAME and connect it to Emacs. If SERVER_NAME is a file name component, the local socket name relative to a well-known location in a temporary directory. @@ -1383,6 +1396,7 @@ set_local_socket (char const *server_name) int socknamelen = -1; uid_t uid = geteuid (); bool tmpdir_used = false; + int sock_status = 0; if (strchr (server_name, '/') || (ISSLASH ('\\') && strchr (server_name, '\\'))) @@ -1392,9 +1406,17 @@ set_local_socket (char const *server_name) /* socket_name is a file name component. */ char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR"); if (xdg_runtime_dir) - socknamelen = snprintf (sockname, socknamesize, "%s/emacs/%s", - xdg_runtime_dir, server_name); - else + { + socknamelen = snprintf (sockname, socknamesize, "%s/emacs/%s", + xdg_runtime_dir, server_name); + check_sockname_length (sockname, socknamelen, socknamesize); + /* See if the socket exists, and if it's owned by us. */ + sock_status = socket_status (sockname, uid); + } + + /* If there wasn't a socket in XDG_RUNTIME_DIR, Emacs probably + created a socket in TMPDIR instead. */ + if (sock_status == ENOENT) { char const *tmpdir = egetenv ("TMPDIR"); if (tmpdir) @@ -1415,18 +1437,13 @@ set_local_socket (char const *server_name) } socknamelen = local_sockname (sockname, socknamesize, tmpdirlen, uid, server_name); + check_sockname_length (sockname, socknamelen, socknamesize); + /* See if the socket exists, and if it's owned by us. */ + sock_status = socket_status (sockname, uid); tmpdir_used = true; } } - if (! (0 <= socknamelen && socknamelen < socknamesize)) - { - message (true, "%s: socket-name %s... too long\n", progname, sockname); - fail (); - } - - /* See if the socket exists, and if it's owned by us. */ - int sock_status = socket_status (sockname, uid); if (sock_status) { /* Failing that, see if LOGNAME or USER exist and differ from -- 2.26.2