Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-11 Thread Junio C Hamano 
Duy Nguyen pclo...@gmail.com writes:

 On Tue, Feb 11, 2014 at 1:46 AM, Junio C Hamano gits...@pobox.com wrote:
 Nguyễn Thái Ngọc Duy  pclo...@gmail.com writes:

 diff --git a/setup.c b/setup.c
 index 6c3f85f..b09a412 100644
 --- a/setup.c
 +++ b/setup.c
 @@ -787,3 +787,27 @@ void sanitize_stdfds(void)
   if (fd  2)
   close(fd);
  }
 +
 +int daemonize(void)
 +{
 +#ifdef NO_POSIX_GOODIES
 + errno = -ENOSYS;

 Negated?

 Facepalm. I remember I wrote this somewhere but don't remember what
 topic :( Should I resend?

I've already amended it here.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Erik Faye-Lund 
On Sat, Feb 8, 2014 at 8:08 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
 Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
 diff --git a/setup.c b/setup.c
 index 6c3f85f..b09a412 100644
 --- a/setup.c
 +++ b/setup.c
 @@ -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
 +}

Nice change.

Just a nit: When I added the NO_POSIX_GOODIES-flag, Junio wanted the
implementations to be separate.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Junio C Hamano 
Nguyễn Thái Ngọc Duy  pclo...@gmail.com writes:

 diff --git a/setup.c b/setup.c
 index 6c3f85f..b09a412 100644
 --- a/setup.c
 +++ b/setup.c
 @@ -787,3 +787,27 @@ void sanitize_stdfds(void)
   if (fd  2)
   close(fd);
  }
 +
 +int daemonize(void)
 +{
 +#ifdef NO_POSIX_GOODIES
 + errno = -ENOSYS;

Negated?

 + 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
 +}
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Duy Nguyen 
On Tue, Feb 11, 2014 at 1:46 AM, Junio C Hamano gits...@pobox.com wrote:
 Nguyễn Thái Ngọc Duy  pclo...@gmail.com writes:

 diff --git a/setup.c b/setup.c
 index 6c3f85f..b09a412 100644
 --- a/setup.c
 +++ b/setup.c
 @@ -787,3 +787,27 @@ void sanitize_stdfds(void)
   if (fd  2)
   close(fd);
  }
 +
 +int daemonize(void)
 +{
 +#ifdef NO_POSIX_GOODIES
 + errno = -ENOSYS;

 Negated?

Facepalm. I remember I wrote this somewhere but don't remember what
topic :( Should I resend?
-- 
Duy
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-07 Thread Nguyễn Thái Ngọc Duy 
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
 cache.h  |  1 +
 daemon.c | 30 --
 setup.c  | 24 
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/cache.h b/cache.h
index dc040fb..264b6f1 100644
--- 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 daemonize(void);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
diff --git a/daemon.c b/daemon.c
index 503e039..eba1255 100644
--- a/daemon.c
+++ b/daemon.c
@@ -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)
 {
@@ -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)
@@ -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)
diff --git a/setup.c b/setup.c
index 6c3f85f..b09a412 100644
--- a/setup.c
+++ b/setup.c
@@ -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
+}
-- 
1.8.5.2.240.g8478abd

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html