# HG changeset patch
# User masneyb
# Date 1177634452 0
# Node ID e9f22ad1dec56ae01cb9d7f3f908ac0428fec389
# Parent  afea4eaec5f07d5e672d0946b64e7cc858c68b01
2007-4-26 Brian Masney <masneyb@gftp.org>

        * src/uicommon/gftpui.c (_gftpui_common_trans_file_or_dir) - don't
        attempt to create the directory if it already exists.
        (gftpui_common_add_file_transfer) - don't ask the user what to do with
        an individual directory that needs to be transferred.

        * lib/local.c (local_mkdir) - removed code that checks for the EEXISTS
        error.

diff -r afea4eaec5f0 -r e9f22ad1dec5 ChangeLog
--- a/ChangeLog	Thu Apr 26 23:58:54 2007 +0000
+++ b/ChangeLog	Fri Apr 27 00:40:52 2007 +0000
@@ -1,4 +1,12 @@
 2007-4-26 Brian Masney <masneyb@gftp.org>
+	* src/uicommon/gftpui.c (_gftpui_common_trans_file_or_dir) - don't
+	attempt to create the directory if it already exists.
+	(gftpui_common_add_file_transfer) - don't ask the user what to do with
+	an individual directory that needs to be transferred.
+
+	* lib/local.c (local_mkdir) - removed code that checks for the EEXISTS
+	error.
+
 	* docs/sample.gftp/gftprc - don't automatically transfer the HTM and
 	HTML files in ascii mode. Let the user explicity choose that option.
 	This should help to quiet some bug reports about this.
diff -r afea4eaec5f0 -r e9f22ad1dec5 lib/local.c
--- a/lib/local.c	Thu Apr 26 23:58:54 2007 +0000
+++ b/lib/local.c	Fri Apr 27 00:40:52 2007 +0000
@@ -555,8 +555,6 @@
                                  directory);
       return (0);
     }
-  else if (errno == EEXIST)
-    return (0);
   else
     {
       request->logging_function (gftp_logging_error, request,
diff -r afea4eaec5f0 -r e9f22ad1dec5 src/uicommon/gftpui.c
--- a/src/uicommon/gftpui.c	Thu Apr 26 23:58:54 2007 +0000
+++ b/src/uicommon/gftpui.c	Fri Apr 27 00:40:52 2007 +0000
@@ -1120,7 +1120,7 @@
       for (templist = files; templist != NULL; templist = templist->next)
         { 
           tempfle = templist->data;
-          if (tempfle->startsize > 0)
+          if (tempfle->startsize > 0 && !S_ISDIR (tempfle->st_mode))
             break;
         }
 
@@ -1448,7 +1448,10 @@
   if (S_ISDIR (curfle->st_mode))
     {
       tdata->tot_file_trans = 0;
-      ret = gftp_make_directory (tdata->toreq, curfle->destfile);
+      if (curfle->startsize > 0)
+        ret = 1;
+      else
+        ret = gftp_make_directory (tdata->toreq, curfle->destfile);
     }
   else
     {