rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Less strict string length check.

Browse source 
A new pathcat function.
Some variables renaming.
This commit is contained in:
Andrea Mazzoleni 2011-09-18 22:15:44 +02:00
parent 9b90b1ce05
commit 813d7073b0
2 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
util.c
View file

@ -358,39 +358,52 @@ int sgethex(STREAM* f, void* void_data, int size)
/****************************************************************************/
/* path */
void pathcpy(char* str, size_t size, const char* src)
void pathcpy(char* dst, size_t size, const char* src)
{
size_t len = strlen(src);
if (len + 1 >= size) {
if (len + 1 > size) {
fprintf(stderr, "Path too long\n");
exit(EXIT_FAILURE);
}
memcpy(str, src, len + 1);
memcpy(dst, src, len + 1);
}
void pathimport(char* str, size_t size, const char* src)
void pathcat(char* dst, size_t size, const char* src)
{
pathcpy(str, size, src);
size_t dst_len = strlen(dst);
size_t src_len = strlen(src);
if (dst_len + src_len + 1 > size) {
fprintf(stderr, "Path too long\n");
exit(EXIT_FAILURE);
}
memcpy(dst + dst_len, src, src_len + 1);
}
void pathimport(char* dst, size_t size, const char* src)
{
pathcpy(dst, size, src);
#ifdef _WIN32
/* convert all Windows '\' to '/' */
while (*str) {
if (*str == '\\')
*str = '/';
++str;
while (*dst) {
if (*dst == '\\')
*dst = '/';
++dst;
}
#endif
}
void pathprint(char* str, size_t size, const char* format, ...)
void pathprint(char* dst, size_t size, const char* format, ...)
{
size_t len;
va_list ap;
va_start(ap, format);
len = vsnprintf(str, size, format, ap);
len = vsnprintf(dst, size, format, ap);
va_end(ap);
if (len >= size) {
@ -399,18 +412,18 @@ void pathprint(char* str, size_t size, const char* format, ...)
}
}
void pathslash(char* str, size_t size)
void pathslash(char* dst, size_t size)
{
size_t len = strlen(str);
size_t len = strlen(dst);
if (len > 0 && str[len - 1] != '/') {
if (len > 0 && dst[len - 1] != '/') {
if (len + 2 >= size) {
fprintf(stderr, "Path too long\n");
exit(EXIT_FAILURE);
}
str[len] = '/';
str[len+1] = 0;
dst[len] = '/';
dst[len+1] = 0;
}
}

14
util.h
View file

@ -199,26 +199,32 @@ int sgethex(STREAM* f, void* data, int size);
* Copies a path limiting the size.
* Aborts if too long.
*/
void pathcpy(char* str, size_t size, const char* src);
void pathcpy(char* dst, size_t size, const char* src);
/**
* Concatenates a path limiting the size.
* Aborts if too long.
*/
void pathcat(char* dst, size_t size, const char* src);
/**
* Imports a path limiting the size.
* In Windows all the backslash are converted to the C standard of forward slash.
* Aborts if too long.
*/
void pathimport(char* str, size_t size, const char* src);
void pathimport(char* dst, size_t size, const char* src);
/**
* Prints a path.
* Aborts if too long.
*/
void pathprint(char* str, size_t size, const char* format, ...);
void pathprint(char* dst, size_t size, const char* format, ...);
/**
* Ensures the presence of a terminating slash, if it isn't empty.
* Aborts if too long.
*/
void pathslash(char* str, size_t size);
void pathslash(char* dst, size_t size);
/****************************************************************************/
/* memory */