stdio.h \
stdvarargs.h \
strnstr.cc \
+ strsep.h \
strtoll.h \
strnrchr.h \
strnrchr.c \
/* prototypes */
void WIN32_maperror(unsigned long WIN32_oserrno);
+#include "compat/strsep.h"
+
#endif /* _SQUID_WINDOWS_ */
#endif /* SQUID_OS_MSWINDOWS_H */
#define _PATH_DEVNULL "/dev/null"
#endif
+/* Solaris 10 does not define strsep() */
+#include "compat/strsep.h"
+
#endif /* _SQUID_SOLARIS_ */
#endif /* SQUID_OS_SOALRIS_H */
--- /dev/null
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+ * Written by Yoann Vandoorselaere <yoann@prelude-ids.org>
+ *
+ * The file 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.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+
+#include "squid.h"
+#include "compat/strsep.h"
+
+#include <string.h>
+
+char *
+strsep(char **stringp, const char *delim)
+{
+ char *start = *stringp;
+ char *ptr;
+
+ if (!start)
+ return NULL;
+
+ if (!*delim)
+ ptr = start + strlen (start);
+ else {
+ ptr = strpbrk (start, delim);
+ if (!ptr) {
+ *stringp = NULL;
+ return start;
+ }
+ }
+
+ *ptr = '\0';
+ *stringp = ptr + 1;
+
+ return start;
+}
--- /dev/null
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+ * Written by Yoann Vandoorselaere <yoann@prelude-ids.org>
+ *
+ * The file 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.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+#ifndef GNULIB_STRSEP_H_
+#define GNULIB_STRSEP_H_
+
+#if HAVE_STRSEP
+
+/*
+ * Get strsep() declaration.
+ */
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+
+#else
+
+/**
+ *\par
+ * Searches the next delimiter (char listed in DELIM) starting at *STRINGP.
+ * If one is found, it is overwritten with a NULL, and *STRINGP is advanced
+ * to point to the next char after it. Otherwise, *STRINGP is set to NULL.
+ * If *STRINGP was already NULL, nothing happens.
+ * Returns the old value of *STRINGP.
+ *
+ *\par
+ * This is a variant of strtok() that is multithread-safe and supports
+ * empty fields.
+ *
+ * \note Caveat: It modifies the original string.
+ * \note Caveat: These functions cannot be used on constant strings.
+ * \note Caveat: The identity of the delimiting character is lost.
+ * \note Caveat: It doesn't work with multibyte strings unless all of the delimiter
+ * characters are ASCII characters < 0x30.
+ *
+ * See also strtok_r().
+ */
+SQUIDCEXTERN char *strsep(char **stringp, const char *delim);
+
+#endif /* HAVE_STRSEP */
+#endif /* GNULIB_STRSEP_H_ */
getnameinfo \
psignal \
strerror \
+ strsep \
strtoll \
tempnam \
)
#if ICAP_CLIENT
Adaptation::Icap::History::Pointer ih = request->icapHistory();
if (ih != NULL) {
- if (getConn() != NULL && getConn()->clientConnection != NULL) {
+ if (getConn() != NULL) {
ih->rfc931 = getConn()->clientConnection->rfc931;
#if USE_SSL
- if (getConn()->clientConnection->isOpen()) {
- ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
- }
+ assert(getConn()->clientConnection != NULL);
+ ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
#endif
}
ih->log_uri = log_uri;
static mib_tree_entry *snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, instance_Fn * instancefunction, AggrType aggrType, int children,...);
static oid *snmpCreateOid(int length,...);
mib_tree_entry * snmpLookupNodeStr(mib_tree_entry *entry, const char *str);
-bool snmpCreateOidFromStr(const char *str, oid **name, int *nl);
+int snmpCreateOidFromStr(const char *str, oid **name, int *nl);
SQUIDCEXTERN void (*snmplib_debug_hook) (int, char *);
static oid *static_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
return e;
}
-bool
+int
snmpCreateOidFromStr(const char *str, oid **name, int *nl)
{
char const *delim = ".";
+ char *p;
*name = NULL;
*nl = 0;
- const char *s = str;
+ char *s = xstrdup(str);
+ char *s_ = s;
/* Parse the OID string into oid bits */
- while (size_t len = strcspn(s, delim)) {
+ while ( (p = strsep(&s_, delim)) != NULL) {
*name = (oid*)xrealloc(*name, sizeof(oid) * ((*nl) + 1));
- (*name)[*nl] = atoi(s); // stops at the '.' delimiter
+ (*name)[*nl] = atoi(p);
++(*nl);
- // exit with true when teh last octet has been parsed
- if (s[len] == '\0')
- return true;
- s += len+1;
}
- // if we aborted before the lst octet was found, return false.
- return false;
+ xfree(s);
+ return 1;
}
/*
#include "comm.h"
#include "comm/Connection.h"
#include "comm/Loops.h"
+#include "compat/strsep.h"
#include "ConfigParser.h"
#include "event.h"
#include "ip/Address.h"
static int
parse_wccp2_service_flags(char *flags)
{
- if (!flags)
+ char *tmp, *tmp2;
+ char *flag;
+ int retflag = 0;
+
+ if (!flags) {
return 0;
+ }
- char *flag = flags;
- int retflag = 0;
+ tmp = xstrdup(flags);
+ tmp2 = tmp;
- while (size_t len = strcspn(flag, ",")) {
+ flag = strsep(&tmp2, ",");
- if (strncmp(flag, "src_ip_hash", len) == 0) {
+ while (flag) {
+ if (strcmp(flag, "src_ip_hash") == 0) {
retflag |= WCCP2_SERVICE_SRC_IP_HASH;
- } else if (strncmp(flag, "dst_ip_hash", len) == 0) {
+ } else if (strcmp(flag, "dst_ip_hash") == 0) {
retflag |= WCCP2_SERVICE_DST_IP_HASH;
- } else if (strncmp(flag, "source_port_hash", len) == 0) {
+ } else if (strcmp(flag, "source_port_hash") == 0) {
retflag |= WCCP2_SERVICE_SRC_PORT_HASH;
- } else if (strncmp(flag, "dst_port_hash", len) == 0) {
+ } else if (strcmp(flag, "dst_port_hash") == 0) {
retflag |= WCCP2_SERVICE_DST_PORT_HASH;
- } else if (strncmp(flag, "ports_source", len) == 0) {
+ } else if (strcmp(flag, "ports_source") == 0) {
retflag |= WCCP2_SERVICE_PORTS_SOURCE;
- } else if (strncmp(flag, "src_ip_alt_hash", len) == 0) {
+ } else if (strcmp(flag, "src_ip_alt_hash") == 0) {
retflag |= WCCP2_SERVICE_SRC_IP_ALT_HASH;
- } else if (strncmp(flag, "dst_ip_alt_hash", len) == 0) {
+ } else if (strcmp(flag, "dst_ip_alt_hash") == 0) {
retflag |= WCCP2_SERVICE_DST_IP_ALT_HASH;
- } else if (strncmp(flag, "src_port_alt_hash", len) == 0) {
+ } else if (strcmp(flag, "src_port_alt_hash") == 0) {
retflag |= WCCP2_SERVICE_SRC_PORT_ALT_HASH;
- } else if (strncmp(flag, "dst_port_alt_hash", len) == 0) {
+ } else if (strcmp(flag, "dst_port_alt_hash") == 0) {
retflag |= WCCP2_SERVICE_DST_PORT_ALT_HASH;
} else {
- flag[len] = '\0';
fatalf("Unknown wccp2 service flag: %s\n", flag);
}
- if (flag[len] == '\0')
- break;
-
- flag += len+1;
+ flag = strsep(&tmp2, ",");
}
+ xfree(tmp);
return retflag;
}
static void
parse_wccp2_service_ports(char *options, int portlist[])
{
+ int i = 0;
+ int p;
+ char *tmp, *tmp2, *port;
+
if (!options) {
return;
}
- int i = 0;
- char *tmp = options;
+ tmp = xstrdup(options);
+ tmp2 = tmp;
- while (size_t len = strcspn(tmp, ",")) {
- if (i >= WCCP2_NUMPORTS) {
- fatalf("parse_wccp2_service_ports: too many ports (maximum: 8) in list '%s'\n", options);
- }
- int p = xatoi(tmp);
+ port = strsep(&tmp2, ",");
+
+ while (port && i < WCCP2_NUMPORTS) {
+ p = xatoi(port);
if (p < 1 || p > 65535) {
- fatalf("parse_wccp2_service_ports: port value '%s' isn't valid (1..65535)\n", tmp);
+ fatalf("parse_wccp2_service_ports: port value '%s' isn't valid (1..65535)\n", port);
}
portlist[i] = p;
++i;
- if (tmp[len] == '\0')
- return;
- tmp += len+1;
+ port = strsep(&tmp2, ",");
}
+
+ if (i == WCCP2_NUMPORTS && port) {
+ fatalf("parse_wccp2_service_ports: too many ports (maximum: 8) in list '%s'\n", options);
+ }
+
+ xfree(tmp);
}
void
projects / thirdparty / squid.git / commitdiff
