daemon: move daemonize() to libgit.a

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index c9efe88e9ec40f94401d7a71498396edc523a7cf..521262f8b494a46ff310d79c38cbd839aa080615 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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 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)
 
 
 #define alloc_nr(x) (((x)+16)*3/2)
 

diff --git a/daemon.c b/daemon.c
index 503e03906c5c7f921e4d67a53835f771ea695d0c..eba12556848e975cd6f1a55ae25760823e90cdc8 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1056,11 +1056,6 @@ static void drop_privileges(struct credentials *cred)
        /* nothing */
 }
 
        /* 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)
 {
 static struct credentials *prepare_credentials(const char *user_name,
     const char *group_name)
 {


@@ -1102,24 +1097,6 @@ static struct credentials *prepare_credentials(const char *user_name,
 
        return &c;
 }
 
        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)
 #endif
 
 static void store_pid(const char *path)


@@ -1333,9 +1310,10 @@ int main(int argc, char **argv)
        if (inetd_mode || serve_mode)
                return execute();
 
        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)
                sanitize_stdfds();
 
        if (pid_file)

diff --git a/setup.c b/setup.c
index 6c3f85ff7a7935ed6f05ab5ab376a2d6c5ca2d46..713043ad508dd0083e359547ed477fc9ee5e8406 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -787,3 +787,27 @@ void sanitize_stdfds(void)
        if (fd > 2)
                close(fd);
 }
        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
+}