aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

Patch 3: Further fixes including strcasestr and convert_to_lowercase

Browse Source
This commit is contained in:
M. Vefa Bicakci 2008-11-01 18:13:24 +01:00 committed by Kalle Olavi Niemitalo
parent a3abd3b275
commit 5bd3425540
13 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bookmarks/dialogs.c
View File

@ -530,7 +530,7 @@ test_search(struct listbox_item *item, void *data_, int *offset)
assert(ctx->title && ctx->url); assert(ctx->title && ctx->url);
ctx->found = (*ctx->title && strcasestr(bm->title, ctx->title)) ctx->found = (*ctx->title && strcasestr(bm->title, ctx->title))
|| (*ctx->url && strcasestr(bm->url, ctx->url)); || (*ctx->url && c_strcasestr(bm->url, ctx->url));
if (ctx->found) *offset = 0; if (ctx->found) *offset = 0;
} }

4
src/cache/dialogs.c vendored
View File

@ -175,8 +175,8 @@ match_cache_entry(struct listbox_item *item, struct terminal *term,
{ {
struct cache_entry *cached = item->udata; struct cache_entry *cached = item->udata;
if (strcasestr(struri(cached->uri), text) if (c_strcasestr(struri(cached->uri), text)
|| (cached->head && strcasestr(cached->head, text))) || (cached->head && c_strcasestr(cached->head, text)))
return LISTBOX_MATCH_OK; return LISTBOX_MATCH_OK;
return LISTBOX_MATCH_NO; return LISTBOX_MATCH_NO;

1
src/config/kbdbind.c
View File

@ -17,6 +17,7 @@
#include "intl/gettext/libintl.h" #include "intl/gettext/libintl.h"
#include "main/event.h" #include "main/event.h"
#include "terminal/kbd.h" #include "terminal/kbd.h"
#include "util/conv.h"
#include "util/memory.h" #include "util/memory.h"
#include "util/string.h" #include "util/string.h"

12
src/document/html/parser/link.c
View File

@ -753,21 +753,21 @@ html_link_parse(struct html_context *html_context, unsigned char *a,
return 1; return 1;
} }
if (strcasestr(link->name, "icon") || if (c_strcasestr(link->name, "icon") ||
(link->content_type && strcasestr(link->content_type, "icon"))) { (link->content_type && c_strcasestr(link->content_type, "icon"))) {
link->type = LT_ICON; link->type = LT_ICON;
} else if (strcasestr(link->name, "alternate")) { } else if (c_strcasestr(link->name, "alternate")) {
link->type = LT_ALTERNATE; link->type = LT_ALTERNATE;
if (link->lang) if (link->lang)
link->type = LT_ALTERNATE_LANG; link->type = LT_ALTERNATE_LANG;
else if (strcasestr(link->name, "stylesheet") || else if (c_strcasestr(link->name, "stylesheet") ||
(link->content_type && strcasestr(link->content_type, "css"))) (link->content_type && c_strcasestr(link->content_type, "css")))
link->type = LT_ALTERNATE_STYLESHEET; link->type = LT_ALTERNATE_STYLESHEET;
else if (link->media) else if (link->media)
link->type = LT_ALTERNATE_MEDIA; link->type = LT_ALTERNATE_MEDIA;
} else if (link->content_type && strcasestr(link->content_type, "css")) { } else if (link->content_type && c_strcasestr(link->content_type, "css")) {
link->type = LT_STYLESHEET; link->type = LT_STYLESHEET;
} }

2
src/globhist/globhist.c
View File

@ -299,7 +299,7 @@ globhist_simple_search(unsigned char *search_url, unsigned char *search_title)
if ((*search_title if ((*search_title
&& strcasestr(history_item->title, search_title)) && strcasestr(history_item->title, search_title))
|| (*search_url || (*search_url
&& strcasestr(history_item->url, search_url))) { && c_strcasestr(history_item->url, search_url))) {
history_item->box_item->visible = 1; history_item->box_item->visible = 1;
} else { } else {
history_item->box_item->visible = 0; history_item->box_item->visible = 0;

2
src/mime/mime.c
View File

@ -248,7 +248,7 @@ get_fragment_content_type(struct cache_entry *cached)
if (!sample) if (!sample)
return NULL; return NULL;
if (strcasestr(sample, "<html>")) if (c_strcasestr(sample, "<html>"))
ctype = stracpy("text/html"); ctype = stracpy("text/html");
mem_free(sample); mem_free(sample);

2
src/osdep/beos/beos.c
View File

@ -41,7 +41,7 @@ get_system_env(void)
int env = get_common_env(); int env = get_common_env();
unsigned char *term = getenv("TERM"); unsigned char *term = getenv("TERM");
if (!term || (toupper(term[0]) == 'B' && toupper(term[1]) == 'E')) if (!term || (c_toupper(term[0]) == 'B' && c_toupper(term[1]) == 'E'))
env |= ENV_BE; env |= ENV_BE;
return env; return env;

2
src/protocol/proxy.c
View File

@ -37,7 +37,7 @@ proxy_probe_no_proxy(unsigned char *url, unsigned char *no_proxy)
skip_space(no_proxy); skip_space(no_proxy);
if (jumper) *jumper = '\0'; if (jumper) *jumper = '\0';
if (strcasestr(url, no_proxy)) { if (c_strcasestr(url, no_proxy)) {
if (jumper) *jumper = ','; if (jumper) *jumper = ',';
if (slash) *slash = '/'; if (slash) *slash = '/';
return 1; return 1;

2
src/protocol/uri.c
View File

@ -682,7 +682,7 @@ normalize_uri(struct uri *uri, unsigned char *uristring)
* get_translated_uri() through translate_url() calls this * get_translated_uri() through translate_url() calls this
* function and then it already works on and modifies an * function and then it already works on and modifies an
* allocated copy. */ * allocated copy. */
convert_to_lowercase(uri->string, uri->protocollen); convert_to_lowercase_locale_indep(uri->string, uri->protocollen);
if (uri->hostlen) convert_to_lowercase(uri->host, uri->hostlen); if (uri->hostlen) convert_to_lowercase(uri->host, uri->hostlen);
parse = 1; parse = 1;

2
src/protocol/user.c
View File

@ -104,7 +104,7 @@ get_user_program(struct terminal *term, unsigned char *progid, int progidlen)
/* Now add lowercased progid part. Delicious. */ /* Now add lowercased progid part. Delicious. */
add_bytes_to_string(&name, progid, progidlen); add_bytes_to_string(&name, progid, progidlen);
convert_to_lowercase(&name.source[sizeof("protocol.user.") - 1], progidlen); convert_to_lowercase_locale_indep(&name.source[sizeof("protocol.user.") - 1], progidlen);
add_char_to_string(&name, '.'); add_char_to_string(&name, '.');
add_to_string(&name, get_system_str(xwin)); add_to_string(&name, get_system_str(xwin));

2
src/util/conv.c
View File

@ -361,7 +361,7 @@ strtolx(unsigned char *str, unsigned char **end)
if (errno) return 0; if (errno) return 0;
if (!*end) return num; if (!*end) return num;
postfix = toupper(**end); postfix = c_toupper(**end);
if (postfix == 'K') { if (postfix == 'K') {
(*end)++; (*end)++;
if (num < -INT_MAX / 1024) return -INT_MAX; if (num < -INT_MAX / 1024) return -INT_MAX;

19
src/util/string.c
View File

@ -318,6 +318,25 @@ int c_strncasecmp (const char *s1, const char *s2, size_t n)
return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
} }
/* c_strcasestr - adapted from src/osdep/stub.c */
char * c_strcasestr(const char *haystack, const char *needle)
{
size_t haystack_length = strlen(haystack);
size_t needle_length = strlen(needle);
int i;
if (haystack_length < needle_length)
return NULL;
for (i = haystack_length - needle_length + 1; i; i--) {
if (!c_strncasecmp(haystack, needle, needle_length))
return (char *) haystack;
haystack++;
}
return NULL;
}
/* The new string utilities: */ /* The new string utilities: */
/* TODO Currently most of the functions use add_bytes_to_string() as a backend /* TODO Currently most of the functions use add_bytes_to_string() as a backend

3
src/util/string.h
View File

@ -102,6 +102,9 @@ int elinks_strlcasecmp(const unsigned char *s1, size_t n1,
int c_strcasecmp(const char *s1, const char *s2); int c_strcasecmp(const char *s1, const char *s2);
int c_strncasecmp(const char *s1, const char *s2, size_t n); int c_strncasecmp(const char *s1, const char *s2, size_t n);
/* strcasestr function which works as if it is in the C locale. */
char * c_strcasestr(const char *haystack, const char *needle);
#define skip_space(S) \ #define skip_space(S) \
do { while (isspace(*(S))) (S)++; } while (0) do { while (isspace(*(S))) (S)++; } while (0)