|
Line
Link Here
|
| 0 |
-- builtin/upload-archive.c |
0 |
++ builtin/upload-archive.c |
|
Lines 132-139
Link Here
|
| 132 |
packet_flush(1); |
132 |
packet_flush(1); |
| 133 |
|
133 |
|
| 134 |
while (1) { |
134 |
while (1) { |
| 135 |
struct pollfd pfd[2]; |
|
|
| 136 |
int status; |
135 |
int status; |
|
|
136 |
#ifndef __INTERIX |
| 137 |
struct pollfd pfd[2]; |
| 137 |
|
138 |
|
| 138 |
pfd[0].fd = fd1[0]; |
139 |
pfd[0].fd = fd1[0]; |
| 139 |
pfd[0].events = POLLIN; |
140 |
pfd[0].events = POLLIN; |
|
Lines 156-161
Link Here
|
| 156 |
if (process_input(pfd[0].fd, 1)) |
157 |
if (process_input(pfd[0].fd, 1)) |
| 157 |
continue; |
158 |
continue; |
| 158 |
|
159 |
|
|
|
160 |
#endif |
| 161 |
|
| 159 |
if (waitpid(writer, &status, 0) < 0) |
162 |
if (waitpid(writer, &status, 0) < 0) |
| 160 |
error_clnt("%s", lostchild); |
163 |
error_clnt("%s", lostchild); |
| 161 |
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) |
164 |
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) |
| 162 |
-- daemon.c |
165 |
++ daemon.c |
|
Lines 14-19
Link Here
|
| 14 |
#define NI_MAXSERV 32 |
14 |
#define NI_MAXSERV 32 |
| 15 |
#endif |
15 |
#endif |
| 16 |
|
16 |
|
|
|
17 |
#ifndef __INTERIX /* not available on interix! */ |
| 18 |
|
| 17 |
static int log_syslog; |
19 |
static int log_syslog; |
| 18 |
static int verbose; |
20 |
static int verbose; |
| 19 |
static int reuseaddr; |
21 |
static int reuseaddr; |
|
Lines 922-929
Link Here
|
| 922 |
return service_loop(socknum, socklist); |
924 |
return service_loop(socknum, socklist); |
| 923 |
} |
925 |
} |
| 924 |
|
926 |
|
|
|
927 |
#endif /* __INTERIX */ |
| 928 |
|
| 925 |
int main(int argc, char **argv) |
929 |
int main(int argc, char **argv) |
| 926 |
{ |
930 |
{ |
|
|
931 |
#ifdef __INTERIX |
| 932 |
die("not implemented on interix!"); |
| 933 |
#else /* !__INTERIX */ |
| 927 |
int listen_port = 0; |
934 |
int listen_port = 0; |
| 928 |
char *listen_addr = NULL; |
935 |
char *listen_addr = NULL; |
| 929 |
int inetd_mode = 0; |
936 |
int inetd_mode = 0; |
|
Lines 1121-1124
Link Here
|
| 1121 |
store_pid(pid_file); |
1128 |
store_pid(pid_file); |
| 1122 |
|
1129 |
|
| 1123 |
return serve(listen_addr, listen_port, pass, gid); |
1130 |
return serve(listen_addr, listen_port, pass, gid); |
|
|
1131 |
#endif /* __INTERIX */ |
| 1124 |
} |
1132 |
} |
| 1125 |
-- git-compat-util.h |
1133 |
++ git-compat-util.h |
|
Lines 93-99
Link Here
|
| 93 |
#include <utime.h> |
93 |
#include <utime.h> |
| 94 |
#ifndef __MINGW32__ |
94 |
#ifndef __MINGW32__ |
| 95 |
#include <sys/wait.h> |
95 |
#include <sys/wait.h> |
|
|
96 |
#ifndef __INTERIX |
| 96 |
#include <sys/poll.h> |
97 |
#include <sys/poll.h> |
|
|
98 |
#endif |
| 97 |
#include <sys/socket.h> |
99 |
#include <sys/socket.h> |
| 98 |
#include <sys/ioctl.h> |
100 |
#include <sys/ioctl.h> |
| 99 |
#ifndef NO_SYS_SELECT_H |
101 |
#ifndef NO_SYS_SELECT_H |
|
Lines 104-110
Link Here
|
| 104 |
#include <arpa/inet.h> |
106 |
#include <arpa/inet.h> |
| 105 |
#include <netdb.h> |
107 |
#include <netdb.h> |
| 106 |
#include <pwd.h> |
108 |
#include <pwd.h> |
|
|
109 |
#ifndef __INTERIX |
| 107 |
#include <inttypes.h> |
110 |
#include <inttypes.h> |
|
|
111 |
#else |
| 112 |
#include <stdint.h> |
| 113 |
#endif |
| 108 |
#if defined(__CYGWIN__) |
114 |
#if defined(__CYGWIN__) |
| 109 |
#undef _XOPEN_SOURCE |
115 |
#undef _XOPEN_SOURCE |
| 110 |
#include <grp.h> |
116 |
#include <grp.h> |
| 111 |
-- upload-pack.c |
117 |
++ upload-pack.c |
|
Lines 150-155
Link Here
|
| 150 |
|
150 |
|
| 151 |
static void create_pack_file(void) |
151 |
static void create_pack_file(void) |
| 152 |
{ |
152 |
{ |
|
|
153 |
#ifndef __INTERIX |
| 153 |
struct async rev_list; |
154 |
struct async rev_list; |
| 154 |
struct child_process pack_objects; |
155 |
struct child_process pack_objects; |
| 155 |
int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr); |
156 |
int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr); |
|
Lines 328-333
Link Here
|
| 328 |
fail: |
329 |
fail: |
| 329 |
send_client_data(3, abort_msg, sizeof(abort_msg)); |
330 |
send_client_data(3, abort_msg, sizeof(abort_msg)); |
| 330 |
die("git upload-pack: %s", abort_msg); |
331 |
die("git upload-pack: %s", abort_msg); |
|
|
332 |
#else /* __INTERIX */ |
| 333 |
die("git upload-pack: not implemented on interix!"); |
| 334 |
#endif /* __INTERIX */ |
| 331 |
} |
335 |
} |
| 332 |
|
336 |
|
| 333 |
static int got_sha1(char *hex, unsigned char *sha1) |
337 |
static int got_sha1(char *hex, unsigned char *sha1) |
