Mercurial > gftp.yaz

diff lib/config_file.c @ 555:7f54d0c0edbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-9-17 Brian Masney <masneyb@gftp.org> * lib/misc.c lib/cache.c lib/config_file.c lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c - added gftp_request argument to gftp_build_path() and expand_path(). Renamed expand_path() to gftp_expand_path() * lib/gftp.h - fixed compile error in gftp_need_username macro
author masneyb
date Fri, 17 Sep 2004 23:37:47 +0000
parents 990088b18285
children 0a1d03fa2261
line wrap: on
line diff
--- a/lib/config_file.c	Tue Sep 14 10:24:01 2004 +0000
+++ b/lib/config_file.c	Fri Sep 17 23:37:47 2004 +0000
@@ -169,7 +169,7 @@
   size_t len;
   int line;
 
-  if ((tempstr = expand_path (BOOKMARKS_FILE)) == NULL)
+  if ((tempstr = gftp_expand_path (NULL, BOOKMARKS_FILE)) == NULL)
     {
       printf (_("gFTP Error: Bad bookmarks file name %s\n"), BOOKMARKS_FILE);
       exit (1);
@@ -572,7 +572,7 @@
                            &gftp_config_list[i]);
     }
 
-  if ((tempstr = expand_path (CONFIG_FILE)) == NULL)
+  if ((tempstr = gftp_expand_path (NULL, CONFIG_FILE)) == NULL)
     {
       printf (_("gFTP Error: Bad config file name %s\n"), CONFIG_FILE);
       exit (1);
@@ -580,7 +580,7 @@
 
   if (access (tempstr, F_OK) == -1)
     {
-      temp1str = expand_path (BASE_CONF_DIR);
+      temp1str = gftp_expand_path (NULL, BASE_CONF_DIR);
       if (access (temp1str, F_OK) == -1)
 	{
 	  if (mkdir (temp1str, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
@@ -656,7 +656,7 @@
 	}
     }
 
-  if ((tempstr = expand_path (LOG_FILE)) == NULL)
+  if ((tempstr = gftp_expand_path (NULL, LOG_FILE)) == NULL)
     {
       printf (_("gFTP Error: Bad log file name %s\n"), LOG_FILE);
       exit (1);
@@ -722,7 +722,7 @@
   bmhdr = N_("Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <masneyb@gftp.org>. Warning: Any comments that you add to this file WILL be overwritten");
   pwhdr = N_("Note: The passwords contained inside this file are scrambled. This algorithm is not secure. This is to avoid your password being easily remembered by someone standing over your shoulder while you're editing this file. Prior to this, all passwords were stored in plaintext.");
 
-  if ((tempstr = expand_path (BOOKMARKS_FILE)) == NULL)
+  if ((tempstr = gftp_expand_path (NULL, BOOKMARKS_FILE)) == NULL)
     {
       printf (_("gFTP Error: Bad bookmarks file name %s\n"), CONFIG_FILE);
       exit (1);
@@ -811,7 +811,7 @@
   FILE *conffile;
   int i;
 
-  if ((tempstr = expand_path (CONFIG_FILE)) == NULL)
+  if ((tempstr = gftp_expand_path (NULL, CONFIG_FILE)) == NULL)
     {
       printf (_("gFTP Error: Bad config file name %s\n"), CONFIG_FILE);
       exit (1);