incubator-mod_ftp-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r450644 - in /incubator/mod_ftp/trunk: include/ src/
Date Thu, 28 Sep 2006 00:07:34 GMT
Author: wrowe
Date: Wed Sep 27 17:07:33 2006
New Revision: 450644

URL: http://svn.apache.org/viewvc?view=rev&rev=450644
Log:

  Invert - FTP_HAS_GLOB becomes a positive assertion from
  ftp_config.h, determined based on (???).

Modified:
    incubator/mod_ftp/trunk/include/ftp_config.h.in
    incubator/mod_ftp/trunk/include/mod_ftp.h
    incubator/mod_ftp/trunk/src/ftp_commands.c
    incubator/mod_ftp/trunk/src/ftp_connection.c
    incubator/mod_ftp/trunk/src/ftp_data_connection.c
    incubator/mod_ftp/trunk/src/ftp_data_filters.c
    incubator/mod_ftp/trunk/src/ftp_filters.c
    incubator/mod_ftp/trunk/src/ftp_glob.c
    incubator/mod_ftp/trunk/src/ftp_inet_pton.c
    incubator/mod_ftp/trunk/src/ftp_limitlogin.c
    incubator/mod_ftp/trunk/src/ftp_log.c
    incubator/mod_ftp/trunk/src/ftp_message.c
    incubator/mod_ftp/trunk/src/ftp_protocol.c
    incubator/mod_ftp/trunk/src/ftp_request.c
    incubator/mod_ftp/trunk/src/ftp_util.c
    incubator/mod_ftp/trunk/src/mod_ftp.c

