X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fdropin.c;h=24d25ca50a3049d2c3566062d063f50058e054aa;hp=518a175d56161659125fd2afa5b4c99b8fbb3b87;hb=085d33e6265e139bb08cdfda3d7498993190d187;hpb=d3f889c8076dff9c00ebfe1459cb36425f8da41d

diff --git a/lib/dropin.c b/lib/dropin.c
index 518a175d..24d25ca5 100644
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -1,7 +1,7 @@
 /*
     dropin.c -- a set of drop-in replacements for libc functions
-    Copyright (C) 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2000-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: dropin.c,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $
+    $Id: dropin.c,v 1.1.2.14 2003/07/12 17:48:38 guus Exp $
 */
 
 #include "config.h"
@@ -27,10 +27,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
 
 #include <xalloc.h>
 
 #include <system.h>
+#include <errno.h>
 
 #ifndef HAVE_DAEMON
 /*
@@ -48,59 +51,51 @@
 */
 int daemon(int nochdir, int noclose)
 {
-  pid_t pid;
-  int fd;
-  
-  pid = fork();
-  
-  /* Check if forking failed */
-  if(pid < 0)
-    {
-      perror("fork");
-      exit(-1);
-    }
-
-  /* If we are the parent, terminate */
-  if(pid)
-    exit(0);
-
-  /* Detach by becoming the new process group leader */
-  if(setsid() < 0)
-    {
-      perror("setsid");
-      return -1;
-    }
-  
-  /* Change working directory to the root (to avoid keeping mount
-     points busy) */
-  if(!nochdir)
-    {
-      chdir("/");
-    }
-    
-  /* Redirect stdin/out/err to /dev/null */
-  if(!noclose)
-    {
-      fd = open("/dev/null", O_RDWR);
-
-      if(fd < 0)
-        {
-          perror("opening /dev/null");
-          return -1;
-        }
-      else
-        {
-          dup2(fd, 0);
-          dup2(fd, 1);
-          dup2(fd, 2);
-        }
-    }
+	pid_t pid;
+	int fd;
+
+	pid = fork();
+
+	/* Check if forking failed */
+	if(pid < 0) {
+		perror("fork");
+		exit(-1);
+	}
+
+	/* If we are the parent, terminate */
+	if(pid)
+		exit(0);
+
+	/* Detach by becoming the new process group leader */
+	if(setsid() < 0) {
+		perror("setsid");
+		return -1;
+	}
+
+	/* Change working directory to the root (to avoid keeping mount
+	   points busy) */
+	if(!nochdir) {
+		chdir("/");
+	}
+
+	/* Redirect stdin/out/err to /dev/null */
+	if(!noclose) {
+		fd = open("/dev/null", O_RDWR);
+
+		if(fd < 0) {
+			perror("opening /dev/null");
+			return -1;
+		} else {
+			dup2(fd, 0);
+			dup2(fd, 1);
+			dup2(fd, 2);
+		}
+	}
+
+	return 0;
 }
 #endif
 
-
-
-
 #ifndef HAVE_GET_CURRENT_DIR_NAME
 /*
   Replacement for the GNU get_current_dir_name function:
@@ -111,26 +106,55 @@ int daemon(int nochdir, int noclose)
 */
 char *get_current_dir_name(void)
 {
-  size_t size;
-  char *buf;
-
-  /* Start with 100 bytes.  If this turns out to be insufficient to
-     contain the working directory, double the size.  */
-  size = 100;
-  buf = xmalloc(size);
-
-  errno = 0; /* Success */
-  r = getcwd(buf, size);
-  /* getcwd returns NULL and sets errno to ERANGE if the bufferspace
-     is insufficient to contain the entire working directory.  */
-  while(r == NULL && errno = ERANGE)
-    {
-      free(buf);
-      size <<= 1; /* double the size */
-      buf = xmalloc(size);
-      r = getcwd(buf, size);
-    }
-
-  return buf;
+	size_t size;
+	char *buf;
+	char *r;
+
+	/* Start with 100 bytes.  If this turns out to be insufficient to
+	   contain the working directory, double the size.  */
+	size = 100;
+	buf = xmalloc(size);
+
+	errno = 0;					/* Success */
+	r = getcwd(buf, size);
+
+	/* getcwd returns NULL and sets errno to ERANGE if the bufferspace
+	   is insufficient to contain the entire working directory.  */
+	while(r == NULL && errno == ERANGE) {
+		free(buf);
+		size <<= 1;				/* double the size */
+		buf = xmalloc(size);
+		r = getcwd(buf, size);
+	}
+
+	return buf;
+}
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **buf, const char *fmt, ...)
+{
+	int status;
+	va_list ap;
+	int len;
+
+	len = 4096;
+	*buf = xmalloc(len);
+
+	va_start(ap, fmt);
+	status = vsnprintf(*buf, len, fmt, ap);
+	va_end(ap);
+
+	if(status >= 0)
+		*buf = xrealloc(*buf, status);
+
+	if(status > len - 1) {
+		len = status;
+		va_start(ap, fmt);
+		status = vsnprintf(*buf, len, fmt, ap);
+		va_end(ap);
+	}
+
+	return status;
 }
 #endif