2002-11-15 22:20:36

by Rusty Russell

Subject: [PATCH] PARAM 1/4: strcspn

No changes to previous send. The standard C strcspn function, very
useful for parsing.

Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Name: strcspn patch
Author: Rusty Russell
Status: Experimental

D: This patch implements a generic strcspn.

diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .17889-2.5.36-param.pre/include/linux/string.h .17889-2.5.36-param/include/linux/string.h
--- .17889-2.5.36-param.pre/include/linux/string.h 2002-06-06 21:38:40.000000000 +1000
+++ .17889-2.5.36-param/include/linux/string.h 2002-09-19 16:15:20.000000000 +1000
@@ -15,7 +15,7 @@ extern "C" {
extern char * strpbrk(const char *,const char *);
extern char * strsep(char **,const char *);
extern __kernel_size_t strspn(const char *,const char *);
-
+extern __kernel_size_t strcspn(const char *,const char *);

/*
* Include machine specific inline routines
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .17889-2.5.36-param.pre/lib/string.c .17889-2.5.36-param/lib/string.c
--- .17889-2.5.36-param.pre/lib/string.c 2002-05-24 15:20:35.000000000 +1000
+++ .17889-2.5.36-param/lib/string.c 2002-09-19 16:15:20.000000000 +1000
@@ -272,6 +272,29 @@ size_t strspn(const char *s, const char
}
#endif

+/**
+ * strcspn - Calculate the length of the initial substring of @s which does
+ * not contain letters in @reject
+ * @s: The string to be searched
+ * @reject: The string to avoid
+ */
+size_t strcspn(const char *s, const char *reject)
+{
+ const char *p;
+ const char *r;
+ size_t count = 0;
+
+ for (p = s; *p != '\0'; ++p) {
+ for (r = reject; *r != '\0'; ++r) {
+ if (*p == *r)
+ return count;
+ }
+ ++count;
+ }
+
+ return count;
+}
+
#ifndef __HAVE_ARCH_STRPBRK
/**
* strpbrk - Find the first occurrence of a set of characters

2002-11-15 22:39:03

by Jeff Garzik

Subject: Re: [PATCH] PARAM 1/4: strcspn

Should we assume from $subject that namespace abuse is still occurring?

PARAM is way too generic, and while you may not like MODULE_PARAM or
KPARAM or similar, I should hope it's self-evident that "param" i.e.
"parameters" can apply to a great many things inside the kernel.

"PARAM" definitely does not suggest to the casual reader "kernel boot
command line arguments, or, module arguments"

Jeff

2002-11-16 00:19:43

by Olaf Dietsche

Subject: Re: [PATCH] PARAM 1/4: strcspn

Rusty Russell <[email protected]> writes:

> +size_t strcspn(const char *s, const char *reject)
> +{
> + const char *p;
> + const char *r;
> + size_t count = 0;
> +
> + for (p = s; *p != '\0'; ++p) {
> + for (r = reject; *r != '\0'; ++r) {
> + if (*p == *r)
> + return count;
> + }
> + ++count;
> + }
> +
> + return count;
> +}

How about "return p - s;" instead of "count"?

Regards, Olaf.