blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Philipp Oeser 2018-06-11 10:03:42 +02:00
parent 05e7802a97 7ac0272b77
commit 0ec6196ae3
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/blenlib/intern/path_util.c
View File

@ -113,25 +113,29 @@ int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *nu
}
if (found_digit) {
if (tail) strcpy(tail, &string[nume + 1]);
if (head) {
strcpy(head, string);
head[nums] = 0;
char *ptr;
long ret;
ret = strtoll(&(string[nums]), &ptr, 10);
if (ret >= INT_MIN && ret <= INT_MAX) {
if (tail) strcpy(tail, &string[nume + 1]);
if (head) {
strcpy(head, string);
head[nums] = 0;
}
if (numlen) *numlen = nume - nums + 1;
return ((int)ret);
}
if (numlen) *numlen = nume - nums + 1;
return ((int)atoi(&(string[nums])));
}
else {
if (tail) strcpy(tail, string + name_end);
if (head) {
/* name_end points to last character of head,
* make it +1 so null-terminator is nicely placed
*/
BLI_strncpy(head, string, name_end + 1);
}
if (numlen) *numlen = 0;
return 0;
if (tail) strcpy(tail, string + name_end);
if (head) {
/* name_end points to last character of head,
* make it +1 so null-terminator is nicely placed
*/
BLI_strncpy(head, string, name_end + 1);
}
if (numlen) *numlen = 0;
return 0;
}