From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, novalis@novalis.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
kamggg@gmail.com, dturner@twopensource.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v13 21/20] unix-socket.c: add stub implementation when unix sockets are not supported
Date: Sun, 26 Jun 2016 14:09:28 +0200 [thread overview]
Message-ID: <20160626120928.14950-1-pclouds@gmail.com> (raw)
In-Reply-To: <1466914464-10358-19-git-send-email-novalis@novalis.org>
This keeps #ifdef at the callee instead of caller, it's less messier.
The caller in question is in read-cache.c which, unlike other
unix-socket callers so far, is always built regardless of unix socket
support. No extra handling (for ENOSYS) is needed because in this
build, index-helper does not exist, $GIT_DIR/index-helper.sock does
not exist, so no unix socket call is made by read-cache.c in the first
place.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
BTW 20/20 didn't seem to make it to the list (or my mailbox). And you
probably want to update .mailmap with @novalis.org as main address
too.
Makefile | 2 ++
unix-socket.h | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/Makefile b/Makefile
index d1309b8..d8cfc51 100644
--- a/Makefile
+++ b/Makefile
@@ -1337,6 +1337,8 @@ ifndef NO_UNIX_SOCKETS
LIB_OBJS += unix-socket.o
PROGRAM_OBJS += credential-cache.o
PROGRAM_OBJS += credential-cache--daemon.o
+else
+ BASIC_CFLAGS += -DNO_UNIX_SOCKETS
endif
ifdef NO_ICONV
diff --git a/unix-socket.h b/unix-socket.h
index e271aee..f1cba70 100644
--- a/unix-socket.h
+++ b/unix-socket.h
@@ -1,7 +1,25 @@
#ifndef UNIX_SOCKET_H
#define UNIX_SOCKET_H
+#ifndef NO_UNIX_SOCKETS
+
int unix_stream_connect(const char *path);
int unix_stream_listen(const char *path);
+#else
+
+static inline int unix_stream_connect(const char *path)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
+static inline int unix_stream_listen(const char *path)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
+#endif
+
#endif /* UNIX_SOCKET_H */
--
2.8.2.531.gd073806
next prev parent reply other threads:[~2016-06-26 12:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-26 4:14 [PATCH v13 01/20] read-cache.c: fix constness of verify_hdr() David Turner
2016-06-26 4:14 ` [PATCH v13 02/20] read-cache: allow to keep mmap'd memory after reading David Turner
2016-06-26 4:14 ` [PATCH v13 03/20] pkt-line: add gentle version of packet_write David Turner
2016-06-26 4:14 ` [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff David Turner
[not found] ` <CAFUO74nENapwVsM3CUst9AHqy5LcKTFBCnJxGXPk8E952t+X5Q@mail.gmail.com>
2016-06-27 16:53 ` David Turner
2016-06-30 13:06 ` Johannes Schindelin
2016-06-30 15:04 ` Duy Nguyen
2016-07-02 11:20 ` Johannes Schindelin
2016-07-02 12:43 ` Duy Nguyen
2016-06-26 4:14 ` [PATCH v13 05/20] index-helper: add --strict David Turner
2016-06-26 4:14 ` [PATCH v13 06/20] daemonize(): set a flag before exiting the main process David Turner
2016-06-26 4:14 ` [PATCH v13 07/20] index-helper: add --detach David Turner
2016-06-26 4:14 ` [PATCH v13 08/20] index-helper: log warnings David Turner
2016-06-26 4:14 ` [PATCH v13 09/20] read-cache: add watchman 'WAMA' extension David Turner
2016-06-26 4:14 ` [PATCH v13 10/20] watchman: support watchman to reduce index refresh cost David Turner
2016-06-26 4:14 ` [PATCH v13 11/20] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-06-30 17:55 ` Ben Peart
2016-06-30 19:14 ` Duy Nguyen
2016-06-30 23:54 ` Ben Peart
2016-07-03 12:28 ` Duy Nguyen
2016-07-06 16:54 ` Ben Peart
2016-07-08 16:32 ` Duy Nguyen
2016-07-08 16:39 ` Duy Nguyen
2016-06-26 4:14 ` [PATCH v13 12/20] update-index: enable/disable watchman support David Turner
2016-06-26 4:14 ` [PATCH v13 13/20] unpack-trees: preserve index extensions David Turner
2016-06-26 4:14 ` [PATCH v13 14/20] watchman: add a config option to enable the extension David Turner
2016-06-26 4:14 ` [PATCH v13 15/20] index-helper: kill mode David Turner
2016-06-26 4:14 ` [PATCH v13 16/20] index-helper: don't run if already running David Turner
2016-06-26 4:14 ` [PATCH v13 17/20] index-helper: autorun mode David Turner
2016-06-26 4:14 ` [PATCH v13 18/20] index-helper: optionally automatically run David Turner
2016-06-26 4:14 ` [PATCH v13 19/20] trace: measure where the time is spent in the index-heavy operations David Turner
2016-06-26 12:09 ` Nguyễn Thái Ngọc Duy [this message]
2016-06-27 12:14 ` [PATCH v13 21/20] unix-socket.c: add stub implementation when unix sockets are not supported Johannes Schindelin
2016-06-27 16:16 ` Duy Nguyen
2016-06-28 10:06 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160626120928.14950-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kamggg@gmail.com \
--cc=novalis@novalis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).