Changeset 1163

Timestamp:

2005-03-21 01:58:49 (4 years ago)

Author:

conrad

Message:

cleaning up -- move file extension handling into ma_extsub()

Files:

• mod_annodex-ap20/trunk/mod_annodex.c (modified) (3 diffs)

mod_annodex-ap20/trunk/mod_annodex.c

@@ -694 +694 @@
-}
-
+static char *
+ma_extsub (request_rec * r, char * filename,
+           char * oldext, int oldext_len,
+           char * newext, int newext_len)
+{
+  char * extpos;
+  char * srcfile;
+  int filename_len;
+  int diff; /* how many bytes longer the new extension is */
+  char * ret;
+
+  extpos = rindex (r->filename, '.');
+  if (extpos == NULL) return NULL;
+
+  if (strncmp (++extpos, oldext, oldext_len)) return NULL;
+
+  /* s/.oldext/.newext/ */
+  diff = newext_len - oldext_len;
+  filename_len = strlen (filename);
+  srcfile = apr_palloc (r->pool, filename_len + diff + 1 /* '\0' */);
+  apr_cpystrn (srcfile, filename, filename_len-oldext_len+1);
+  apr_cpystrn (srcfile+filename_len-oldext_len, newext, newext_len+1);
+
+  ret = r->path_info ?
+    apr_pstrcat (r->pool, srcfile, r->path_info, NULL) : srcfile;
+
+  return ret;
+}
+
-/* The annodex content handler */
-static int annodex_handler(request_rec *r)
@@ -725 +754 @@
-    int filename_len;
-
-
-
-
-
-
-
-
-
-
-
+
-
-      if (apr_file_open (&f, srcpath, APR_READ, APR_OS_DEFAULT, r->pool) !=
@@ -748 +768 @@
-      filename = srcpath;
-
-
-
-
-
-
-
-
-
-
+
-
-      if (apr_file_open (&f, srcpath, APR_READ, APR_OS_DEFAULT, r->pool) !=