[canopy-httpd] r1119 committed - use CANOPY_PATH_MAX

1 view

Skip to first unread message

codesite...@google.com

unread,

Dec 12, 2010, 4:30:13 PM12/12/10

to canopy-s...@googlegroups.com

Revision: 1119
Author: phrakt
Date: Sun Dec 12 13:29:18 2010
Log: use CANOPY_PATH_MAX

http://code.google.com/p/canopy-httpd/source/detail?r=1119

Modified:
/trunk/src/include/canopy/sys.h
/trunk/src/lib/http/private.h
/trunk/src/lib/http/vhost.c
/trunk/src/modules/mod_dir_list/mod_dir_list.c
/trunk/src/modules/mod_log_apache/mod_log_apache.c
/trunk/src/modules/mod_perl/module.c
/trunk/src/modules/mod_perl/module.h
/trunk/src/sbin/httpd/conf.c
/trunk/src/sbin/httpd/ctl.c
/trunk/src/sbin/httpd/handlers.c
/trunk/src/sbin/httpd/httpd.c
/trunk/src/sbin/httpd/module.c
/trunk/src/sbin/httpd/private.h

=======================================
--- /trunk/src/include/canopy/sys.h Sun Dec 12 13:02:37 2010
+++ /trunk/src/include/canopy/sys.h Sun Dec 12 13:29:18 2010
@@ -41,6 +41,8 @@
#define CANOPY_PATH_MAX MAXPATHLEN
#elif defined(_POSIX_PATH_MAX)
#define CANOPY_PATH_MAX _POSIX_PATH_MAX
+#else
+#define CANOPY_PATH_MAX 256
#endif

#endif /* CANOPY_PATH_MAX */
=======================================
--- /trunk/src/lib/http/private.h Thu Apr 22 22:58:05 2010
+++ /trunk/src/lib/http/private.h Sun Dec 12 13:29:18 2010
@@ -35,6 +35,7 @@
#include <stdint.h>

#include <canopy/buf.h>
+#include <canopy/sys.h>
#include <canopy/htab.h>
#include <canopy/thread.h>