Modified: incubator/mod_ftp/trunk/include/ftp_config.h.in
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/include/ftp_config.h.in?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/include/ftp_config.h.in (original)
+++ incubator/mod_ftp/trunk/include/ftp_config.h.in Wed Sep 27 17:07:33 2006
@@ -1,78 +1,11 @@
-/* include/ftp_config.h.in.  Generated from configure.in by autoheader.  */
+/* include/ftp_config.h.in  */
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the `arpa/ftp.h' header. */
+#undef HAVE_ARPA_FTP_H
 
 /* Define to 1 if you have the `fchmod' function. */
 #undef HAVE_FCHMOD
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `glob' function. */
+#undef HAVE_GLOB
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE

Modified: incubator/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/include/mod_ftp.h?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/include/mod_ftp.h (original)
+++ incubator/mod_ftp/trunk/include/mod_ftp.h Wed Sep 27 17:07:33 2006
@@ -23,6 +23,8 @@
 #ifndef MOD_FTP_H
 #define MOD_FTP_H
 
+#define MODFTP_VERSION "3.0.0"
+
 /* FTP header has a couple of defines... on win32
    rather than including it, we'll just hack em in
    ourselves
@@ -48,7 +50,6 @@
 #include "apr_user.h"
 #include "apr_lib.h"
 #include "apr_inherit.h"
-#include "apr_compat.h"
 #include "apr_poll.h"
 #include "ap_config.h"
 #include "ap_mmn.h"
@@ -395,11 +396,11 @@
  *
  * ftp_util.c
  */
-#ifdef FTP_NO_GLOB
-struct ftp_direntry *ftp_direntry_get(request_rec *r);
-#else
+#ifdef FTP_HAS_GLOB
 struct ftp_direntry *ftp_direntry_get_glob(request_rec *r, const char *pat);
-#endif /* FTP_NO_GLOB */
+#else
+struct ftp_direntry *ftp_direntry_get(request_rec *r);
+#endif /* FTP_HAS_GLOB */
 
 void ftp_set_authorization(request_rec *r);
 int ftp_set_uri(request_rec *r, const char *arg);

Modified: incubator/mod_ftp/trunk/src/ftp_commands.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_commands.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_commands.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_commands.c Wed Sep 27 17:07:33 2006
@@ -20,11 +20,13 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "mod_ftp.h"
 #include "ftp_config.h"
+#include "mod_ftp.h"
 
 /* seem to need this for LONG_MAX */
+#if APR_HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #if APR_HAVE_UNISTD_H
 /* Required for geteuid and seteuid */
 #include <unistd.h>
@@ -606,7 +608,7 @@
         return ftp_cmd_nlst(r, argcopy);
     }
 
-#ifdef FTP_NO_GLOB
+#ifndef FTP_HAS_GLOB
     /* There is no need to check for abuses of * when globbing is not
      * enabled. */
 #else
@@ -639,7 +641,7 @@
             return FTP_REPLY_FILE_NOT_FOUND;
         }
     }
-#endif /* FTP_NO_GLOB */
+#endif /* FTP_HAS_GLOB */
 
     if ((res = ftp_set_uri(r, arg))) {
         return res;
@@ -672,7 +674,7 @@
     }
         
     /* Construct the sorted array of directory contents */
-#ifdef FTP_NO_GLOB
+#ifndef FTP_HAS_GLOB
     if((direntry = ftp_direntry_get(r)) == NULL) {
         fc->response_notes = apr_psprintf(r->pool, FTP_MSG_NOSUCHFILE, arg);
         return FTP_REPLY_FILE_NOT_FOUND;
@@ -682,7 +684,7 @@
         fc->response_notes = apr_psprintf(r->pool, FTP_MSG_NOSUCHFILE, arg);
         return FTP_REPLY_FILE_NOT_FOUND;
     }
-#endif /* FTP_NO_GLOB */
+#endif /* FTP_HAS_GLOB */
 
     fc->response_notes = FTP_MSG_OPENASCII;
     ftp_send_response(r, FTP_REPLY_FILE_STATUS_OK);
@@ -933,7 +935,7 @@
     }
 
     /* Construct the sorted array of directory contents */
-#ifdef FTP_NO_GLOB
+#ifndef FTP_HAS_GLOB
     if((direntry = ftp_direntry_get(r)) == NULL) {
         fc->response_notes = apr_psprintf(r->pool, FTP_MSG_NOSUCHFILE, arg);
         return FTP_REPLY_FILE_NOT_FOUND;
@@ -943,7 +945,7 @@
         fc->response_notes = apr_psprintf(r->pool, FTP_MSG_NOSUCHFILE, arg);
         return FTP_REPLY_FILE_NOT_FOUND;
     }
-#endif /* FTP_NO_GLOB */
+#endif /* FTP_HAS_GLOB */
 
     fc->response_notes = FTP_MSG_OPENASCII;
     ftp_send_response(r, FTP_REPLY_FILE_STATUS_OK);

Modified: incubator/mod_ftp/trunk/src/ftp_connection.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_connection.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_connection.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_connection.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /*

Modified: incubator/mod_ftp/trunk/src/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_data_connection.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_data_connection.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_data_connection.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /*

Modified: incubator/mod_ftp/trunk/src/ftp_data_filters.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_data_filters.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_data_filters.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_data_filters.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /* Reimplement the core i/o filters to insert two-channel

Modified: incubator/mod_ftp/trunk/src/ftp_filters.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_filters.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_filters.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_filters.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /* ftp_crlf_filter: Filter for sending ASCII files.  RFC 959 states that

Modified: incubator/mod_ftp/trunk/src/ftp_glob.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_glob.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_glob.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_glob.c Wed Sep 27 17:07:33 2006
@@ -69,6 +69,7 @@
  *	Number of matches in the current invocation of glob.
  */
 
+#include "ftp_config.h"
 #include "ftp_glob.h"
 
 #include <sys/param.h>

Modified: incubator/mod_ftp/trunk/src/ftp_inet_pton.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_inet_pton.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_inet_pton.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_inet_pton.c Wed Sep 27 17:07:33 2006
@@ -14,8 +14,9 @@
  * SOFTWARE.
  */
 
-#include "apr_network_io.h"
+#include "ftp_config.h"
 #include "mod_ftp.h"
+#include "apr_network_io.h"
 
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -29,7 +30,9 @@
 #if APR_HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#if APR_HAVE_STRING_H
 #include <string.h>
+#endif
 #if APR_HAVE_ERRNO_H
 #include <errno.h>
 #endif

Modified: incubator/mod_ftp/trunk/src/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_limitlogin.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_limitlogin.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_limitlogin.c Wed Sep 27 17:07:33 2006
@@ -21,10 +21,8 @@
  */
 
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
-#ifndef FTP_NO_GLOB
-#include "ftp_glob.h" /* Custom globber */
-#endif /* FTP_NO_GLOB */
 
 #include "ap_mpm.h" /* For MPM query interface */
 #include "apr_dbm.h"

Modified: incubator/mod_ftp/trunk/src/ftp_log.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_log.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_log.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_log.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
  
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /*

Modified: incubator/mod_ftp/trunk/src/ftp_message.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_message.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_message.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_message.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 /* ftp_message_generate: Function to transform meta-characters

Modified: incubator/mod_ftp/trunk/src/ftp_protocol.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_protocol.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_protocol.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_protocol.c Wed Sep 27 17:07:33 2006
@@ -20,8 +20,8 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "mod_ftp.h"
 #include "ftp_config.h"
+#include "mod_ftp.h"
 
 /* Min # of bytes to allocate when reading a request line */
 #define MIN_LINE_ALLOC 512

Modified: incubator/mod_ftp/trunk/src/ftp_request.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_request.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_request.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_request.c Wed Sep 27 17:07:33 2006
@@ -20,6 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
 
 #ifndef apr_time_from_sec

Modified: incubator/mod_ftp/trunk/src/ftp_util.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/ftp_util.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_util.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_util.c Wed Sep 27 17:07:33 2006
@@ -20,15 +20,18 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include <sys/stat.h> /* For file perms */
 
+#include "ftp_config.h"
 #include "mod_ftp.h"
-#ifndef FTP_NO_GLOB
+#ifdef FTP_HAS_GLOB
 #include "ftp_glob.h" /* Custom globber */
-#endif /* FTP_NO_GLOB */
+#endif /* FTP_HAS_GLOB */
 
 #include "ap_mpm.h" /* For MPM query interface */
 
+#include <sys/stat.h> /* For file perms */
+
+
 static char *ftp_modestring_get(char *mode, apr_filetype_e typ, 
                                       apr_fileperms_t perms)
 {
@@ -184,7 +187,8 @@
     return dirent;
 }
 
-#ifdef FTP_NO_GLOB
+#ifndef FTP_HAS_GLOB
+
 /* ftp_dsortf: Used for sorting directory entries when globbing is
  *             not enabled.  Called by qsort()
  *
@@ -307,7 +311,8 @@
     return head;
 }
 
-#else
+#else /* FTP_HAS_GLOB */
+
 /* ftp_direntry_get_glob: Return an array of ftp_direntry structures based
  *                        on the uri stored in the request rec.  An extra
  *                        argument may be passed for pattern matching. Note 
@@ -381,7 +386,8 @@
     ftp_globfree(&gb);
     return head;
 }
-#endif /* FTP_NO_GLOB */
+
+#endif /* FTP_HAS_GLOB */
 
 /* ftp_set_authorization: set the r->headers_in Authorization header
  *

Modified: incubator/mod_ftp/trunk/src/mod_ftp.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/mod_ftp.c?view=diff&rev=450644&r1=450643&r2=450644
==============================================================================
--- incubator/mod_ftp/trunk/src/mod_ftp.c (original)
+++ incubator/mod_ftp/trunk/src/mod_ftp.c Wed Sep 27 17:07:33 2006
@@ -20,10 +20,10 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "mod_ftp.h"
 #include "ftp_config.h"
+#include "mod_ftp.h"
 
-#define FTP_SERVER_STRING PACKAGE "/" VERSION
+#define FTP_SERVER_STRING "mod_ftp/" MODFTP_VERSION
 
 
 static ap_filter_rec_t *ftp_crlf_filter_handle;



Mime
View raw message