WebSVN – tpanel – Diff – /trunk/ftplib/ftplib.cpp

+/***************************************************************************
+ *                    ftplib.cpp  -  description
+ *                       -------------------
+ b e*gin                : Son Jul 27 2003
+ copyright            : (C) 2013 by magnus kulke
+ email                : mkulke@gmail.com
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 2.1 of the  *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+/***************************************************************************
+ * Note: ftplib, on which ftplibpp was originally based upon used to be    *
+ * licensed as GPL 2.0 software, as of Jan. 26th 2013 its author Thomas    *
+ * Pfau allowed the distribution of ftplib via LGPL. Thus the license of   *
+ * ftplibpp changed aswell.                                                *
+ ***************************************************************************/
 #ifndef NOLFS
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 #endif
+        {
             x = (max >= ctl->cavail) ? ctl->cavail : max - 1;
             end = static_cast<char*>(memccpy(bp, ctl->cget, '\n', x));
             if (end != NULL)
-                x = (int)(end - bp);
+                x = end - bp;
             retval += x;
             bp += x;
             *bp = '\0';
             max -= x;
         else
+        {
             if (ctl->tlsctrl)
                 x = SSL_read(ctl->ssl, ctl->cput, ctl->cleft);
             else
-                x = (int)read(ctl->handle, ctl->cput, ctl->cleft);
+                x = read(ctl->handle, ctl->cput, ctl->cleft);
+        }
 #else
         x = read(ctl->handle, ctl->cput, ctl->cleft);
 #endif
 #ifndef NOSSL
                 if (nData->tlsctrl)
                     w = SSL_write(nData->ssl, nbp, FTPLIB_BUFSIZ);
                 else
-                    w = (int)write(nData->handle, nbp, FTPLIB_BUFSIZ);
+                    w = write(nData->handle, nbp, FTPLIB_BUFSIZ);
 #else
                 w = write(nData->handle, nbp, FTPLIB_BUFSIZ);
 #endif
 #ifndef NOSSL
             if (nData->tlsctrl)
                 w = SSL_write(nData->ssl, nbp, FTPLIB_BUFSIZ);
             else
-                w = (int)write(nData->handle, nbp, FTPLIB_BUFSIZ);
+                w = write(nData->handle, nbp, FTPLIB_BUFSIZ);
 #else
             w = write(nData->handle, nbp, FTPLIB_BUFSIZ);
 #endif
         if (!socket_wait(nData))
             return x;
 #ifndef NOSSL
-        if (nData->tlsctrl)
-            w = SSL_write(nData->ssl, nbp, nb);
+        if (nData->tlsctrl) w = SSL_write(nData->ssl, nbp, nb);
-        else
-            w = (int)write(nData->handle, nbp, nb);
+        else w = write(nData->handle, nbp, nb);
 #else
         w = write(nData->handle, nbp, nb);
 #endif
     snprintf(buf, sizeof(buf), "%s\r\n", cmd);
 #ifndef NOSSL
     if (nControl->tlsctrl)
-        x = SSL_write(nControl->ssl, buf, (int)strlen(buf));
+        x = SSL_write(nControl->ssl, buf, strlen(buf));
     else
-        x = (int)write(nControl->handle, buf, (int)strlen(buf));
+        x = write(nControl->handle, buf, strlen(buf));
 #else
     x = write(nControl->handle, buf, strlen(buf));
 #endif
         buf[i++] = ' ';
         if ((strlen(path) + i) >= sizeof(buf))
             return 0;
-        strncpy(&buf[i], path, sizeof(buf));
+        strcpy(&buf[i], path);
+    }
     if (nControl->cmode == ftplib::pasv)
+    {
         if (FtpOpenPasv(nControl, nData, mode, dir, buf) == -1)
     memcpy(cmd + strlen(cmd), "\r\n\0", 3);
 #ifndef NOSSL
     if (nControl->tlsctrl)
-        ret = SSL_write(nControl->ssl, cmd, (int)strlen(cmd));
+        ret = SSL_write(nControl->ssl, cmd, strlen(cmd));
     else
-        ret = (int)write(nControl->handle, cmd, (int)strlen(cmd));
+        ret = write(nControl->handle, cmd, strlen(cmd));
 #else
     ret = write(nControl->handle, cmd, strlen(cmd));
 #endif
  */
 int ftplib::FtpClose(ftphandle *nData)
+{
     ftphandle *ctrl;
-    if (!nData)
-        return 0;
     if (nData->dir == FTPLIB_WRITE)
+    {
         if (nData->buf != NULL)
             writeline(NULL, 0, nData);
+    }
 #ifndef NOSSL
         if (nData->tlsdata)
             i = SSL_read(nData->ssl, buf, max);
         else
-            i = (int)read(nData->handle, buf, max);
+            i = read(nData->handle, buf, max);
 #else
         i = read(nData->handle, buf, max);
 #endif
+    }
 #ifndef NOSSL
         if (nData->tlsdata)
             i = SSL_write(nData->ssl, buf, len);
         else
-            i = (int)write(nData->handle, buf, len);
+            i = write(nData->handle, buf, len);
 #else
         i = write(nData->handle, buf, len);
 #endif
+    }
     dbuf = static_cast<char*>(malloc(FTPLIB_BUFSIZ));
     if ((type == ftplib::filewrite) || (type == ftplib::filewriteappend))
+    {
-        while ((l = (int)fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0)
+        while ((l = fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0)
+        {
             if ((c = FtpWrite(dbuf, l, nData)) < l)
+            {
                 std::string msg = string("short write: passed ") + std::to_string(l) + ", wrote " + std::to_string(c);
                 errorHandler(msg.c_str(), 0, 0);
         strcpy(buf, "RETR");
         if (pathSrc != NULL)
+        {
-            int i = (int)strlen(buf);
+            int i = strlen(buf);
             buf[i++] = ' ';
             if ((strlen(pathSrc) + i) >= sizeof(buf))
                 return 0;

Subversion Repositories tpanel

(root)/trunk/ftplib/ftplib.cpp – Rev 370 → 380