Revision: 14679
Author: adrian.chadd
Date: Wed May 19 21:04:30 2010
Log: Break out the ftpListParseParts() parser.
http://code.google.com/p/lusca-cache/source/detail?r=14679
Added:
/branches/LUSCA_HEAD/libsqftp/ftp_parts.c
/branches/LUSCA_HEAD/libsqftp/ftp_parts.h
Modified:
/branches/LUSCA_HEAD/libsqftp/Makefile.am
/branches/LUSCA_HEAD/libsqftp/ftp_types.h
/branches/LUSCA_HEAD/src/ftp.c
=======================================
--- /dev/null
+++ /branches/LUSCA_HEAD/libsqftp/ftp_parts.c Wed May 19 21:04:30 2010
@@ -0,0 +1,206 @@
+#include "../include/config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#include <assert.h>
+
+#ifdef USE_GNUREGEX
+#include "GNUregex.h"
+#elif HAVE_REGEX_H
+#include <regex.h>
+#endif
+
+#include "../include/util.h"
+
+#include "../libcore/tools.h"
+#include "../libcore/kb.h"
+
+#include "ftp_types.h"
+#include "ftp_util.h"
+#include "ftp_parts.h"
+
+void
+ftpListPartsFree(ftpListParts ** parts)
+{
+ safe_free((*parts)->date);
+ safe_free((*parts)->name);
+ safe_free((*parts)->showname);
+ safe_free((*parts)->link);
+ safe_free(*parts);
+}
+
+#define MAX_TOKENS 64
+
+ftpListParts *
+ftpListParseParts(const char *buf, struct _ftp_flags flags)
+{
+ ftpListParts *p = NULL;
+ char *t = NULL;
+ const char *ct = NULL;
+ char *tokens[MAX_TOKENS];
+ int i;
+ int n_tokens;
+ static char tbuf[128];
+ char *xbuf = NULL;
+ static int scan_ftp_initialized = 0;
+ static regex_t scan_ftp_integer;
+ static regex_t scan_ftp_time;
+ static regex_t scan_ftp_dostime;
+ static regex_t scan_ftp_dosdate;
+
+ if (!scan_ftp_initialized) {
+ scan_ftp_initialized = 1;
+ regcomp(&scan_ftp_integer, "^[0123456789]+$", REG_EXTENDED | REG_NOSUB);
+ regcomp(&scan_ftp_time, "^[0123456789:]+$", REG_EXTENDED | REG_NOSUB);
+ regcomp(&scan_ftp_dosdate, "^[0123456789]+-[0123456789]+-[0123456789]+$",
REG_EXTENDED | REG_NOSUB);
+ regcomp(&scan_ftp_dostime, "^[0123456789]+:[0123456789]+[AP]M$",
REG_EXTENDED | REG_NOSUB | REG_ICASE);
+ }
+ if (buf == NULL)
+ return NULL;
+ if (*buf == '\0')
+ return NULL;
+ p = xcalloc(1, sizeof(ftpListParts));
+ n_tokens = 0;
+ memset(tokens, 0, sizeof(tokens));
+ xbuf = xstrdup(buf);
+ if (flags.tried_nlst) {
+ /* Machine readable format, one name per line */
+ p->name = xbuf;
+ p->type = '\0';
+ return p;
+ }
+ for (t = strtok(xbuf, w_space); t && n_tokens < MAX_TOKENS; t =
strtok(NULL, w_space))
+ tokens[n_tokens++] = xstrdup(t);
+ xfree(xbuf);
+ /* locate the Month field */
+ for (i = 3; i < n_tokens - 2; i++) {
+ char *size = tokens[i - 1];
+ char *month = tokens[i];
+ char *day = tokens[i + 1];
+ char *year = tokens[i + 2];
+ if (!is_month(month))
+ continue;
+ if (regexec(&scan_ftp_integer, size, 0, NULL, 0) != 0)
+ continue;
+ if (regexec(&scan_ftp_integer, day, 0, NULL, 0) != 0)
+ continue;
+ if (regexec(&scan_ftp_time, year, 0, NULL, 0) != 0) /* Yr | hh:mm */
+ continue;
+ snprintf(tbuf, 128, "%s %2s %5s",
+ month, day, year);
+ if (!strstr(buf, tbuf))
+ snprintf(tbuf, 128, "%s %2s %-5s",
+ month, day, year);
+ if ((t = strstr(buf, tbuf))) {
+ p->type = *tokens[0];
+ p->size = strto_off_t(size, NULL, 10);
+ p->date = xstrdup(tbuf);
+ if (flags.skip_whitespace) {
+ t += strlen(tbuf);
+ while (strchr(w_space, *t))
+ t++;
+ } else {
+ /* XXX assumes a single space between date and filename
+ * suggested by: [email protected] and
+ * Mike Battersby <[email protected]> */
+ t += strlen(tbuf) + 1;
+ }
+ p->name = xstrdup(t);
+ if (p->type == 'l' && (t = strstr(p->name, " -> "))) {
+ *t = '\0';
+ p->link = xstrdup(t + 4);
+ }
+ goto found;
+ }
+ break;
+ }
+ /* try it as a DOS listing, 04-05-70 09:33PM ... */
+ if (n_tokens > 3 &&
+ regexec(&scan_ftp_dosdate, tokens[0], 0, NULL, 0) == 0 &&
+ regexec(&scan_ftp_dostime, tokens[1], 0, NULL, 0) == 0) {
+ if (!strcasecmp(tokens[2], "<dir>")) {
+ p->type = 'd';
+ } else {
+ p->type = '-';
+ p->size = strto_off_t(tokens[2], NULL, 10);
+ }
+ snprintf(tbuf, 128, "%s %s", tokens[0], tokens[1]);
+ p->date = xstrdup(tbuf);
+ if (p->type == 'd') {
+ /* Directory.. name begins with first printable after <dir> */
+ ct = strstr(buf, tokens[2]);
+ ct += strlen(tokens[2]);
+ while (xisspace(*ct))
+ ct++;
+ if (!*ct)
+ ct = NULL;
+ } else {
+ /* A file. Name begins after size, with a space in between */
+ snprintf(tbuf, 128, " %s %s", tokens[2], tokens[3]);
+ ct = strstr(buf, tbuf);
+ if (ct) {
+ ct += strlen(tokens[2]) + 2;
+ }
+ }
+ p->name = xstrdup(ct ? ct : tokens[3]);
+ goto found;
+ }
+ /* Try EPLF format; [email protected] */
+ if (buf[0] == '+') {
+ ct = buf + 1;
+ p->type = 0;
+ while (ct && *ct) {
+ time_t t;
+ int l = strcspn(ct, ",");
+ char *tmp;
+ if (l < 1)
+ goto blank;
+ switch (*ct) {
+ case '\t':
+ p->name = xstrndup(ct + 1, l + 1);
+ break;
+ case 's':
+ p->size = strto_off_t(ct + 1, NULL, 10);
+ break;
+ case 'm':
+ t = (time_t) strto_off_t(ct + 1, &tmp, 0);
+ if (tmp != ct + l)
+ break; /* not a valid integer */
+ p->date = xstrdup(ctime(&t));
+ *(strstr(p->date, "\n")) = '\0';
+ break;
+ case '/':
+ p->type = 'd';
+ break;
+ case 'r':
+ p->type = '-';
+ break;
+ case 'i':
+ break;
+ default:
+ break;
+ }
+ blank:
+ ct = strstr(ct, ",");
+ if (ct) {
+ ct++;
+ }
+ }
+ if (p->type == 0) {
+ p->type = '-';
+ }
+ if (p->name)
+ goto found;
+ else
+ safe_free(p->date);
+ }
+ found:
+ for (i = 0; i < n_tokens; i++)
+ xfree(tokens[i]);
+ if (!p->name)
+ ftpListPartsFree(&p); /* cleanup */
+ return p;
+}
=======================================
--- /dev/null
+++ /branches/LUSCA_HEAD/libsqftp/ftp_parts.h Wed May 19 21:04:30 2010
@@ -0,0 +1,16 @@
+#ifndef __LUSCA_FTPPARTS_H__
+#define __LUSCA_FTPPARTS_H__
+
+typedef struct {
+ char type;
+ squid_off_t size;
+ char *date;
+ char *name;
+ char *showname;
+ char *link;
+} ftpListParts;
+
+extern void ftpListPartsFree(ftpListParts ** parts);
+extern ftpListParts * ftpListParseParts(const char *buf, struct _ftp_flags
flags);
+
+#endif
=======================================
--- /branches/LUSCA_HEAD/libsqftp/Makefile.am Wed May 19 20:20:46 2010
+++ /branches/LUSCA_HEAD/libsqftp/Makefile.am Wed May 19 21:04:30 2010
@@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in
libsqftp_a_SOURCES = \
- ftp_util.c
+ ftp_util.c \
+ ftp_parts.c
noinst_LIBRARIES = \
libsqftp.a
=======================================
--- /branches/LUSCA_HEAD/libsqftp/ftp_types.h Wed May 19 20:29:09 2010
+++ /branches/LUSCA_HEAD/libsqftp/ftp_types.h Wed May 19 21:04:30 2010
@@ -46,14 +46,4 @@
unsigned int listformat_unknown:1;
};
-typedef struct {
- char type;
- squid_off_t size;
- char *date;
- char *name;
- char *showname;
- char *link;
-} ftpListParts;
-
-
#endif
=======================================
--- /branches/LUSCA_HEAD/src/ftp.c Wed May 19 20:32:32 2010
+++ /branches/LUSCA_HEAD/src/ftp.c Wed May 19 21:04:30 2010
@@ -37,6 +37,7 @@
#include "../libsqftp/ftp_util.h"
#include "../libsqftp/ftp_types.h"
+#include "../libsqftp/ftp_parts.h"
static const char *const crlf = "\r\n";
static char cbuf[1024];
@@ -392,189 +393,6 @@
visible_appname_string);
storeAppendPrintf(e, "</ADDRESS></BODY></HTML>\n");
}
-
-static void
-ftpListPartsFree(ftpListParts ** parts)
-{
- safe_free((*parts)->date);
- safe_free((*parts)->name);
- safe_free((*parts)->showname);
- safe_free((*parts)->link);
- safe_free(*parts);
-}
-
-#define MAX_TOKENS 64
-
-static ftpListParts *
-ftpListParseParts(const char *buf, struct _ftp_flags flags)
-{
- ftpListParts *p = NULL;
- char *t = NULL;
- const char *ct = NULL;
- char *tokens[MAX_TOKENS];
- int i;
- int n_tokens;
- static char tbuf[128];
- char *xbuf = NULL;
- static int scan_ftp_initialized = 0;
- static regex_t scan_ftp_integer;
- static regex_t scan_ftp_time;
- static regex_t scan_ftp_dostime;
- static regex_t scan_ftp_dosdate;
-
- if (!scan_ftp_initialized) {
- scan_ftp_initialized = 1;
- regcomp(&scan_ftp_integer, "^[0123456789]+$", REG_EXTENDED | REG_NOSUB);
- regcomp(&scan_ftp_time, "^[0123456789:]+$", REG_EXTENDED | REG_NOSUB);
- regcomp(&scan_ftp_dosdate, "^[0123456789]+-[0123456789]+-[0123456789]+$",
REG_EXTENDED | REG_NOSUB);
- regcomp(&scan_ftp_dostime, "^[0123456789]+:[0123456789]+[AP]M$",
REG_EXTENDED | REG_NOSUB | REG_ICASE);
- }
- if (buf == NULL)
- return NULL;
- if (*buf == '\0')
- return NULL;
- p = xcalloc(1, sizeof(ftpListParts));
- n_tokens = 0;
- memset(tokens, 0, sizeof(tokens));
- xbuf = xstrdup(buf);
- if (flags.tried_nlst) {
- /* Machine readable format, one name per line */
- p->name = xbuf;
- p->type = '\0';
- return p;
- }
- for (t = strtok(xbuf, w_space); t && n_tokens < MAX_TOKENS; t =
strtok(NULL, w_space))
- tokens[n_tokens++] = xstrdup(t);
- xfree(xbuf);
- /* locate the Month field */
- for (i = 3; i < n_tokens - 2; i++) {
- char *size = tokens[i - 1];
- char *month = tokens[i];
- char *day = tokens[i + 1];
- char *year = tokens[i + 2];
- if (!is_month(month))
- continue;
- if (regexec(&scan_ftp_integer, size, 0, NULL, 0) != 0)
- continue;
- if (regexec(&scan_ftp_integer, day, 0, NULL, 0) != 0)
- continue;
- if (regexec(&scan_ftp_time, year, 0, NULL, 0) != 0) /* Yr | hh:mm */
- continue;
- snprintf(tbuf, 128, "%s %2s %5s",
- month, day, year);
- if (!strstr(buf, tbuf))
- snprintf(tbuf, 128, "%s %2s %-5s",
- month, day, year);
- if ((t = strstr(buf, tbuf))) {
- p->type = *tokens[0];
- p->size = strto_off_t(size, NULL, 10);
- p->date = xstrdup(tbuf);
- if (flags.skip_whitespace) {
- t += strlen(tbuf);
- while (strchr(w_space, *t))
- t++;
- } else {
- /* XXX assumes a single space between date and filename
- * suggested by: [email protected] and
- * Mike Battersby <[email protected]> */
- t += strlen(tbuf) + 1;
- }
- p->name = xstrdup(t);
- if (p->type == 'l' && (t = strstr(p->name, " -> "))) {
- *t = '\0';
- p->link = xstrdup(t + 4);
- }
- goto found;
- }
- break;
- }
- /* try it as a DOS listing, 04-05-70 09:33PM ... */
- if (n_tokens > 3 &&
- regexec(&scan_ftp_dosdate, tokens[0], 0, NULL, 0) == 0 &&
- regexec(&scan_ftp_dostime, tokens[1], 0, NULL, 0) == 0) {
- if (!strcasecmp(tokens[2], "<dir>")) {
- p->type = 'd';
- } else {
- p->type = '-';
- p->size = strto_off_t(tokens[2], NULL, 10);
- }
- snprintf(tbuf, 128, "%s %s", tokens[0], tokens[1]);
- p->date = xstrdup(tbuf);
- if (p->type == 'd') {
- /* Directory.. name begins with first printable after <dir> */
- ct = strstr(buf, tokens[2]);
- ct += strlen(tokens[2]);
- while (xisspace(*ct))
- ct++;
- if (!*ct)
- ct = NULL;
- } else {
- /* A file. Name begins after size, with a space in between */
- snprintf(tbuf, 128, " %s %s", tokens[2], tokens[3]);
- ct = strstr(buf, tbuf);
- if (ct) {
- ct += strlen(tokens[2]) + 2;
- }
- }
- p->name = xstrdup(ct ? ct : tokens[3]);
- goto found;
- }
- /* Try EPLF format; [email protected] */
- if (buf[0] == '+') {
- ct = buf + 1;
- p->type = 0;
- while (ct && *ct) {
- time_t t;
- int l = strcspn(ct, ",");
- char *tmp;
- if (l < 1)
- goto blank;
- switch (*ct) {
- case '\t':
- p->name = xstrndup(ct + 1, l + 1);
- break;
- case 's':
- p->size = strto_off_t(ct + 1, NULL, 10);
- break;
- case 'm':
- t = (time_t) strto_off_t(ct + 1, &tmp, 0);
- if (tmp != ct + l)
- break; /* not a valid integer */
- p->date = xstrdup(ctime(&t));
- *(strstr(p->date, "\n")) = '\0';
- break;
- case '/':
- p->type = 'd';
- break;
- case 'r':
- p->type = '-';
- break;
- case 'i':
- break;
- default:
- break;
- }
- blank:
- ct = strstr(ct, ",");
- if (ct) {
- ct++;
- }
- }
- if (p->type == 0) {
- p->type = '-';
- }
- if (p->name)
- goto found;
- else
- safe_free(p->date);
- }
- found:
- for (i = 0; i < n_tokens; i++)
- xfree(tokens[i]);
- if (!p->name)
- ftpListPartsFree(&p); /* cleanup */
- return p;
-}
static const char *
dots_fill(size_t len)
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