=======================================
--- /trunk/src/lib/http/vhost.c Sun Apr 25 19:36:16 2010
+++ /trunk/src/lib/http/vhost.c Sun Dec 12 13:29:18 2010
@@ -314,7 +314,7 @@
http_vhost_setdir(http_vhost_t *host, const char *rootdir)
{
size_t len;
- char buf[_POSIX_PATH_MAX], *copy;
+ char buf[CANOPY_PATH_MAX], *copy;

if ((len = strlcpy(buf, rootdir, sizeof(buf))) >= sizeof(buf)) {
http_log_err("directory path is too long");
=======================================
--- /trunk/src/modules/mod_dir_list/mod_dir_list.c Sun Apr 25 19:36:16 2010
+++ /trunk/src/modules/mod_dir_list/mod_dir_list.c Sun Dec 12 13:29:18 2010
@@ -44,12 +44,13 @@
#include <canopy/buf.h>
#include <canopy/log.h>
#include <canopy/mib.h>
+#include <canopy/sys.h>

#include <httpd/httpd.h>

-static char mod_dir_list_cssuri[_POSIX_PATH_MAX] = "";
+static char mod_dir_list_cssuri[CANOPY_PATH_MAX] = "";

@@ -157,7 +158,7 @@
mod_dir_list_handler(struct httpd_hdlr_args *args)
{
unsigned int i;
- char pathbuf[_POSIX_PATH_MAX], fldbuf[128], *fldname, *fmtp;
+ char pathbuf[CANOPY_PATH_MAX], fldbuf[128], *fldname, *fmtp;
cnp_buf_t *out_buf;
struct dirent *ent;
struct stat fst;
=======================================
--- /trunk/src/modules/mod_log_apache/mod_log_apache.c Tue May 11 20:36:55
2010
+++ /trunk/src/modules/mod_log_apache/mod_log_apache.c Sun Dec 12 13:29:18
2010
@@ -34,6 +34,7 @@
#include <string.h>

#include <canopy/log.h>
+#include <canopy/sys.h>
#include <canopy/string.h>

#include <http/http.h>
@@ -52,8 +53,8 @@
};

-static char access_log_path[_POSIX_PATH_MAX] = "/tmp/access_log";
-static char error_log_path[_POSIX_PATH_MAX] = "/tmp/error_log";
+static char access_log_path[CANOPY_PATH_MAX] = "/tmp/access_log";
+static char error_log_path[CANOPY_PATH_MAX] = "/tmp/error_log";

static char access_log_format[64] = "%h %l %u %t \"%r\" %>s %b";

=======================================
--- /trunk/src/modules/mod_perl/module.c Mon Aug 31 19:45:42 2009
+++ /trunk/src/modules/mod_perl/module.c Sun Dec 12 13:29:18 2010
@@ -37,6 +37,7 @@
#include <EXTERN.h>
#include <perl.h>

+#include <canopy/sys.h>
#include <canopy/queue.h>

#include "module.h"
@@ -48,7 +49,7 @@
static char** perlmod_initenv (void);

-static char perl_modbase[_POSIX_PATH_MAX]
= "/home/jfb/nemo/lib/nemod/perl";
+static char perl_modbase[CANOPY_PATH_MAX]
= "/home/jfb/nemo/lib/nemod/perl";

static TAILQ_HEAD(, perl_mod) perl_modules;

=======================================
--- /trunk/src/modules/mod_perl/module.h Mon Aug 31 19:45:42 2009
+++ /trunk/src/modules/mod_perl/module.h Sun Dec 12 13:29:18 2010
@@ -31,10 +31,11 @@
#include <sys/types.h>
#include <sys/queue.h>

-
#include <EXTERN.h>
#include <perl.h>

+#include <canopy/sys.h>
+

#define PERL_MOD_INITSUB "init"
#define PERL_MOD_CLEANUPSUB "cleanup"
@@ -52,7 +53,7 @@
struct perl_mod {
u_int mod_id;
char mod_name[64];
- char mod_path[_POSIX_PATH_MAX];
+ char mod_path[CANOPY_PATH_MAX];

u_int mod_flags;

=======================================
--- /trunk/src/sbin/httpd/conf.c Mon Nov 29 20:18:37 2010
+++ /trunk/src/sbin/httpd/conf.c Sun Dec 12 13:29:18 2010
@@ -51,7 +51,7 @@
#include "private.h"

-char httpd_conf_path[_POSIX_PATH_MAX] = ETCDIR "/" HTTPD_CONF_FILE;
+char httpd_conf_path[CANOPY_PATH_MAX] = ETCDIR "/" HTTPD_CONF_FILE;

cnp_conf_t *httpd_conf = NULL;
=======================================
--- /trunk/src/sbin/httpd/ctl.c Mon Nov 29 20:18:37 2010
+++ /trunk/src/sbin/httpd/ctl.c Sun Dec 12 13:29:18 2010
@@ -73,7 +73,7 @@
#define HDLR_TAB_SIZE (sizeof(httpd_ctl_hdlrs)/sizeof(httpd_ctl_hdlrs[0]))

-static char httpd_ctl_sockpath[_POSIX_PATH_MAX] = HTTPD_CTL_SOCKPATH;
+static char httpd_ctl_sockpath[CANOPY_PATH_MAX] = HTTPD_CTL_SOCKPATH;

static int httpd_ctl_sock = -1;
static int httpd_ctl_conn = -1;
=======================================
--- /trunk/src/sbin/httpd/handlers.c Wed Dec 1 19:09:21 2010
+++ /trunk/src/sbin/httpd/handlers.c Sun Dec 12 13:29:18 2010
@@ -199,7 +199,7 @@
http_msg_t *resp = args->ha_resp;
http_vhost_t *host = args->ha_req->msg_req.req_host;
http_uri_t *uri = args->ha_req->msg_req.req_url;
- char buf[1024], path[_POSIX_PATH_MAX];
+ char buf[1024], path[CANOPY_PATH_MAX];

/*
* This request is for another host
=======================================
--- /trunk/src/sbin/httpd/httpd.c Sun Dec 5 16:25:59 2010
+++ /trunk/src/sbin/httpd/httpd.c Sun Dec 12 13:29:18 2010
@@ -85,7 +85,7 @@

pid_t httpd_pid;
-char httpd_pidfile_path[_POSIX_PATH_MAX] = "/var/run/canopy.pid";
+char httpd_pidfile_path[CANOPY_PATH_MAX] = "/var/run/canopy.pid";
mode_t httpd_pidfile_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;

@@ -105,7 +105,7 @@

/* path to which we should chroot() and length, to avoid recalculations */
-char httpd_chroot_path[_POSIX_PATH_MAX] = "";
+char httpd_chroot_path[CANOPY_PATH_MAX] = "";
int httpd_chroot_flag = 0;

=======================================
--- /trunk/src/sbin/httpd/module.c Fri Apr 23 14:05:38 2010
+++ /trunk/src/sbin/httpd/module.c Sun Dec 12 13:29:18 2010
@@ -37,6 +37,7 @@
#include <canopy/log.h>
#include <canopy/mem.h>
#include <canopy/mib.h>
+#include <canopy/sys.h>
#include <canopy/thread.h>
#include <canopy/string.h>

@@ -149,7 +150,7 @@
int ret;
httpd_ctx_t octx;
void *hdl;
- char sym[128], mibbuf[64], path[_POSIX_PATH_MAX];
+ char sym[128], mibbuf[64], path[CANOPY_PATH_MAX];
struct httpd_mod *mod;
struct httpd_mod_info *info;

@@ -386,7 +387,7 @@
httpd_mod_addpath(const char *path)
{
int i, ret = 0;
- char pcopy[MAXPATHLEN];
+ char pcopy[CANOPY_PATH_MAX];
struct stat st;

if (cnp_mutex_lock(&httpd_mod_mtx) == -1) {
=======================================
--- /trunk/src/sbin/httpd/private.h Mon Nov 29 20:18:37 2010
+++ /trunk/src/sbin/httpd/private.h Sun Dec 12 13:29:18 2010
@@ -41,6 +41,7 @@

#include <canopy/mib.h>
#include <canopy/log.h>
+#include <canopy/sys.h>

#include <http/http.h>
#include <http/msg.h>
@@ -67,7 +68,7 @@
extern int httpd_daemon;
extern int httpd_datefmt;

-extern char httpd_conf_path[_POSIX_PATH_MAX];
+extern char httpd_conf_path[CANOPY_PATH_MAX];
extern char httpd_index[];
extern char httpd_hostname[];

Reply all

Reply to author

Forward

0 new messages