X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=7399c823a7dbe537e23b2dfeed4e0840092db23d;hp=0a65e32d16dec30f9266c6f149a2eb33d47bdacb;hb=54ef13bf75a7a1e787716ce395ffe847fa74673f;hpb=698191fd2f512f3618e2d60592fcd57cd750b965

diff --git a/src/conf.c b/src/conf.c
index 0a65e32d..7399c823 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,6 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Emphyrio,
+    Copyright (C) 1998 Robert van der Meulen
     Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
                             2000 Guus Sliepen <guus@sliepen.warande.net>
 			    2000 Cris van Pelt <tribbel@arise.dhs.org>
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.21 2000/11/04 22:57:30 guus Exp $
+    $Id: conf.c,v 1.9.4.24 2000/11/29 14:24:40 zarq Exp $
 */
 
 #include "config.h"
@@ -33,13 +33,11 @@
 #include <syslog.h>
 
 #include <xalloc.h>
+#include <utils.h> /* for cp */
 
 #include "conf.h"
 #include "netutl.h" /* for strtoip */
-#include <utils.h> /* for cp */
 
-#include "config.h"
-#include "connlist.h"
 #include "system.h"
 
 config_t *config = NULL;
@@ -131,6 +129,66 @@ cp
     }
 }
 
+/*
+  Read exactly one line and strip the trailing newline if any.  If the
+  file was on EOF, return NULL. Otherwise, return all the data in a
+  dynamically allocated buffer.
+*/
+char *readline(FILE *fp)
+{
+  char *newline = NULL;
+  char *p;
+  char *line; /* The array that contains everything that has been read
+                 so far */
+  char *idx; /* Read into this pointer, which points to an offset
+                within line */
+  size_t size, newsize; /* The size of the current array pointed to by
+                           line */
+  size_t maxlen; /* Maximum number of characters that may be read with
+                    fgets.  This is newsize - oldsize. */
+
+  if(feof(fp))
+    return NULL;
+  
+  size = 100;
+  maxlen = size;
+  line = xmalloc(size);
+  idx = line;
+  for(;;)
+    {
+      errno = 0;
+      p = fgets(idx, maxlen, fp);
+      if(p == NULL)  /* EOF or error */
+	{
+	  if(feof(fp))
+	    break;
+
+	  /* otherwise: error; let the calling function print an error
+             message if applicable */
+	  free(line);
+	  return NULL;
+	}
+
+      newline = strchr(p, '\n');
+      if(newline == NULL)
+	/* We haven't yet read everything to the end of the line */
+	{
+	  newsize = size << 1;
+	  line = xrealloc(line, newsize);
+	  idx = &line[size - 1];
+	  maxlen = newsize - size + 1;
+	  size = newsize;
+	}
+      else
+	{
+	  *newline = '\0'; /* kill newline */
+	  break;  /* yay */
+	}
+    }
+
+  return line;
+}
+
 /*
   Parse a configuration file and put the results in the configuration tree
   starting at *base.
@@ -256,3 +314,69 @@ cp
   *base = NULL;
 cp
 }
+
+#define is_safe_file(p) 1
+
+FILE *ask_and_safe_open(const char* filename, const char* what)
+{
+  FILE *r;
+  char *directory;
+  char *fn;
+  int len;
+
+  /* Check stdin and stdout */
+  if(!isatty(0) || !isatty(1))
+    {
+      /* Argh, they are running us from a script or something.  Write
+         the files to the current directory and let them burn in hell
+         for ever. */
+      fn = xstrdup(filename);
+    }
+  else
+    {
+      /* Ask for a file and/or directory name. */
+      fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
+	      what, filename);
+      fflush(stdout);  /* Don't wait for a newline */
+      if((fn = readline(stdin)) == NULL)
+	{
+	  fprintf(stderr, _("Error while reading stdin: %m\n"));
+	  return NULL;
+	}
+      if(strlen(fn) == 0)
+	/* User just pressed enter. */
+	fn = xstrdup(filename);
+    }
+
+  if((strchr(fn, '/') == NULL) || (fn[0] != '/'))
+    {
+      /* The directory is a relative path or a filename. */
+      char *p;
+      
+      directory = get_current_dir_name();
+      len = strlen(fn) + strlen(directory) + 2; /* 1 for the / */
+      p = xmalloc(len);
+      snprintf(p, len, "%s/%s", directory, fn);
+      free(fn);
+      fn = p;
+    }
+
+  if(!is_safe_file(fn))
+    {
+      fprintf(stderr, _("The file `%s' (or any of the leading directories) has unsafe permissions.\n"
+			"I will not create or overwrite this file.\n"),
+			fn);
+      return NULL;
+    }
+
+  if((r = fopen(fn, "w")) == NULL)
+    {
+      fprintf(stderr, _("Error opening file `%s': %m\n"),
+	      fn);
+    }
+
+  free(fn);
+  free(directory);
+  
+  return r;
+}