projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Update the spec file so it can build and install the documentation
[git.git]
/
daemon.c
diff --git
a/daemon.c
b/daemon.c
index
315a74b
..
74a1934
100644
(file)
--- a/
daemon.c
+++ b/
daemon.c
@@
-3,7
+3,7
@@
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <netinet/in.h>
-static const char daemon_usage[] = "git-daemon [--port=n]";
+static const char daemon_usage[] = "git-daemon [--
inetd | --
port=n]";
static int upload(char *dir, int dirlen)
{
static int upload(char *dir, int dirlen)
{
@@
-28,8
+28,16
@@
static int upload(char *dir, int dirlen)
return -1;
}
return -1;
}
-static int execute(
char *line, int len
)
+static int execute(
void
)
{
{
+ static char line[1000];
+ int len;
+
+ len = packet_read_line(0, line, sizeof(line));
+
+ if (len && line[len-1] == '\n')
+ line[--len] = 0;
+
if (!strncmp("git-upload-pack /", line, 17))
return upload(line + 16, len - 16);
if (!strncmp("git-upload-pack /", line, 17))
return upload(line + 16, len - 16);
@@
-39,9
+47,6
@@
static int execute(char *line, int len)
static void handle(int incoming, struct sockaddr_in *addr, int addrlen)
{
static void handle(int incoming, struct sockaddr_in *addr, int addrlen)
{
- static char line[1000];
- int len;
-
if (fork()) {
close(incoming);
return;
if (fork()) {
close(incoming);
return;
@@
-50,12
+55,7
@@
static void handle(int incoming, struct sockaddr_in *addr, int addrlen)
dup2(incoming, 0);
dup2(incoming, 1);
close(incoming);
dup2(incoming, 0);
dup2(incoming, 1);
close(incoming);
- len = packet_read_line(0, line, sizeof(line));
-
- if (len && line[len-1] == '\n')
- line[--len] = 0;
-
- exit(execute(line, len));
+ exit(execute());
}
static int serve(int port)
}
static int serve(int port)
@@
-96,6
+96,7
@@
static int serve(int port)
int main(int argc, char **argv)
{
int port = DEFAULT_GIT_PORT;
int main(int argc, char **argv)
{
int port = DEFAULT_GIT_PORT;
+ int inetd_mode = 0;
int i;
for (i = 1; i < argc; i++) {
int i;
for (i = 1; i < argc; i++) {
@@
-110,8
+111,17
@@
int main(int argc, char **argv)
continue;
}
}
continue;
}
}
+
+ if (!strcmp(arg, "--inetd")) {
+ inetd_mode = 1;
+ continue;
+ }
+
usage(daemon_usage);
}
usage(daemon_usage);
}
+ if (inetd_mode)
+ return execute();
+
return serve(port);
}
return serve(port);
}