gftp.yaz: lib/config_file.c comparison

comparison lib/config_file.c @ 87:6df043359b41

2003-1-11 Brian Masney <masneyb@gftp.org> * autogen.sh - removed --intl and --no-changelog flags to gettextize * aclocal.m4 - updated * configure.in - and intl and po directories to AC_OUTPUT * cvsclean - remove more stuff * lib/bookmark.c (bookmark_parse_url) - use gftp_parse_bookmark function * lib/cache.c - remove gftp_cache_get_url_prefix(). Use request->url_prefix instead * lib/config_file.c - use proper exit codes. Also complain if the default protocol specified in the config file is invalid * lib/gftp.h lib/local.c lib/protocols.c - removed isblock, ischar, issocket and isfifo in struct gftp_file (not used anymore) * lib/gftp.h lib/misc.c - removed file_countlf (not used anymore) * lib/local.c lib/misc.c lib/protocols.c - various small cleanups * lib/misc.c (string_hash_function) - check key[i] instead of key[0] * lib/protocols.c lib/gftp.h - added gftp_parse_bookmark() * lib/rfc2068.c - if we are connected to a FTP url via a proxy, set request->url_prefix to be ftp. Added rfc2068_destroy() to free url_prefix whenever the structure is to be freed

author	masneyb
date	Sat, 11 Jan 2003 15:47:09 +0000
parents	7ef60ce2bdb2
children	5f9ad9facf0e

comparison

equal deleted inserted replaced

-:759c7d019a89
+:6df043359b41
 config_htable = g_hash_table_new (string_hash_function, string_hash_compare);
 if ((tempstr = expand_path (CONFIG_FILE)) == NULL)
 {
 printf (_("gFTP Error: Bad config file name %s\n"), CONFIG_FILE);
-exit (0);
+exit (1);
 }
 if (access (tempstr, F_OK) == -1)
 {
 temp1str = expand_path (BASE_CONF_DIR);
 	{
 	  if (mkdir (temp1str, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
 	    {
 	      printf (_("gFTP Error: Could not make directory %s: %s\n"),
 		      temp1str, g_strerror (errno));
-	      exit (-1);
+	      exit (1);
 	    }
 	}
 g_free (temp1str);
 temp1str = g_strdup_printf ("%s/gftprc", SHARE_DIR);
 if (access (temp1str, F_OK) == -1)
 	{
 	  printf (_("gFTP Error: Cannot find master config file %s\n"),
 		  temp1str);
 	  printf (_("Did you do a make install?\n"));
-	  exit (-1);
+	  exit (1);
 	}
 copyfile (temp1str, tempstr);
 g_free (temp1str);
 }
 if ((conffile = fopen (tempstr, "r")) == NULL)
 {
 printf (_("gFTP Error: Cannot open config file %s: %s\n"), CONFIG_FILE,
 	      g_strerror (errno));
-exit (0);
+exit (1);
 }
 g_free (tempstr);
 for (i = 0; config_file_vars[i].var != NULL; i++)
 {
 {
 default_protocol = g_malloc (4);
 strcpy (default_protocol, "FTP");
 }
+for (i = 0; gftp_protocols[i].name; i++)
+{
+if (strcmp (gftp_protocols[i].name, default_protocol) == 0)
+break;
+}
+if (gftp_protocols[i].name == NULL)
+{
+printf (_("gFTP Error: Default protocol %s is not a valid protocol\n"), default_protocol);
+exit (1);
+}
 if ((tempstr = expand_path (LOG_FILE)) == NULL)
 {
 printf (_("gFTP Error: Bad log file name %s\n"), LOG_FILE);
-exit (0);
+exit (1);
 }
 if ((logfd = fopen (tempstr, "w")) == NULL)
 {
 printf (_("gFTP Warning: Cannot open %s for writing: %s\n"),
 int line;
 if ((tempstr = expand_path (BOOKMARKS_FILE)) == NULL)
 {
 printf (_("gFTP Error: Bad bookmarks file name %s\n"), BOOKMARKS_FILE);
-exit (0);
+exit (1);
 }
 if (access (tempstr, F_OK) == -1)
 {
 temp1str = g_strdup_printf ("%s/bookmarks", SHARE_DIR);
 if ((bmfile = fopen (tempstr, "r")) == NULL)
 {
 printf (_("gFTP Error: Cannot open bookmarks file %s: %s\n"), tempstr,
 	      g_strerror (errno));
-exit (0);
+exit (1);
 }
 g_free (tempstr);
 line = 0;
 newentry = NULL;
 histhdr = N_("This section contains the data that is in the history");
 if ((tempstr = expand_path (CONFIG_FILE)) == NULL)
 {
 printf (_("gFTP Error: Bad config file name %s\n"), CONFIG_FILE);
-exit (0);
+exit (1);
 }
 if ((conffile = fopen (tempstr, "w+")) == NULL)
 {
 printf (_("gFTP Error: Cannot open config file %s: %s\n"), CONFIG_FILE,
 	      g_strerror (errno));
-exit (0);
+exit (1);
 }
 g_free (tempstr);
 write_comment (conffile, _(hdr));
 bmhdr = N_("Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org>. Warning: Any comments that you add to this file WILL be overwritten");
 if ((tempstr = expand_path (BOOKMARKS_FILE)) == NULL)
 {
 printf (_("gFTP Error: Bad bookmarks file name %s\n"), CONFIG_FILE);
-exit (0);
+exit (1);
 }
 if ((bmfile = fopen (tempstr, "w+")) == NULL)
 {
 printf (_("gFTP Error: Cannot open bookmarks file %s: %s\n"),
 	      CONFIG_FILE, g_strerror (errno));
-exit (0);
+exit (1);
 }
 g_free (tempstr);
 write_comment (bmfile, _(bmhdr));

Mercurial > gftp.yaz

comparison lib/config_file.c @ 87:6df043359b41