TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-17 11:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove arbitrary limit on filenames

Browse Source 
The filenames were from 0001.fff to 9999.fff.
This limit hasn't been a problem, but Anselm Distelrath reported
on February 8th, 2013 that isn't enough to test his system:
a RAID 6 with 18 hard drives of 3TB each.

Now filenames are from 1.fff to <INT_MAX>.fff.
This commit is contained in:
Michel Machado 2013-02-08 13:37:30 -05:00
parent a642c2f3c8
commit 90b0bfbfcd
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
utils.c
View File

@ -21,26 +21,45 @@ const char *adjust_unit(double *ptr_bytes)
return units[i]; return units[i];
} }
int is_my_file(const char *filename)
{
const char *p = filename;
if (!p || !isdigit(*p))
return 0;
/* Skip digits. */
do {
p++;
} while (isdigit(*p));
return (p[0] == '.') && (p[1] == 'f') && (p[2] == 'f') &&
(p[3] == 'f') && (p[4] == '\0');
}
void full_fn_from_number(char *full_fn, const char **filename, void full_fn_from_number(char *full_fn, const char **filename,
const char *path, int num) const char *path, int num)
{ {
static char format[32] = ""; assert(snprintf(full_fn, PATH_MAX, "%s/%i.fff", path, num + 1) <
if (!format[0]) { PATH_MAX);
assert(FILENAME_NUM_DIGITS > 0);
assert(FILENAME_NUM_DIGITS < 10);
sprintf(format, "%%s/%%%02ii.fff", FILENAME_NUM_DIGITS);
}
assert(snprintf(full_fn, PATH_MAX, format, path, num + 1) < PATH_MAX);
*filename = full_fn + strlen(path) + 1; *filename = full_fn + strlen(path) + 1;
} }
static int number_from_filename(const char *filename) static int number_from_filename(const char *filename)
{ {
char str[FILENAME_NUM_DIGITS + 1]; const char *p;
int num;
assert(is_my_file(filename)); assert(is_my_file(filename));
strncpy(str, filename, FILENAME_NUM_DIGITS);
str[FILENAME_NUM_DIGITS] = '\0'; p = filename;
return strtol(str, NULL, 10) - 1; num = 0;
do {
num = num * 10 + (*p - '0');
p++;
} while (isdigit(*p));
return num - 1;
} }
/* Don't call this function directly, use ls_my_files() instead. */ /* Don't call this function directly, use ls_my_files() instead. */

12
utils.h
View File

@ -7,21 +7,13 @@
#include <sys/time.h> #include <sys/time.h>
#include <limits.h> #include <limits.h>
#define FILENAME_NUM_DIGITS 4
#define SECTOR_SIZE (512) #define SECTOR_SIZE (512)
#define GIGABYTES (1024 * 1024 * 1024) #define GIGABYTES (1024 * 1024 * 1024)
const char *adjust_unit(double *ptr_bytes); const char *adjust_unit(double *ptr_bytes);
static inline int is_my_file(const char *filename) /* Return true if @filename matches the regex /^[0-9]+\.fff$/ */
{ int is_my_file(const char *filename);
return isdigit(filename[0]) && isdigit(filename[1]) &&
isdigit(filename[2]) && isdigit(filename[3]) &&
(filename[4] == '.') && (filename[5] == 'f') &&
(filename[6] == 'f') && (filename[7] == 'f') &&
(filename[8] == '\0');
}
/* @filename should be PATH_MAX long. */ /* @filename should be PATH_MAX long. */
void full_fn_from_number(char *full_fn, const char **filename, void full_fn_from_number(char *full_fn, const char **filename,