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

Convert Windows slash to C slash in the disk mount point.

Browse source
This commit is contained in:
Andrea Mazzoleni 2011-05-02 20:32:54 +02:00
parent ef1b061022
commit cfbe9343ae
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
elem.c
View file

@ -268,7 +268,7 @@ struct snapraid_disk* disk_alloc(const char* name, const char* dir)
disk = malloc_nofail(sizeof(struct snapraid_disk));
pathcpy(disk->name, sizeof(disk->name), name);
pathcpy(disk->dir, sizeof(disk->dir), dir);
pathimport(disk->dir, sizeof(disk->dir), dir);
/* ensure that the dir terminate with "/" if it isn't empty */
pathslash(disk->dir, sizeof(disk->dir));

17
util.c
View file

@ -178,6 +178,23 @@ void pathcpy(char* str, size_t size, const char* src)
memcpy(str, src, len + 1);
}
void pathimport(char* str, size_t size, const char* src)
{
#ifdef _WIN32
size_t len;
#endif
pathcpy(str, size, src);
#ifdef _WIN32
/* convert last \ to / */
len = strlen(str);
if (len && str[len-1] == '\\') {
str[len-1] = '/';
}
#endif
}
void pathprint(char* str, size_t size, const char* format, ...)
{
size_t len;

7
util.h
View file

@ -82,6 +82,13 @@ char* strdechex(void* void_data, unsigned data_len, char* str);
*/
void pathcpy(char* str, size_t size, const char* src);
/**
* Imports a path limiting the size.
* In Windows, the last slash, if present, is converted to the C standard.
* Aborts if too long.
*/
void pathimport(char* str, size_t size, const char* src);
/**
* Prints a path.
* Aborts if too long.