projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove an unreasonable parameter limit in parse_cgi_parameters()
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
619ff5b
..
61ef583
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,4
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7
2 2012/03/04 11:51:25
fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7
5 2012/03/09 16:24:36
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@
-179,11
+179,11
@@
void write_pid_file(void)
* Returns : The string's hash
*
*********************************************************************/
* Returns : The string's hash
*
*********************************************************************/
-unsigned int hash_string(
const char* s
)
+unsigned int hash_string(
const char* s
)
{
unsigned int h = 0;
{
unsigned int h = 0;
- for (
; *s; ++s
)
+ for (
; *s; ++s
)
{
h = 5 * h + (unsigned int)*s;
}
{
h = 5 * h + (unsigned int)*s;
}
@@
-213,7
+213,7
@@
int strcmpic(const char *s1, const char *s2)
while (*s1 && *s2)
{
while (*s1 && *s2)
{
- if (
( *s1 != *s2 ) && ( privoxy_tolower(*s1) != privoxy_tolower(*s2) )
)
+ if (
(*s1 != *s2) && (privoxy_tolower(*s1) != privoxy_tolower(*s2))
)
{
break;
}
{
break;
}
@@
-246,7
+246,7
@@
int strncmpic(const char *s1, const char *s2, size_t n)
while (*s1 && *s2)
{
while (*s1 && *s2)
{
- if (
( *s1 != *s2 ) && ( privoxy_tolower(*s1) != privoxy_tolower(*s2) )
)
+ if (
(*s1 != *s2) && (privoxy_tolower(*s1) != privoxy_tolower(*s2))
)
{
break;
}
{
break;
}
@@
-542,11
+542,11
@@
char * make_path(const char * dir, const char * file)
#ifdef AMIGA
char path[512];
#ifdef AMIGA
char path[512];
- if(dir)
+ if
(dir)
{
{
- if(dir[0] == '.')
+ if
(dir[0] == '.')
{
{
- if(dir[1] == '/')
+ if
(dir[1] == '/')
{
strncpy(path,dir+2,512);
}
{
strncpy(path,dir+2,512);
}
@@
-565,7
+565,7
@@
char * make_path(const char * dir, const char * file)
{
path[0]=0;
}
{
path[0]=0;
}
- if(AddPart(path,file,512))
+ if
(AddPart(path,file,512))
{
return strdup(path);
}
{
return strdup(path);
}
@@
-596,14
+596,14
@@
char * make_path(const char * dir, const char * file)
size_t path_size = strlen(dir) + strlen(file) + 2; /* +2 for trailing (back)slash and \0 */
#if defined(unix)
size_t path_size = strlen(dir) + strlen(file) + 2; /* +2 for trailing (back)slash and \0 */
#if defined(unix)
- if (
*dir != '/' && basedir && *basedir
)
+ if (
*dir != '/' && basedir && *basedir
)
{
/*
* Relative path, so start with the base directory.
*/
path_size += strlen(basedir) + 1; /* +1 for the slash */
path = malloc(path_size);
{
/*
* Relative path, so start with the base directory.
*/
path_size += strlen(basedir) + 1; /* +1 for the slash */
path = malloc(path_size);
- if (!path
) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+ if (!path) log_error(LOG_LEVEL_FATAL, "malloc failed!");
strlcpy(path, basedir, path_size);
strlcat(path, "/", path_size);
strlcat(path, dir, path_size);
strlcpy(path, basedir, path_size);
strlcat(path, "/", path_size);
strlcat(path, dir, path_size);
@@
-612,18
+612,18
@@
char * make_path(const char * dir, const char * file)
#endif /* defined unix */
{
path = malloc(path_size);
#endif /* defined unix */
{
path = malloc(path_size);
- if (!path
) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+ if (!path) log_error(LOG_LEVEL_FATAL, "malloc failed!");
strlcpy(path, dir, path_size);
}
assert(NULL != path);
#if defined(_WIN32) || defined(__OS2__)
strlcpy(path, dir, path_size);
}
assert(NULL != path);
#if defined(_WIN32) || defined(__OS2__)
- if(path[strlen(path)-1] != '\\')
+ if
(path[strlen(path)-1] != '\\')
{
strlcat(path, "\\", path_size);
}
#else /* ifndef _WIN32 || __OS2__ */
{
strlcat(path, "\\", path_size);
}
#else /* ifndef _WIN32 || __OS2__ */
- if(path[strlen(path)-1] != '/')
+ if
(path[strlen(path)-1] != '/')
{
strlcat(path, "/", path_size);
}
{
strlcat(path, "/", path_size);
}