Simplify logging, update copyrights and some minor cleanups.

[tinc] / lib / dropin.c

diff --git a/lib/dropin.c b/lib/dropin.c
index 661c455..2dd0910 100644 (file)
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -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.11 2002/07/12 11:45:21 guus Exp $
+    $Id: dropin.c,v 1.1.2.13 2003/07/12 17:41:45 guus Exp $
 */
 
 #include "config.h"
@@ -51,61 +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);
-        }
-    }
-
-  return 0;
+       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:
@@ -116,56 +106,55 @@ int daemon(int nochdir, int noclose)
 */
 char *get_current_dir_name(void)
 {
-  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;
+       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);
+       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);
+       va_start(ap, fmt);
+       status = vsnprintf(*buf, len, fmt, ap);
+       va_end(ap);
 
-  if(status >= 0)
-    *buf = xrealloc(*buf, status);
+       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);
-    }
+       if(status > len - 1) {
+               len = status;
+               va_start(ap, fmt);
+               status = vsnprintf(*buf, len, fmt, ap);
+               va_end(ap);
+       }
 
-  return status;
+       return status;
 }
 #endif