Skip to content

Commit

Permalink
daemon: move daemonize() to libgit.a
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
pclouds authored and gitster committed Feb 10, 2014
1 parent 79fcbf7 commit de0957c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 26 deletions.
1 change: 1 addition & 0 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ extern int set_git_dir_init(const char *git_dir, const char *real_git_dir, int);
extern int init_db(const char *template_dir, unsigned int flags);

extern void sanitize_stdfds(void);
extern int daemonize(void);

#define alloc_nr(x) (((x)+16)*3/2)

Expand Down
30 changes: 4 additions & 26 deletions daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1056,11 +1056,6 @@ static void drop_privileges(struct credentials *cred)
/* nothing */
}

static void daemonize(void)
{
die("--detach not supported on this platform");
}

static struct credentials *prepare_credentials(const char *user_name,
const char *group_name)
{
Expand Down Expand Up @@ -1102,24 +1097,6 @@ static struct credentials *prepare_credentials(const char *user_name,

return &c;
}

static void daemonize(void)
{
switch (fork()) {
case 0:
break;
case -1:
die_errno("fork failed");
default:
exit(0);
}
if (setsid() == -1)
die_errno("setsid failed");
close(0);
close(1);
close(2);
sanitize_stdfds();
}
#endif

static void store_pid(const char *path)
Expand Down Expand Up @@ -1333,9 +1310,10 @@ int main(int argc, char **argv)
if (inetd_mode || serve_mode)
return execute();

if (detach)
daemonize();
else
if (detach) {
if (daemonize())
die("--detach not supported on this platform");
} else
sanitize_stdfds();

if (pid_file)
Expand Down
24 changes: 24 additions & 0 deletions setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -787,3 +787,27 @@ void sanitize_stdfds(void)
if (fd > 2)
close(fd);
}

int daemonize(void)
{
#ifdef NO_POSIX_GOODIES
errno = ENOSYS;
return -1;
#else
switch (fork()) {
case 0:
break;
case -1:
die_errno("fork failed");
default:
exit(0);
}
if (setsid() == -1)
die_errno("setsid failed");
close(0);
close(1);
close(2);
sanitize_stdfds();
return 0;
#endif
}

0 comments on commit de0957c

Please sign in to comment.