[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] agree with nick: this legal-chars-in-filename stuff gets us...



Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c 
Log Message:
agree with nick: this legal-chars-in-filename stuff gets us nothing


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- config.c	24 Aug 2004 20:48:22 -0000	1.151
+++ config.c	24 Aug 2004 21:57:12 -0000	1.152
@@ -28,34 +28,12 @@
 /** Largest allowed config line */
 #define CONFIG_LINE_T_MAXLEN 4096
 
-#if 0
-static FILE *config_open(const unsigned char *filename);
-static int config_close(FILE *f);
-#endif
 static struct config_line_t *config_get_commandlines(int argc, char **argv);
 static struct config_line_t *config_get_lines(FILE *f);
 static void config_free_lines(struct config_line_t *front);
 static int config_compare(struct config_line_t *c, const char *key, config_type_t type, void *arg);
 static int config_assign(or_options_t *options, struct config_line_t *list);
 
-#if 0
-/** Open a configuration file for reading */
-static FILE *config_open(const unsigned char *filename) {
-  tor_assert(filename);
-  if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
-    /* filename has illegal letters */
-    return NULL;
-  }
-  return fopen(filename, "r");
-}
-
-/** Close the configuration file */
-static int config_close(FILE *f) {
-  tor_assert(f);
-  return fclose(f);
-}
-#endif
-
 /** Helper: Read a list of configuration options from the command line. */
 static struct config_line_t *config_get_commandlines(int argc, char **argv) {
   struct config_line_t *new;