mirror of
https://github.com/git/git.git
synced 2026-02-18 21:59:08 +00:00
4c96c7aab7
The shell script which is currently used to parse git daemon output does not seem to work reliably. In order to work around such issues, re-implement the same procedure in C and write the daemon pid to a file. This means that we can no longer wait on the daemon process, since it is no longer a direct child of the shell process. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
63 lines
1.1 KiB
C
63 lines
1.1 KiB
C
#include "git-compat-util.h"
|
|
#include "run-command.h"
|
|
#include "exec_cmd.h"
|
|
#include "strbuf.h"
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
static int parse_daemon_output(char *s)
|
|
{
|
|
if (*s++ != '[')
|
|
return 1;
|
|
s = strchr(s, ']');
|
|
if (!s)
|
|
return 1;
|
|
if (strcmp(s, "] Ready to rumble\n"))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
struct strbuf line = STRBUF_INIT;
|
|
FILE *fp;
|
|
struct child_process proc, cat;
|
|
char *cat_argv[] = { "cat", NULL };
|
|
|
|
setup_path();
|
|
|
|
memset(&proc, 0, sizeof(proc));
|
|
argv[0] = "git-daemon";
|
|
proc.argv = (const char **)argv;
|
|
proc.no_stdin = 1;
|
|
proc.err = -1;
|
|
|
|
if (start_command(&proc) < 0)
|
|
return 1;
|
|
|
|
strbuf_getwholeline_fd(&line, proc.err, '\n');
|
|
fputs(line.buf, stderr);
|
|
|
|
memset(&cat, 0, sizeof(cat));
|
|
cat.argv = (const char **)cat_argv;
|
|
cat.in = proc.err;
|
|
cat.out = 2;
|
|
|
|
if (start_command(&cat) < 0)
|
|
return 1;
|
|
|
|
if (parse_daemon_output(line.buf)) {
|
|
kill(proc.pid, SIGTERM);
|
|
finish_command(&proc);
|
|
finish_command(&cat);
|
|
return 1;
|
|
}
|
|
|
|
fp = fopen("git-daemon.pid", "w");
|
|
fprintf(fp, "%"PRIuMAX"\n", (uintmax_t)proc.pid);
|
|
fclose(fp);
|
|
|
|
return 0;
|
|
}
|