| 1 |
patch reported upstream at the mailing list.
|
| 2 |
mail reference is: http://marc.info/?l=git&m=126813299716136&w=2
|
| 3 |
|
| 4 |
--- builtin/upload-archive.c
|
| 5 |
+++ builtin/upload-archive.c
|
| 6 |
@@ -132,8 +132,9 @@
|
| 7 |
packet_flush(1);
|
| 8 |
|
| 9 |
while (1) {
|
| 10 |
- struct pollfd pfd[2];
|
| 11 |
int status;
|
| 12 |
+#ifndef __INTERIX
|
| 13 |
+ struct pollfd pfd[2];
|
| 14 |
|
| 15 |
pfd[0].fd = fd1[0];
|
| 16 |
pfd[0].events = POLLIN;
|
| 17 |
@@ -156,6 +157,8 @@
|
| 18 |
if (process_input(pfd[0].fd, 1))
|
| 19 |
continue;
|
| 20 |
|
| 21 |
+#endif
|
| 22 |
+
|
| 23 |
if (waitpid(writer, &status, 0) < 0)
|
| 24 |
error_clnt("%s", lostchild);
|
| 25 |
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
|
| 26 |
--- daemon.c
|
| 27 |
+++ daemon.c
|
| 28 |
@@ -14,6 +14,8 @@
|
| 29 |
#define NI_MAXSERV 32
|
| 30 |
#endif
|
| 31 |
|
| 32 |
+#ifndef __INTERIX /* not available on interix! */
|
| 33 |
+
|
| 34 |
static int log_syslog;
|
| 35 |
static int verbose;
|
| 36 |
static int reuseaddr;
|
| 37 |
@@ -922,8 +924,13 @@
|
| 38 |
return service_loop(socknum, socklist);
|
| 39 |
}
|
| 40 |
|
| 41 |
+#endif /* __INTERIX */
|
| 42 |
+
|
| 43 |
int main(int argc, char **argv)
|
| 44 |
{
|
| 45 |
+#ifdef __INTERIX
|
| 46 |
+ die("not implemented on interix!");
|
| 47 |
+#else /* !__INTERIX */
|
| 48 |
int listen_port = 0;
|
| 49 |
char *listen_addr = NULL;
|
| 50 |
int inetd_mode = 0;
|
| 51 |
@@ -1121,4 +1128,5 @@
|
| 52 |
store_pid(pid_file);
|
| 53 |
|
| 54 |
return serve(listen_addr, listen_port, pass, gid);
|
| 55 |
+#endif /* __INTERIX */
|
| 56 |
}
|
| 57 |
--- git-compat-util.h
|
| 58 |
+++ git-compat-util.h
|
| 59 |
@@ -93,7 +93,9 @@
|
| 60 |
#include <utime.h>
|
| 61 |
#ifndef __MINGW32__
|
| 62 |
#include <sys/wait.h>
|
| 63 |
+#ifndef __INTERIX
|
| 64 |
#include <sys/poll.h>
|
| 65 |
+#endif
|
| 66 |
#include <sys/socket.h>
|
| 67 |
#include <sys/ioctl.h>
|
| 68 |
#ifndef NO_SYS_SELECT_H
|
| 69 |
@@ -104,7 +106,11 @@
|
| 70 |
#include <arpa/inet.h>
|
| 71 |
#include <netdb.h>
|
| 72 |
#include <pwd.h>
|
| 73 |
+#ifndef __INTERIX
|
| 74 |
#include <inttypes.h>
|
| 75 |
+#else
|
| 76 |
+#include <stdint.h>
|
| 77 |
+#endif
|
| 78 |
#if defined(__CYGWIN__)
|
| 79 |
#undef _XOPEN_SOURCE
|
| 80 |
#include <grp.h>
|
| 81 |
--- upload-pack.c
|
| 82 |
+++ upload-pack.c
|
| 83 |
@@ -150,6 +150,7 @@
|
| 84 |
|
| 85 |
static void create_pack_file(void)
|
| 86 |
{
|
| 87 |
+#ifndef __INTERIX
|
| 88 |
struct async rev_list;
|
| 89 |
struct child_process pack_objects;
|
| 90 |
int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
|
| 91 |
@@ -328,6 +329,9 @@
|
| 92 |
fail:
|
| 93 |
send_client_data(3, abort_msg, sizeof(abort_msg));
|
| 94 |
die("git upload-pack: %s", abort_msg);
|
| 95 |
+#else /* __INTERIX */
|
| 96 |
+ die("git upload-pack: not implemented on interix!");
|
| 97 |
+#endif /* __INTERIX */
|
| 98 |
}
|
| 99 |
|
| 100 |
static int got_sha1(char *hex, unsigned char *sha1)
|
Parent Directory
| 
Revision Log