[Pkg-e-commits] [SCM] Core abstraction layer for enlightenment DR 0.17 branch, upstream-vcs, updated. fbccf3b6cae3945e0db311041de91f346fccbae1

[cedric]

The following commit has been merged in the upstream-vcs branch:
commit 29c8207c714266fd6269c1358c11701b7c6e975c
Author: cedric <cedric>
Date:   Wed May 28 09:02:39 2008 +0000

    Add FTP upload support for Ecore_Con from Massimiliano Calamelli.

diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index d8744ee..0ea0141 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -212,7 +212,8 @@ extern "C" {
    EAPI int               ecore_con_dns_lookup(const char *name,
 					       void (*done_cb)(void *data, struct hostent *hostent),
 					       void *data);
-
+					       
+   EAPI int		  ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, char *filename, char *user, char *pass, char *uploadas);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 24e7d77..b80b666 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -33,7 +33,7 @@
  *   ecore_con_url_url_set(url_con, "ftp://ftp.example.com/pub/myfile");
  *   ecore_con_url_send(url, NULL, 0, NULL);
  *
- * FIXME: Support more CURL features: Authentication, FTP upload, Progress callbacks and more...
+ * FIXME: Support more CURL features: Authentication, Progress callbacks and more...
  */
 #include "Ecore.h"
 #include "ecore_private.h"
@@ -41,6 +41,7 @@
 #include "ecore_con_private.h"
 
 #include <errno.h>
+#include <sys/stat.h>
 
 /**
  * @defgroup Ecore_Con_Url_Group Ecore URL Connection Functions
@@ -492,6 +493,55 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
 #endif
 }
 
+/**
+ * Makes a FTP upload
+ * @return  FIXME: To be documented.
+ * @ingroup Ecore_Con_Url_Group
+ */
+EAPI int 
+ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, char *filename, char *user, char *pass, char *uploadas)
+{
+#ifdef HAVE_CURL
+   char url[4096];
+   char userpwd[4096];
+   FILE *fd;
+   struct stat file_info;	
+	
+   if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
+     {
+	ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_ftp_upload");
+	return 0;
+     }
+     
+   if (url_con->active) return 0;
+   if (!url_con->url) return 0;
+     
+   if (filename)
+     {
+	if (stat(filename, &file_info)) return 0;
+	fd = fopen(filename, "rb");
+	snprintf(url, sizeof(url), "ftp://%s/%s", url_con->url, basename(filename));
+	snprintf(userpwd, sizeof(userpwd), "%s:%s", user, pass);
+	curl_easy_setopt(url_con->curl_easy, CURLOPT_VERBOSE, 1);
+	curl_easy_setopt(url_con->curl_easy, CURLOPT_USERPWD, userpwd);
+	curl_easy_setopt(url_con->curl_easy, CURLOPT_UPLOAD, 1);
+	curl_easy_setopt(url_con->curl_easy, CURLOPT_READDATA, fd);
+	ecore_con_url_url_set(url_con, url);
+
+	return _ecore_con_url_perform(url_con);
+	fclose(fd);
+     }
+#else
+   return 0;
+   url_con = NULL;
+   filename = NULL;
+   user = NULL;
+   pass = NULL;
+   uploadas = NULL;
+#endif   
+}
+
+
 #ifdef HAVE_CURL
 static int
 _ecore_con_url_suspend_fd_handler(void)

-- 
Core abstraction layer for enlightenment DR 0.17